Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Dec 2016 10:53:22 +0000 (UTC)
From:      Stefan Esser <se@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r427490 - in head/multimedia/dvbcut: . files
Message-ID:  <201612011053.uB1ArM4U076423@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: se
Date: Thu Dec  1 10:53:22 2016
New Revision: 427490
URL: https://svnweb.freebsd.org/changeset/ports/427490

Log:
  Update to version 0.7.1. That version uses unique_ptr which is not
  supported on FreeBSD 9.3, 10.1, and 10.2.  "patch-src_dvbcut.cpp"
  restores the code as it was in version 0.7.0.  That patch shall be
  removed from the port in 2017, when the affected FreeBSD versions
  have reached EoL.
  
  Approved by:    antoine (implicit)

Added:
  head/multimedia/dvbcut/files/patch-src_avframe.cpp
     - copied, changed from r427489, head/multimedia/dvbcut/files/patch-avframe.cpp
  head/multimedia/dvbcut/files/patch-src_defines.h
     - copied, changed from r427489, head/multimedia/dvbcut/files/patch-defines.h
  head/multimedia/dvbcut/files/patch-src_dvbcut.cpp   (contents, props changed)
  head/multimedia/dvbcut/files/patch-src_dvbcut.h
     - copied, changed from r427489, head/multimedia/dvbcut/files/patch-dvbcut.h
  head/multimedia/dvbcut/files/patch-src_index.h
     - copied, changed from r427489, head/multimedia/dvbcut/files/patch-index.h
Deleted:
  head/multimedia/dvbcut/files/patch-avframe.cpp
  head/multimedia/dvbcut/files/patch-defines.h
  head/multimedia/dvbcut/files/patch-dvbcut.cpp
  head/multimedia/dvbcut/files/patch-dvbcut.h
  head/multimedia/dvbcut/files/patch-index.h
  head/multimedia/dvbcut/files/patch-main.cpp
Modified:
  head/multimedia/dvbcut/Makefile
  head/multimedia/dvbcut/distinfo
  head/multimedia/dvbcut/pkg-descr

Modified: head/multimedia/dvbcut/Makefile
==============================================================================
--- head/multimedia/dvbcut/Makefile	Thu Dec  1 10:42:53 2016	(r427489)
+++ head/multimedia/dvbcut/Makefile	Thu Dec  1 10:53:22 2016	(r427490)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dvbcut
-PORTVERSION=	0.7.0
+PORTVERSION=	0.7.1
 CATEGORIES=	multimedia
 
 MAINTAINER=	se@FreeBSD.org
@@ -21,7 +21,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USE_GITHUB=	yes
 GH_ACCOUNT=	bernhardu
 GH_PROJECT=	dvbcut-deb
-GH_TAGNAME=	381549c
+GH_TAGNAME=	040c1ef
 
 USES=		qmake:outsource pkgconfig desktop-file-utils shared-mime-info
 

Modified: head/multimedia/dvbcut/distinfo
==============================================================================
--- head/multimedia/dvbcut/distinfo	Thu Dec  1 10:42:53 2016	(r427489)
+++ head/multimedia/dvbcut/distinfo	Thu Dec  1 10:53:22 2016	(r427490)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478854634
-SHA256 (bernhardu-dvbcut-deb-0.7.0-381549c_GH0.tar.gz) = 176104ec3edb438161e96b21f04057670c23611f938baac510b6e4fc4a976298
-SIZE (bernhardu-dvbcut-deb-0.7.0-381549c_GH0.tar.gz) = 183544
+TIMESTAMP = 1479555788
+SHA256 (bernhardu-dvbcut-deb-0.7.1-040c1ef_GH0.tar.gz) = 9094eb67adc98fc98e7b7292ca5dbe739c171852174406497764494e0bd2c9df
+SIZE (bernhardu-dvbcut-deb-0.7.1-040c1ef_GH0.tar.gz) = 186236

Copied and modified: head/multimedia/dvbcut/files/patch-src_avframe.cpp (from r427489, head/multimedia/dvbcut/files/patch-avframe.cpp)
==============================================================================
--- head/multimedia/dvbcut/files/patch-avframe.cpp	Thu Dec  1 10:42:53 2016	(r427489, copy source)
+++ head/multimedia/dvbcut/files/patch-src_avframe.cpp	Thu Dec  1 10:53:22 2016	(r427490)
@@ -1,4 +1,4 @@
---- src/avframe.cpp.orig	2016-06-23 12:34:35 UTC
+--- src/avframe.cpp.orig	2016-11-18 13:31:01 UTC
 +++ src/avframe.cpp
 @@ -52,7 +52,7 @@ avframe::avframe(AVFrame *src, AVCodecCo
    tobefreed = (uint8_t *)malloc(avpicture_get_size(ctx->pix_fmt, ctx->width, ctx->height));

Copied and modified: head/multimedia/dvbcut/files/patch-src_defines.h (from r427489, head/multimedia/dvbcut/files/patch-defines.h)
==============================================================================
--- head/multimedia/dvbcut/files/patch-defines.h	Thu Dec  1 10:42:53 2016	(r427489, copy source)
+++ head/multimedia/dvbcut/files/patch-src_defines.h	Thu Dec  1 10:53:22 2016	(r427490)
@@ -1,4 +1,4 @@
---- src/defines.h.orig	2016-06-23 12:34:35 UTC
+--- src/defines.h.orig	2016-11-18 13:31:01 UTC
 +++ src/defines.h
 @@ -42,6 +42,11 @@ static inline int videostream(int s=0)
  #endif

Added: head/multimedia/dvbcut/files/patch-src_dvbcut.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/dvbcut/files/patch-src_dvbcut.cpp	Thu Dec  1 10:53:22 2016	(r427490)
@@ -0,0 +1,42 @@
+--- src/dvbcut.cpp.orig	2016-11-18 13:31:01 UTC
++++ src/dvbcut.cpp
+@@ -580,7 +580,7 @@ void dvbcut::fileExport()
+     }
+   }
+ 
+-  std::unique_ptr<exportdialog> expd(new exportdialog(QString::fromStdString(expfilen),this));
++  std::auto_ptr<exportdialog> expd(new exportdialog(QString::fromStdString(expfilen),this));
+   expd->ui->muxercombo->addItem(tr("MPEG program stream/DVD (DVBCUT multiplexer)"));
+   expd->ui->muxercombo->addItem(tr("MPEG program stream (DVBCUT multiplexer)"));
+   expd->ui->muxercombo->addItem(tr("MPEG program stream/DVD (libavformat)"));
+@@ -725,7 +725,7 @@ void dvbcut::fileExport()
+ 
+   //   lavfmuxer mux(fmt,*mpg,outfilename);
+ 
+-  std::unique_ptr<muxer> mux;
++  std::auto_ptr<muxer> mux;
+   uint32_t audiostreammask(0);
+ 
+   for(int a=0;a<mpg->getaudiostreams();++a)
+@@ -737,17 +737,17 @@ void dvbcut::fileExport()
+ 
+   switch(expfmt) {
+     case 1:
+-      mux = std::unique_ptr<muxer>(new mpegmuxer(audiostreammask,*mpg,out_file.c_str(),false,0));
++      mux = std::auto_ptr<muxer>(new mpegmuxer(audiostreammask,*mpg,out_file.c_str(),false,0));
+       break;
+     case 2:
+-      mux = std::unique_ptr<muxer>(new lavfmuxer("dvd",audiostreammask,*mpg,out_file.c_str()));
++      mux = std::auto_ptr<muxer>(new lavfmuxer("dvd",audiostreammask,*mpg,out_file.c_str()));
+       break;
+     case 3:
+-      mux = std::unique_ptr<muxer>(new lavfmuxer("mpegts",audiostreammask,*mpg,out_file.c_str()));
++      mux = std::auto_ptr<muxer>(new lavfmuxer("mpegts",audiostreammask,*mpg,out_file.c_str()));
+       break;
+     case 0:
+     default:
+-      mux = std::unique_ptr<muxer>(new mpegmuxer(audiostreammask,*mpg,out_file.c_str()));
++      mux = std::auto_ptr<muxer>(new mpegmuxer(audiostreammask,*mpg,out_file.c_str()));
+       break;
+   }
+ 

Copied and modified: head/multimedia/dvbcut/files/patch-src_dvbcut.h (from r427489, head/multimedia/dvbcut/files/patch-dvbcut.h)
==============================================================================
--- head/multimedia/dvbcut/files/patch-dvbcut.h	Thu Dec  1 10:42:53 2016	(r427489, copy source)
+++ head/multimedia/dvbcut/files/patch-src_dvbcut.h	Thu Dec  1 10:53:22 2016	(r427490)
@@ -1,4 +1,4 @@
---- src/dvbcut.h.orig	2016-06-23 12:34:35 UTC
+--- src/dvbcut.h.orig	2016-11-18 13:31:01 UTC
 +++ src/dvbcut.h
 @@ -22,11 +22,14 @@
  #define _DVBCUT_DVBCUT_H

Copied and modified: head/multimedia/dvbcut/files/patch-src_index.h (from r427489, head/multimedia/dvbcut/files/patch-index.h)
==============================================================================
--- head/multimedia/dvbcut/files/patch-index.h	Thu Dec  1 10:42:53 2016	(r427489, copy source)
+++ head/multimedia/dvbcut/files/patch-src_index.h	Thu Dec  1 10:53:22 2016	(r427490)
@@ -1,4 +1,4 @@
---- src/index.h.orig	2016-06-23 12:34:35 UTC
+--- src/index.h.orig	2016-11-18 13:31:01 UTC
 +++ src/index.h
 @@ -22,7 +22,9 @@
  #define _DVBCUT_INDEX_H

Modified: head/multimedia/dvbcut/pkg-descr
==============================================================================
--- head/multimedia/dvbcut/pkg-descr	Thu Dec  1 10:42:53 2016	(r427489)
+++ head/multimedia/dvbcut/pkg-descr	Thu Dec  1 10:53:22 2016	(r427490)
@@ -5,4 +5,4 @@ surgery" approach. Thus, the input video
 unchanged, only very few frames at the beginning and/or end of the selected
 range are recoded in order to obtain a valid MPEG file.
 
-WWW: http://github.com/nextghost/dvbcut-qt4
+WWW: http://github.com/bernhardu/dvbcut-deb/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612011053.uB1ArM4U076423>