From nobody Sat Apr 08 11:47:38 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 4PttlH0NJWz44Lqm; Sat, 8 Apr 2023 11:47:39 +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 4PttlG5VXFz3Gkk; Sat, 8 Apr 2023 11:47:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680954458; 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=C0MtNNqDdPf/UuFeHn9bb2NpLwT65f8Cdf0FtDR/HWc=; b=Dqeub9fKuFw19FWhdqKOP4te4ZCrlIY2XTJnQuvdKubCdBI1zCaJQfgOLsavE5TNroz1k8 /fx/jEPLGDdUyLksdGLvVzGR2qorK6bNKVOck1fLLxnOGHzYbinkLgNMm4PmPgy9fdIy8H fQCpejqj5SDWGTviO6rS5Gt9yKcepP8xivgug7soDa4RF9VAE45aUMl0WW5V8ocofdmbsj rUQjfbXhHfh+mWSmNNDfavV+PHr/8m/KC1Xn7L8Yy+9DgxEvuZewZElJgtdGSmlJ68ebgu f3Iz97xZVf/je24X6amZrcpTzF8D/b0iuUMmzTSc7AJQmHcWB5N4oYtyEmMYEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680954458; 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=C0MtNNqDdPf/UuFeHn9bb2NpLwT65f8Cdf0FtDR/HWc=; b=QpaRQhGLXyF2GYFob6S/9TwSxfSpKDGTinNzcBLRps7ONxmMTl3LNQWP290vSXEZpsE5HW 1Tu6LF0drLVBVEZj0s69NsZ5mN0YBrBNs3FmOpc3UaMZ6zXfrvN/E3VtSbFNJfXHFNh9cC D6b7xEcLsrIZmwADQ0JYBY5EEWPtDoEqxkr0f1bgMVHOrhWzZK1kWTl5JQHWUe/uW2zS7u OKUcUv+xcQPX2nzliVQgSMfLnNblfPTQfmaGrIW0+/YVTSLUShZWdgTglEffYfN690qoNB uxEkhJK12aSrb5Rg54CiKFDz2tLd2p2TjE3etUufOhmTQEHt20L0gHexev7zKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680954458; a=rsa-sha256; cv=none; b=fnEZAkzydrjcZol1SGJXNpNkhw2GeS9S46T2UWRNmKxs9IU6wGBmu0Xh+sjHZpEAysvNTv lThVpddXPqqdnmplxQh/1mdTW4KLADVnaZgP0UAmU26ax3yQUJ6aXzXyZKX5DqZM3wmIWB UElRq4XjbE2zxI6TINP4JtdgHVGNWoqnmDrFSVFK1XdqWe3yiFHhwyqb+FT8JONHKQCMy8 HeqtPkffTG7jrwQxFAPWp1NfW90nCNoQDBQRi9Co33b4PewfbbFDe74HhpV6riYMWeNANj 48lokUykaLunPsNpQvz9t2xwXik2NXwHCRENej/fbRm0OcTmze22/vH2d7IJOg== 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 4PttlG4cZmzQmG; Sat, 8 Apr 2023 11:47:38 +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 338Blc6r026221; Sat, 8 Apr 2023 11:47:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 338Blcn8026220; Sat, 8 Apr 2023 11:47:38 GMT (envelope-from git) Date: Sat, 8 Apr 2023 11:47:38 GMT Message-Id: <202304081147.338Blcn8026220@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 56be636b7f70 - main - multimedia/dvdstyler: Update to 3.3b3 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56be636b7f70848199f09c3036c7051690c42965 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=56be636b7f70848199f09c3036c7051690c42965 commit 56be636b7f70848199f09c3036c7051690c42965 Author: Daniel Engberg AuthorDate: 2023-04-08 11:37:55 +0000 Commit: Daniel Engberg CommitDate: 2023-04-08 11:40:39 +0000 multimedia/dvdstyler: Update to 3.3b3 - Fixes build with FFmpeg 6 - Additional runtime patch by Alan Hicks (maintainer) Changelog: https://sourceforge.net/projects/dvdstyler/files/dvdstyler-devel/3.3b3/ PR: 270223 Reviewed by: Alan Hicks (maintainer) Tested by: Alan Hicks --- multimedia/dvdstyler/Makefile | 20 +++++++++----------- multimedia/dvdstyler/distinfo | 6 +++--- multimedia/dvdstyler/files/patch-configure.ac | 20 -------------------- .../dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp | 12 ++++++++++++ .../dvdstyler/files/patch-wxVillaLib-PropDlg.cpp | 10 ---------- multimedia/dvdstyler/pkg-plist | 11 ++++++++++- 6 files changed, 34 insertions(+), 45 deletions(-) diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile index 54448df35bc7..a8f4fbd90766 100644 --- a/multimedia/dvdstyler/Makefile +++ b/multimedia/dvdstyler/Makefile @@ -1,10 +1,10 @@ PORTNAME= dvdstyler -PORTVERSION= 3.2.1 -PORTREVISION= 1 +DISTVERSION= 3.3b3 PORTEPOCH= 2 CATEGORIES= multimedia -MASTER_SITES= SF -DISTNAME= DVDStyler-${PORTVERSION} +#MASTER_SITES= SF +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/${DISTVERSION} +DISTNAME= DVDStyler-${DISTVERSION} MAINTAINER= ahicks@p-o.co.uk COMMENT= WxWidgets frontend to dvd recoding and authoring programs @@ -33,16 +33,14 @@ RUN_DEPENDS= zip:archivers/zip \ mkisofs:sysutils/cdrtools \ growisofs:sysutils/dvd+rw-tools -USES= autoreconf compiler:c++11-lib gettext gmake jpeg pkgconfig tar:bzip2 - -USE_WX= 3.2 +USES= autoreconf compiler:c++11-lib gettext gmake jpeg \ + localbase:ldflags pkgconfig tar:bzip2 +USE_WX= 3.2+ WX_CONF_ARGS= absolute + GNU_CONFIGURE= yes -CONFIGURE_ENV= ac_cv_path_AVCONV_PATH="" OBJCXX="${CXX}" -CONFIGURE_ARGS= --without-gnome -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ENV= ac_cv_path_AVCONV_PATH="" OBJCXX="${CXX}" OPTIONS_DEFINE= DOCS diff --git a/multimedia/dvdstyler/distinfo b/multimedia/dvdstyler/distinfo index ff967f3cf876..c3c191dac576 100644 --- a/multimedia/dvdstyler/distinfo +++ b/multimedia/dvdstyler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636284298 -SHA256 (DVDStyler-3.2.1.tar.bz2) = 0bb3348739f4c93097454b814ecb3a58f6bace8f030f41619a9feeafb4747558 -SIZE (DVDStyler-3.2.1.tar.bz2) = 9040634 +TIMESTAMP = 1678827360 +SHA256 (DVDStyler-3.3b3.tar.bz2) = 7e37417f464640dfeecffb5fd4ed212999845b1c43955b203f3d691e782fe52b +SIZE (DVDStyler-3.3b3.tar.bz2) = 9899576 diff --git a/multimedia/dvdstyler/files/patch-configure.ac b/multimedia/dvdstyler/files/patch-configure.ac deleted file mode 100644 index 336b89e07e77..000000000000 --- a/multimedia/dvdstyler/files/patch-configure.ac +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.ac.orig 2019-10-03 16:00:00 UTC -+++ configure.ac -@@ -9,6 +9,7 @@ AM_MAINTAINER_MODE - dnl options - AM_OPTIONS_WXCONFIG - AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging information], USE_DEBUG="$enableval", USE_DEBUG="no") -+AC_ARG_WITH(gnome, [ --with-gnome Use libgnomeui for rendering of thumbnails], with_gnome="$withval", with_gnome="no") - - AC_MSG_CHECKING(for install location) - case "$prefix" in -@@ -113,7 +114,9 @@ if test "x$WXSVGLIBAV" = x"no"; then - fi - - dnl check gnomeui-2.0 -+if test x"$with_gnome" != x"no"; then - CHECK_WX_BUILT_WITH_GTK2() -+fi - if test x"$GTK_USEDVERSION" = x"2" ; then - PKG_CHECK_MODULES(GNOMEUI2, libgnomeui-2.0, GNOME2="-DGNOME2", - AC_MSG_WARN([libgnomeui will not be used for rendering of thumbnails])) diff --git a/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp b/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp new file mode 100644 index 000000000000..c43c9d1ea648 --- /dev/null +++ b/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp @@ -0,0 +1,12 @@ +--- src/mediaenc_ffmpeg.cpp.orig 2022-10-03 20:02:59 UTC ++++ src/mediaenc_ffmpeg.cpp +@@ -330,7 +330,9 @@ bool wxFfmpegMediaEncoder::addAudioStream(int codecId) + return false; + for (int i = 0; i < c->channels; i++) { + uint16_t *samples = (uint16_t*)m_audioFrame->data[i]; ++ if (samples) { + memset(samples, 0, c->frame_size * av_get_bytes_per_sample(c->sample_fmt)); ++ } + } + + return true; diff --git a/multimedia/dvdstyler/files/patch-wxVillaLib-PropDlg.cpp b/multimedia/dvdstyler/files/patch-wxVillaLib-PropDlg.cpp deleted file mode 100644 index fdfad8aca8ba..000000000000 --- a/multimedia/dvdstyler/files/patch-wxVillaLib-PropDlg.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- wxVillaLib/PropDlg2.cpp 2021-07-28 16:49:08.802073000 +0100 -+++ wxVillaLib/PropDlg.cpp 2021-07-28 16:49:33.888103000 +0100 -@@ -12,7 +12,6 @@ - #include "utils.h" - #include - #include --#include - #include - #include - #include diff --git a/multimedia/dvdstyler/pkg-plist b/multimedia/dvdstyler/pkg-plist index ccc8c8d82343..ba76d0a28194 100644 --- a/multimedia/dvdstyler/pkg-plist +++ b/multimedia/dvdstyler/pkg-plist @@ -45,6 +45,7 @@ share/applications/dvdstyler.desktop %%DATADIR%%/backgrounds/green_trees.jpg %%DATADIR%%/backgrounds/penguin.png %%DATADIR%%/backgrounds/red_sky.jpg +%%DATADIR%%/backgrounds/wall.jpg %%DATADIR%%/buttons/arrow-blue.xml %%DATADIR%%/buttons/arrow-cool.xml %%DATADIR%%/buttons/arrow-double.xml @@ -83,6 +84,7 @@ share/applications/dvdstyler.desktop %%DATADIR%%/buttons/deprecated/frame-shadow.xml %%DATADIR%%/buttons/deprecated/frame.xml %%DATADIR%%/buttons/deprecated/frame45.xml +%%DATADIR%%/buttons/deprecated/gold-frame.xml %%DATADIR%%/buttons/deprecated/home.xml %%DATADIR%%/buttons/deprecated/text-circle.xml %%DATADIR%%/buttons/deprecated/text-shadow.xml @@ -96,8 +98,8 @@ share/applications/dvdstyler.desktop %%DATADIR%%/buttons/frame-text.xml %%DATADIR%%/buttons/frame-v2.xml %%DATADIR%%/buttons/gear.xml +%%DATADIR%%/buttons/gold-frame-v2.xml %%DATADIR%%/buttons/glow_arrow.xml -%%DATADIR%%/buttons/gold-frame.xml %%DATADIR%%/buttons/hand-left.xml %%DATADIR%%/buttons/hand-right.xml %%DATADIR%%/buttons/home-moon.xml @@ -147,6 +149,7 @@ share/applications/dvdstyler.desktop %%DATADIR%%/docs/help_uk.zip %%DATADIR%%/docs/help_zh_CN.zip %%DATADIR%%/docs/help_zh_TW.zip +%%DATADIR%%/objects/caption-rectangle.xml %%DATADIR%%/objects/caption-line.xml %%DATADIR%%/objects/deprecated/ellipse-v2.xml %%DATADIR%%/objects/deprecated/ellipse.xml @@ -195,6 +198,8 @@ share/applications/dvdstyler.desktop %%DATADIR%%/rc/run.png %%DATADIR%%/rc/save.png %%DATADIR%%/rc/settings.png +%%DATADIR%%/templates/Basic/Wall.dvdt +%%DATADIR%%/templates/Basic/Wall.png %%DATADIR%%/templates/Basic/blue.dvdt %%DATADIR%%/templates/Basic/blue.png %%DATADIR%%/templates/Basic/blueWS.dvdt @@ -215,6 +220,10 @@ share/applications/dvdstyler.desktop %%DATADIR%%/templates/Basic/ocean.png %%DATADIR%%/templates/Basic/oceanWS.dvdt %%DATADIR%%/templates/Basic/oceanWS.png +%%DATADIR%%/templates/Basic/textAuto1.dvdt +%%DATADIR%%/templates/Basic/textAuto1.png +%%DATADIR%%/templates/Basic/textAuto1WS.dvdt +%%DATADIR%%/templates/Basic/textAuto1WS.png %%DATADIR%%/templates/Basic/turbulence.dvdt %%DATADIR%%/templates/Basic/turbulence.png %%DATADIR%%/templates/Basic/turbulenceWS.dvdt