From nobody Wed Jun 28 10:48:11 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QrdbH6HMzz4kLCh; Wed, 28 Jun 2023 10:48:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QrdbH5RsMz3KQm; Wed, 28 Jun 2023 10:48:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687949291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIPa6TCjSG5kEEvA5+x0jnDf4YhKdt7YPr7sMXYuALI=; b=rUA6iu3M3H2KPlK/65YBz8dVKVoH3WQrH+smxZSrL1NVMfcrCPoUnYdEfxC1Me0aihV1gu XGH+KEb5d5GWpF6Ujk7+sr/PMWnnLy5PjNka/hQrPEccF7Nq8kkjGsoEvDJHXn2/pnK/rm aC4mwE09FHgfbMJoNMnJJNT2V93DdDXMxJJrYWA6L6hi64cWiT95hNqEDOC6NZ4MJ8+0wz M3cF3qZiJuYkh5bzX/T0RRBJz5EYpFLg7kLeIELUahs9OShxcKPDCQBzGIpjowWCEj+01Q TFn1ENLtqAYmGlJ3+BgvtdWF4tMfV2yLiUkKwE1uCSTYsmcH4IIrMr3436t0og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687949291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIPa6TCjSG5kEEvA5+x0jnDf4YhKdt7YPr7sMXYuALI=; b=EPNkpxuDoKL2YmUd02u+qsJQKc6FVY6S8bT8ksGT6K5EXZEjNyUcfK47bSCrzVr/oHBemJ cSTewwua62aSR6vP2ns3lldd5XKrP/WApii79cDQBaJnHsHgljuFFwWRhCKDVLr+oeT7/k 6YiOZ+Jve/rWvBfJZPTYBayNHdQFJBhNbjjaXDGRtnJsOlFAiwOfGdfgzmkUwArdJeDXeo jnj0gGu/qaEGLcrfiDNbRLS7Z6StDucOgD6LOzk4BpDVDeCmE4r8ksnJ/LSW2oRcLwIGot p8SiQhvlYRwqbOg4DeZyDadSZvt7p5fBM50toVJBWPEaYRmqstwiFIuxg+lSeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687949291; a=rsa-sha256; cv=none; b=DEXoqvGFYVBGzUfrK0/3XFl450/Q6raUdn0zuuYI2+Q9Cyfv+IVbARVQ8NrvDB4rkO8P4K +imuMGvCdQBb8kxW9kRfFI3rsUdpbJbLR3pu/+F4fleoSltNe+FH8bFUA8oAqjwHoxCA7a yzEpyRG9SJ0CeznkSaFYC0xG/Fgx/Gb+tP5OKMQXluuRgNI8z7fkHSf4NVoC1+wgd6KzZJ dFC8nCG10d2hcGbvEmfxPT/b8WoAwtCHbu5mHlVjWhttXPwNmSBDEHTxfBiNmhf+Wxc/7F rcumSPfyi7ugXCrcGUgp6+qLRC+Qdmz6c0+nL0I0Nxlv8dMn2Z8eQnPmXdBKog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QrdbH4N15zWQM; Wed, 28 Jun 2023 10:48:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35SAmBZx059100; Wed, 28 Jun 2023 10:48:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35SAmBxJ059099; Wed, 28 Jun 2023 10:48:11 GMT (envelope-from git) Date: Wed, 28 Jun 2023 10:48:11 GMT Message-Id: <202306281048.35SAmBxJ059099@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: f58dcd87ec17 - main - multimedia/dvbcut: fix build on 14-CURRENT List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f58dcd87ec179a84b92cdc30e585e97c3562f521 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=f58dcd87ec179a84b92cdc30e585e97c3562f521 commit f58dcd87ec179a84b92cdc30e585e97c3562f521 Author: Stefan Eßer AuthorDate: 2023-06-28 10:47:00 +0000 Commit: Stefan Eßer 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 expd(new exportdialog(QString::fromStdString(expfilen),this)); -+ std::auto_ptr 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 mux; -+ std::auto_ptr mux; - uint32_t audiostreammask(0); - - for(int a=0;agetaudiostreams();++a) -@@ -737,17 +737,17 @@ void dvbcut::fileExport() - - switch(expfmt) { - case 1: -- mux = std::unique_ptr(new mpegmuxer(audiostreammask,*mpg,out_file.c_str(),false,0)); -+ mux = std::auto_ptr(new mpegmuxer(audiostreammask,*mpg,out_file.c_str(),false,0)); - break; - case 2: -- mux = std::unique_ptr(new lavfmuxer("dvd",audiostreammask,*mpg,out_file.c_str())); -+ mux = std::auto_ptr(new lavfmuxer("dvd",audiostreammask,*mpg,out_file.c_str())); - break; - case 3: -- mux = std::unique_ptr(new lavfmuxer("mpegts",audiostreammask,*mpg,out_file.c_str())); -+ mux = std::auto_ptr(new lavfmuxer("mpegts",audiostreammask,*mpg,out_file.c_str())); - break; - case 0: - default: -- mux = std::unique_ptr(new mpegmuxer(audiostreammask,*mpg,out_file.c_str())); -+ mux = std::auto_ptr(new mpegmuxer(audiostreammask,*mpg,out_file.c_str())); - break; - } -