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)

10 files changed, 52 insertions, 32 deletions

diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile
index 95da08e45f31..29bd38442a70 100644
--- a/multimedia/dvbcut/Makefile
+++ b/multimedia/dvbcut/Makefile
@@ -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
 
diff --git a/multimedia/dvbcut/distinfo b/multimedia/dvbcut/distinfo
index 7ef33103cd50..5130b6134236 100644
--- a/multimedia/dvbcut/distinfo
+++ b/multimedia/dvbcut/distinfo
@@ -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
diff --git a/multimedia/dvbcut/files/patch-dvbcut.cpp b/multimedia/dvbcut/files/patch-dvbcut.cpp
deleted file mode 100644
index c3b0d0f33146..000000000000
--- a/multimedia/dvbcut/files/patch-dvbcut.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dvbcut.cpp.orig	2016-06-23 12:34:35 UTC
-+++ src/dvbcut.cpp
-@@ -1232,7 +1232,7 @@ void dvbcut::playPlay()
-   arguments << "-geometry" << QString().sprintf("%dx%d+0+0",int(ui->imagedisplay->width()),int(ui->imagedisplay->height()));
- 
-   if (currentaudiotrack>=0 && currentaudiotrack<mpg->getaudiostreams()) {
--    arguments << "-aid" << QString().sprintf("0x%x",int(currentaudiotrack));
-+    arguments << "-aid" << QString().sprintf("0x%x", int(mpg->mplayeraudioid(currentaudiotrack)));
-     }
-     
-   // for now, pass all filenames from the current one up to the last one
diff --git a/multimedia/dvbcut/files/patch-main.cpp b/multimedia/dvbcut/files/patch-main.cpp
deleted file mode 100644
index 0e344e418810..000000000000
--- a/multimedia/dvbcut/files/patch-main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main.cpp.orig	2016-06-23 12:34:35 UTC
-+++ src/main.cpp
-@@ -52,7 +52,7 @@ static char *argv0;
- void
- usage_exit(int rv=1) {
-   fprintf(stderr,
--    "Usage ("VERSION_STRING"):\n"
-+    "Usage (" VERSION_STRING "):\n"
-     "  %s -generateidx [-idx <idxfilename>] [<mpgfilename> ...]\n"
-     "  %s -batch [ OPTIONS ] <prjfilename> | <mpgfilename> ...\n\n"
-     "OPTIONS: -cut 4:3|16:9|TS|TS2|<list>, -exp <expfilename>,\n"
diff --git a/multimedia/dvbcut/files/patch-avframe.cpp b/multimedia/dvbcut/files/patch-src_avframe.cpp
index 3d691e4f5fca..e12e14d3fac0 100644
--- a/multimedia/dvbcut/files/patch-avframe.cpp
+++ b/multimedia/dvbcut/files/patch-src_avframe.cpp
@@ -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));
diff --git a/multimedia/dvbcut/files/patch-defines.h b/multimedia/dvbcut/files/patch-src_defines.h
index a49e4205885d..cece00c18f54 100644
--- a/multimedia/dvbcut/files/patch-defines.h
+++ b/multimedia/dvbcut/files/patch-src_defines.h
@@ -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
diff --git a/multimedia/dvbcut/files/patch-src_dvbcut.cpp b/multimedia/dvbcut/files/patch-src_dvbcut.cpp
new file mode 100644
index 000000000000..e6ec53e07830
--- /dev/null
+++ b/multimedia/dvbcut/files/patch-src_dvbcut.cpp
@@ -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;
+   }
+ 
diff --git a/multimedia/dvbcut/files/patch-dvbcut.h b/multimedia/dvbcut/files/patch-src_dvbcut.h
index 50f94d9bd062..d20c993118e4 100644
--- a/multimedia/dvbcut/files/patch-dvbcut.h
+++ b/multimedia/dvbcut/files/patch-src_dvbcut.h
@@ -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
diff --git a/multimedia/dvbcut/files/patch-index.h b/multimedia/dvbcut/files/patch-src_index.h
index 22f324b709bc..6507b53b94ea 100644
--- a/multimedia/dvbcut/files/patch-index.h
+++ b/multimedia/dvbcut/files/patch-src_index.h
@@ -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
diff --git a/multimedia/dvbcut/pkg-descr b/multimedia/dvbcut/pkg-descr
index 00fb6f74a307..3a16c382d50c 100644
--- a/multimedia/dvbcut/pkg-descr
+++ b/multimedia/dvbcut/pkg-descr
@@ -5,4 +5,4 @@ surgery" approach. Thus, the input video and audio data is mostly kept
 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/