Attachment 240853 Details for Bug 270223 – Patch for dvdstyler

[patch] Patch for dvdstyler

ffmpeg6-compat-dvdstyler.patch (text/plain), 5.67 KB, created by Daniel Engberg on 2023-03-14 21:31:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2023-03-14 21:31:55 UTC

Size: 5.67 KB

patch

obsolete

>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-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 <wx/fontdlg.h>
>- #include <wx/colordlg.h>
>--#include <wx/generic/colrdlgg.h>
>- #include <wx/filedlg.h>
>- #include <wx/dirdlg.h>
>- #include <wx/grid.h>
>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

Actions: View | Diff

Attachments on bug 270223: 240853 | 240916 | 241122 | 241270