Date: Wed, 28 Jun 2023 18:45:50 +0200 From: Daniel Engberg <diizzy@FreeBSD.org> To: =?UTF-8?Q?Stefan_E=C3=9Fer?= <se@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: f58dcd87ec17 - main - multimedia/dvbcut: fix build on 14-CURRENT Message-ID: <513c88293494ecebea154bfea0a1aefd@FreeBSD.org> In-Reply-To: <202306281048.35SAmBxJ059099@gitrepo.freebsd.org> References: <202306281048.35SAmBxJ059099@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2023-06-28 12:48, Stefan Eßer wrote: > The branch main has been updated by se: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=f58dcd87ec179a84b92cdc30e585e97c3562f521 > > commit f58dcd87ec179a84b92cdc30e585e97c3562f521 > Author: Stefan Eßer <se@FreeBSD.org> > AuthorDate: 2023-06-28 10:47:00 +0000 > Commit: Stefan Eßer <se@FreeBSD.org> > CommitDate: 2023-06-28 10:47:00 +0000 > > multimedia/dvbcut: fix build on 14-CURRENT > > Use unique_ptr instead of auto_ptr which has been removed from > C++17. > --- > multimedia/dvbcut/Makefile | 3 +- > multimedia/dvbcut/distinfo | 6 ++-- > multimedia/dvbcut/files/patch-src_dvbcut.cpp | 42 > ---------------------------- > 3 files changed, 5 insertions(+), 46 deletions(-) > > diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile > index 897f511fa0d2..b43da5e6289d 100644 > --- a/multimedia/dvbcut/Makefile > +++ b/multimedia/dvbcut/Makefile > @@ -1,7 +1,7 @@ > PORTNAME= dvbcut > PORTVERSION= 0.7.4 > DISTVERSIONPREFIX= v > -PORTREVISION= 4 > +PORTREVISION= 5 > CATEGORIES= multimedia > > MAINTAINER= se@FreeBSD.org > @@ -26,6 +26,7 @@ USE_GL= gl > USE_GITHUB= yes > GH_ACCOUNT= bernhardu > GH_PROJECT= dvbcut-deb > +GH_TAGNAME= d7c8fad > > CXXFLAGS+= -I${LOCALBASE}/include \ > -I${LOCALBASE}/include/libavcodec \ > diff --git a/multimedia/dvbcut/distinfo b/multimedia/dvbcut/distinfo > index e31d894b4bd3..a8d3508376c3 100644 > --- a/multimedia/dvbcut/distinfo > +++ b/multimedia/dvbcut/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1656366943 > -SHA256 (bernhardu-dvbcut-deb-v0.7.4_GH0.tar.gz) = > e1009e264079c0fdd3b423a84c31aafd0c3069cd137edbd6e2b16e884550f66e > -SIZE (bernhardu-dvbcut-deb-v0.7.4_GH0.tar.gz) = 194965 > +TIMESTAMP = 1676714313 > +SHA256 (bernhardu-dvbcut-deb-v0.7.4-d7c8fad_GH0.tar.gz) = > 5c5c17ab235dd1568c7e1ab1e43e6c1d9f94db5dbfb0beeaf609ec81d92cd1e4 > +SIZE (bernhardu-dvbcut-deb-v0.7.4-d7c8fad_GH0.tar.gz) = 198570 > diff --git a/multimedia/dvbcut/files/patch-src_dvbcut.cpp > b/multimedia/dvbcut/files/patch-src_dvbcut.cpp > deleted file mode 100644 > index e6ec53e07830..000000000000 > --- a/multimedia/dvbcut/files/patch-src_dvbcut.cpp > +++ /dev/null > @@ -1,42 +0,0 @@ > ---- 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; > - } > - Hi, This isn't 0.7.4 you're packaging, please tag it appropriately instead of abusing GH_TAGNAME. Best regards, Daniel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?513c88293494ecebea154bfea0a1aefd>