Attachment #240853 for bug #270223




PORTNAME=	dvdstyler
DISTVERSION=	3.3b3
PORTREVISION=	1
PORTEPOCH=	2
CATEGORIES=	multimedia
#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

		mkisofs:sysutils/cdrtools \
		growisofs:sysutils/dvd+rw-tools

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

CONFIGURE_ENV=	ac_cv_path_AVCONV_PATH="" OBJCXX="${CXX}"
LDFLAGS+=	-L${LOCALBASE}/lib

OPTIONS_DEFINE=	DOCS


Lines 1-3 Link Here

(-)b/multimedia/dvdstyler/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1636284298	1	TIMESTAMP = 1678827360
2	SHA256 (DVDStyler-3.2.1.tar.bz2) = 0bb3348739f4c93097454b814ecb3a58f6bace8f030f41619a9feeafb4747558	2	SHA256 (DVDStyler-3.3b3.tar.bz2) = 7e37417f464640dfeecffb5fd4ed212999845b1c43955b203f3d691e782fe52b
3	SIZE (DVDStyler-3.2.1.tar.bz2) = 9040634	3	SIZE (DVDStyler-3.3b3.tar.bz2) = 9899576




--- 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]))

Removed Link Here

(-)a/multimedia/dvdstyler/files/patch-wxVillaLib-PropDlg.cpp (-10 lines)
1	--- wxVillaLib/PropDlg2.cpp 2021-07-28 16:49:08.802073000 +0100
2	+++ wxVillaLib/PropDlg.cpp 2021-07-28 16:49:33.888103000 +0100
3	@@ -12,7 +12,6 @@
4	#include "utils.h"
5	#include <wx/fontdlg.h>
6	#include <wx/colordlg.h>
7	-#include <wx/generic/colrdlgg.h>
8	#include <wx/filedlg.h>
9	#include <wx/dirdlg.h>
10	#include <wx/grid.h>




%%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

%%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

%%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

%%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

%%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

%%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

Return to bug 270223

Lines 1-10 Link Here

(-)b/multimedia/dvdstyler/Makefile (-11 / +9 lines)
1	PORTNAME= dvdstyler	1	PORTNAME= dvdstyler
2	PORTVERSION= 3.2.1	2	DISTVERSION= 3.3b3
3	PORTREVISION= 1
4	PORTEPOCH= 2	3	PORTEPOCH= 2
5	CATEGORIES= multimedia	4	CATEGORIES= multimedia
6	MASTER_SITES= SF	5	#MASTER_SITES= SF
7	DISTNAME= DVDStyler-${PORTVERSION}	6	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/${DISTVERSION}
		7	DISTNAME= DVDStyler-${DISTVERSION}
8		8
9	MAINTAINER= ahicks@p-o.co.uk	9	MAINTAINER= ahicks@p-o.co.uk
10	COMMENT= WxWidgets frontend to dvd recoding and authoring programs	10	COMMENT= WxWidgets frontend to dvd recoding and authoring programs
Lines 33-48 RUN_DEPENDS= zip:archivers/zip \ Link Here
33	mkisofs:sysutils/cdrtools \	33	mkisofs:sysutils/cdrtools \
34	growisofs:sysutils/dvd+rw-tools	34	growisofs:sysutils/dvd+rw-tools
35		35
36	USES= autoreconf compiler:c++11-lib gettext gmake jpeg pkgconfig tar:bzip2	36	USES= autoreconf compiler:c++11-lib gettext gmake jpeg \
37		37	localbase:ldflags pkgconfig tar:bzip2
38	USE_WX= 3.2	38	USE_WX= 3.2+
39	WX_CONF_ARGS= absolute	39	WX_CONF_ARGS= absolute
		40
40	GNU_CONFIGURE= yes	41	GNU_CONFIGURE= yes
41	CONFIGURE_ENV= ac_cv_path_AVCONV_PATH="" OBJCXX="${CXX}"
42	CONFIGURE_ARGS= --without-gnome
43		42
44	CPPFLAGS+= -I${LOCALBASE}/include	43	CONFIGURE_ENV= ac_cv_path_AVCONV_PATH="" OBJCXX="${CXX}"
45	LDFLAGS+= -L${LOCALBASE}/lib
46		44
47	OPTIONS_DEFINE= DOCS	45	OPTIONS_DEFINE= DOCS
48		46

Removed Link Here

(-)a/multimedia/dvdstyler/files/patch-configure.ac (-20 lines)
1	--- configure.ac.orig 2019-10-03 16:00:00 UTC
2	+++ configure.ac
3	@@ -9,6 +9,7 @@ AM_MAINTAINER_MODE
4	dnl options
5	AM_OPTIONS_WXCONFIG
6	AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging information], USE_DEBUG="$enableval", USE_DEBUG="no")
7	+AC_ARG_WITH(gnome, [ --with-gnome Use libgnomeui for rendering of thumbnails], with_gnome="$withval", with_gnome="no")
8
9	AC_MSG_CHECKING(for install location)
10	case "$prefix" in
11	@@ -113,7 +114,9 @@ if test "x$WXSVGLIBAV" = x"no"; then
12	fi
13
14	dnl check gnomeui-2.0
15	+if test x"$with_gnome" != x"no"; then
16	CHECK_WX_BUILT_WITH_GTK2()
17	+fi
18	if test x"$GTK_USEDVERSION" = x"2" ; then
19	PKG_CHECK_MODULES(GNOMEUI2, libgnomeui-2.0, GNOME2="-DGNOME2",
20	AC_MSG_WARN([libgnomeui will not be used for rendering of thumbnails]))

Lines 45-50 share/applications/dvdstyler.desktop Link Here

(-)b/multimedia/dvdstyler/pkg-plist (-1 / +10 lines)
45	%%DATADIR%%/backgrounds/green_trees.jpg	45	%%DATADIR%%/backgrounds/green_trees.jpg
46	%%DATADIR%%/backgrounds/penguin.png	46	%%DATADIR%%/backgrounds/penguin.png
47	%%DATADIR%%/backgrounds/red_sky.jpg	47	%%DATADIR%%/backgrounds/red_sky.jpg
		48	%%DATADIR%%/backgrounds/wall.jpg
48	%%DATADIR%%/buttons/arrow-blue.xml	49	%%DATADIR%%/buttons/arrow-blue.xml
49	%%DATADIR%%/buttons/arrow-cool.xml	50	%%DATADIR%%/buttons/arrow-cool.xml
50	%%DATADIR%%/buttons/arrow-double.xml	51	%%DATADIR%%/buttons/arrow-double.xml
Lines 83-88 share/applications/dvdstyler.desktop Link Here
83	%%DATADIR%%/buttons/deprecated/frame-shadow.xml	84	%%DATADIR%%/buttons/deprecated/frame-shadow.xml
84	%%DATADIR%%/buttons/deprecated/frame.xml	85	%%DATADIR%%/buttons/deprecated/frame.xml
85	%%DATADIR%%/buttons/deprecated/frame45.xml	86	%%DATADIR%%/buttons/deprecated/frame45.xml
		87	%%DATADIR%%/buttons/deprecated/gold-frame.xml
86	%%DATADIR%%/buttons/deprecated/home.xml	88	%%DATADIR%%/buttons/deprecated/home.xml
87	%%DATADIR%%/buttons/deprecated/text-circle.xml	89	%%DATADIR%%/buttons/deprecated/text-circle.xml
88	%%DATADIR%%/buttons/deprecated/text-shadow.xml	90	%%DATADIR%%/buttons/deprecated/text-shadow.xml
Lines 96-103 share/applications/dvdstyler.desktop Link Here
96	%%DATADIR%%/buttons/frame-text.xml	98	%%DATADIR%%/buttons/frame-text.xml
97	%%DATADIR%%/buttons/frame-v2.xml	99	%%DATADIR%%/buttons/frame-v2.xml
98	%%DATADIR%%/buttons/gear.xml	100	%%DATADIR%%/buttons/gear.xml
		101	%%DATADIR%%/buttons/gold-frame-v2.xml
99	%%DATADIR%%/buttons/glow_arrow.xml	102	%%DATADIR%%/buttons/glow_arrow.xml
100	%%DATADIR%%/buttons/gold-frame.xml
101	%%DATADIR%%/buttons/hand-left.xml	103	%%DATADIR%%/buttons/hand-left.xml
102	%%DATADIR%%/buttons/hand-right.xml	104	%%DATADIR%%/buttons/hand-right.xml
103	%%DATADIR%%/buttons/home-moon.xml	105	%%DATADIR%%/buttons/home-moon.xml
Lines 147-152 share/applications/dvdstyler.desktop Link Here
147	%%DATADIR%%/docs/help_uk.zip	149	%%DATADIR%%/docs/help_uk.zip
148	%%DATADIR%%/docs/help_zh_CN.zip	150	%%DATADIR%%/docs/help_zh_CN.zip
149	%%DATADIR%%/docs/help_zh_TW.zip	151	%%DATADIR%%/docs/help_zh_TW.zip
		152	%%DATADIR%%/objects/caption-rectangle.xml
150	%%DATADIR%%/objects/caption-line.xml	153	%%DATADIR%%/objects/caption-line.xml
151	%%DATADIR%%/objects/deprecated/ellipse-v2.xml	154	%%DATADIR%%/objects/deprecated/ellipse-v2.xml
152	%%DATADIR%%/objects/deprecated/ellipse.xml	155	%%DATADIR%%/objects/deprecated/ellipse.xml
Lines 195-200 share/applications/dvdstyler.desktop Link Here
195	%%DATADIR%%/rc/run.png	198	%%DATADIR%%/rc/run.png
196	%%DATADIR%%/rc/save.png	199	%%DATADIR%%/rc/save.png
197	%%DATADIR%%/rc/settings.png	200	%%DATADIR%%/rc/settings.png
		201	%%DATADIR%%/templates/Basic/Wall.dvdt
		202	%%DATADIR%%/templates/Basic/Wall.png
198	%%DATADIR%%/templates/Basic/blue.dvdt	203	%%DATADIR%%/templates/Basic/blue.dvdt
199	%%DATADIR%%/templates/Basic/blue.png	204	%%DATADIR%%/templates/Basic/blue.png
200	%%DATADIR%%/templates/Basic/blueWS.dvdt	205	%%DATADIR%%/templates/Basic/blueWS.dvdt
Lines 215-220 share/applications/dvdstyler.desktop Link Here
215	%%DATADIR%%/templates/Basic/ocean.png	220	%%DATADIR%%/templates/Basic/ocean.png
216	%%DATADIR%%/templates/Basic/oceanWS.dvdt	221	%%DATADIR%%/templates/Basic/oceanWS.dvdt
217	%%DATADIR%%/templates/Basic/oceanWS.png	222	%%DATADIR%%/templates/Basic/oceanWS.png
		223	%%DATADIR%%/templates/Basic/textAuto1.dvdt
		224	%%DATADIR%%/templates/Basic/textAuto1.png
		225	%%DATADIR%%/templates/Basic/textAuto1WS.dvdt
		226	%%DATADIR%%/templates/Basic/textAuto1WS.png
218	%%DATADIR%%/templates/Basic/turbulence.dvdt	227	%%DATADIR%%/templates/Basic/turbulence.dvdt
219	%%DATADIR%%/templates/Basic/turbulence.png	228	%%DATADIR%%/templates/Basic/turbulence.png
220	%%DATADIR%%/templates/Basic/turbulenceWS.dvdt	229	%%DATADIR%%/templates/Basic/turbulenceWS.dvdt