multimedia/dvdstyler: Update to version 3.1

While here, pass maintainership to submitter

PR:		241054
Submitted by:	Alan Hicks <ahicks@p-o.co.uk>

7 files changed, 34 insertions, 46 deletions

diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index d0052b152804..dd1300e1bdae 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -2,14 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	dvdstyler
-PORTVERSION=	2.9.6
-PORTREVISION=	13
+PORTVERSION=	3.1
+PORTREVISION=	0
 PORTEPOCH=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 DISTNAME=	DVDStyler-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ahicks@p-o.co.uk
 COMMENT=	WxWidgets frontend to dvd recoding and authoring programs
 
 LICENSE=	GPLv2
diff --git a/multimedia/dvdstyler/distinfo b/multimedia/dvdstyler/distinfo
index 7137cecdb1f2..ed948a52303c 100644
--- a/multimedia/dvdstyler/distinfo
+++ b/multimedia/dvdstyler/distinfo
@@ -1,2 +1,3 @@
-SHA256 (DVDStyler-2.9.6.tar.bz2) = d9ac1c2fa8812c194d4a79a5954f96919a4823498a4200018964df549270c6e3
-SIZE (DVDStyler-2.9.6.tar.bz2) = 8373340
+TIMESTAMP = 1570461589
+SHA256 (DVDStyler-3.1.tar.bz2) = 75149d8cde026478191c75303a8a8e03ff10dadcb686ca92aa3a7decf24ee6e7
+SIZE (DVDStyler-3.1.tar.bz2) = 8990074
diff --git a/multimedia/dvdstyler/files/patch-configure.ac b/multimedia/dvdstyler/files/patch-configure.ac
index 64358677a295..336b89e07e77 100644
--- a/multimedia/dvdstyler/files/patch-configure.ac
+++ b/multimedia/dvdstyler/files/patch-configure.ac
@@ -1,4 +1,4 @@
---- configure.ac.orig	2015-02-17 21:14:03 UTC
+--- configure.ac.orig	2019-10-03 16:00:00 UTC
 +++ configure.ac
 @@ -9,6 +9,7 @@ AM_MAINTAINER_MODE
  dnl options
@@ -8,7 +8,7 @@
  
  AC_MSG_CHECKING(for install location)
  case "$prefix" in
-@@ -112,7 +113,9 @@ if test "x$WXSVGLIBAV" = x"no"; then
+@@ -113,7 +114,9 @@ if test "x$WXSVGLIBAV" = x"no"; then
  fi
  
  dnl check gnomeui-2.0
diff --git a/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp b/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp
deleted file mode 100644
index 0b41a21b37f1..000000000000
--- a/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-mediaenc_ffmpeg.cpp:215:18: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
-            c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-                        ^
-
---- src/mediaenc_ffmpeg.cpp.orig	2015-10-04 13:18:58 UTC
-+++ src/mediaenc_ffmpeg.cpp
-@@ -48,6 +48,9 @@ extern "C" {
- #define av_frame_free avcodec_free_frame
- #endif
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 34, 1)
-+#define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
-+#endif
- 
- wxFfmpegMediaEncoder::wxFfmpegMediaEncoder(int threadCount) {
- 	m_threadCount = threadCount;
-@@ -212,7 +215,7 @@ bool wxFfmpegMediaEncoder::addAudioStream(int codecId)
- 	c->time_base = (AVRational){ 1, c->sample_rate };
- 	// some formats want stream headers to be separate
- 	if(m_outputCtx->oformat->flags & AVFMT_GLOBALHEADER)
--	    c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+	    c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 	
- 	return true;
- }
diff --git a/multimedia/dvdstyler/files/patch-wxVillaLib_thumb__md5.cpp b/multimedia/dvdstyler/files/patch-wxVillaLib_thumb__md5.cpp
deleted file mode 100644
index 8ccace79ab45..000000000000
--- a/multimedia/dvdstyler/files/patch-wxVillaLib_thumb__md5.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- wxVillaLib/thumb_md5.cpp.orig	2014-02-25 11:08:27 UTC
-+++ wxVillaLib/thumb_md5.cpp
-@@ -334,8 +334,8 @@ char* escape_string(const char *string)
- 
-         if (!ACCEPTABLE_CHAR (c)) {
-             *q++ = HEX_ESCAPE; /* means hex coming */
--            *q++ = hex[c >> 4];
--            *q++ = hex[c & 15];
-+            *q++ = ::hex[c >> 4];
-+            *q++ = ::hex[c & 15];
-         } else {
-             *q++ = c;
-         }
diff --git a/multimedia/dvdstyler/pkg-descr b/multimedia/dvdstyler/pkg-descr
index 4d5d9d60dffc..44b7bcf8159a 100644
--- a/multimedia/dvdstyler/pkg-descr
+++ b/multimedia/dvdstyler/pkg-descr
@@ -11,4 +11,4 @@ The main DVDStyler features are:
  o set chapters for each movie
  o change post command for each movie
 
-WWW: http://www.dvdstyler.org/
+WWW: https://www.dvdstyler.org/
diff --git a/multimedia/dvdstyler/pkg-plist b/multimedia/dvdstyler/pkg-plist
index 99efb6adce98..63420855a312 100644
--- a/multimedia/dvdstyler/pkg-plist
+++ b/multimedia/dvdstyler/pkg-plist
@@ -33,7 +33,9 @@ share/applications/dvdstyler.desktop
 %%DATADIR%%/backgrounds/Christmas_L1.png
 %%DATADIR%%/backgrounds/Christmas_L6.png
 %%DATADIR%%/backgrounds/Fireworks.jpg
+%%DATADIR%%/backgrounds/Heart.jpg
 %%DATADIR%%/backgrounds/Landscape.png
+%%DATADIR%%/backgrounds/MothersDay.jpg
 %%DATADIR%%/backgrounds/SnowField.png
 %%DATADIR%%/backgrounds/Sun.png
 %%DATADIR%%/backgrounds/Winter.png
@@ -64,6 +66,8 @@ share/applications/dvdstyler.desktop
 %%DATADIR%%/buttons/buttons.lst
 %%DATADIR%%/buttons/cancel.xml
 %%DATADIR%%/buttons/cancel2.xml
+%%DATADIR%%/buttons/circle-outline.xml
+%%DATADIR%%/buttons/circle.xml
 %%DATADIR%%/buttons/deprecated/arrow-down.xml
 %%DATADIR%%/buttons/deprecated/arrow-left.xml
 %%DATADIR%%/buttons/deprecated/arrow-next.xml
@@ -87,20 +91,28 @@ share/applications/dvdstyler.desktop
 %%DATADIR%%/buttons/deprecated/text.xml
 %%DATADIR%%/buttons/ellipse-v2.xml
 %%DATADIR%%/buttons/ellipse45.xml
+%%DATADIR%%/buttons/frame-text.xml
 %%DATADIR%%/buttons/frame-v2.xml
 %%DATADIR%%/buttons/frame45.xml
+%%DATADIR%%/buttons/glow_arrow.xml
 %%DATADIR%%/buttons/hand-left.xml
 %%DATADIR%%/buttons/hand-right.xml
 %%DATADIR%%/buttons/home-v2.xml
+%%DATADIR%%/buttons/movie.xml
 %%DATADIR%%/buttons/ok.xml
 %%DATADIR%%/buttons/ok2.xml
+%%DATADIR%%/buttons/painting_frame.xml
+%%DATADIR%%/buttons/pill-stroke.xml
 %%DATADIR%%/buttons/pill.xml
 %%DATADIR%%/buttons/pill2.xml
 %%DATADIR%%/buttons/pill3.xml
+%%DATADIR%%/buttons/settings.xml
+%%DATADIR%%/buttons/sticky_note.xml
 %%DATADIR%%/buttons/text-circle-v2.xml
 %%DATADIR%%/buttons/text-square-v2.xml
 %%DATADIR%%/buttons/text-underlined-v3.xml
 %%DATADIR%%/buttons/text-v3.xml
+%%DATADIR%%/data/colors16.rgb
 %%DATADIR%%/data/empty_ntsc_ac3.mpg
 %%DATADIR%%/data/empty_ntsc_mp2.mpg
 %%DATADIR%%/data/empty_pal_ac3.mpg
@@ -108,7 +120,10 @@ share/applications/dvdstyler.desktop
 %%DATADIR%%/data/subtitles.rgb
 %%DATADIR%%/docs/help_ca.zip
 %%DATADIR%%/docs/help_de.zip
+%%DATADIR%%/docs/help_el.zip
 %%DATADIR%%/docs/help_en.zip
+%%DATADIR%%/docs/help_es.zip
+%%DATADIR%%/docs/help_eu.zip
 %%DATADIR%%/docs/help_fi.zip
 %%DATADIR%%/docs/help_fr.zip
 %%DATADIR%%/docs/help_hu.zip
@@ -120,6 +135,7 @@ share/applications/dvdstyler.desktop
 %%DATADIR%%/docs/help_pt_BR.zip
 %%DATADIR%%/docs/help_ro.zip
 %%DATADIR%%/docs/help_ru.zip
+%%DATADIR%%/docs/help_si.zip
 %%DATADIR%%/docs/help_uk.zip
 %%DATADIR%%/docs/help_zh_CN.zip
 %%DATADIR%%/docs/help_zh_TW.zip
@@ -137,9 +153,11 @@ share/applications/dvdstyler.desktop
 %%DATADIR%%/objects/gold-frame.xml
 %%DATADIR%%/objects/image.xml
 %%DATADIR%%/objects/rectangle-v2.xml
+%%DATADIR%%/objects/sticky_note.xml
 %%DATADIR%%/objects/text-v2.xml
 %%DATADIR%%/rc/add.png
 %%DATADIR%%/rc/addVideo.png
+%%DATADIR%%/rc/dvdOptions.png
 %%DATADIR%%/rc/dvdstyler.png
 %%DATADIR%%/rc/error.png
 %%DATADIR%%/rc/files.png
@@ -167,10 +185,15 @@ share/applications/dvdstyler.desktop
 %%DATADIR%%/rc/rotate.cur
 %%DATADIR%%/rc/run.png
 %%DATADIR%%/rc/save.png
+%%DATADIR%%/rc/settings.png
 %%DATADIR%%/templates/Basic/blue.dvdt
 %%DATADIR%%/templates/Basic/blue.png
 %%DATADIR%%/templates/Basic/blueWS.dvdt
 %%DATADIR%%/templates/Basic/blueWS.png
+%%DATADIR%%/templates/Basic/frameText.dvdt
+%%DATADIR%%/templates/Basic/frameText.png
+%%DATADIR%%/templates/Basic/frameTextWS.dvdt
+%%DATADIR%%/templates/Basic/frameTextWS.png
 %%DATADIR%%/templates/Basic/neon.dvdt
 %%DATADIR%%/templates/Basic/neon.png
 %%DATADIR%%/templates/Basic/neonWS.dvdt
@@ -249,6 +272,7 @@ share/applications/dvdstyler.desktop
 %%DATADIR%%/transitions/wipeRightToLeft.xml
 %%DATADIR%%/transitions/wipeTopToBottom.xml
 share/locale/ar/LC_MESSAGES/dvdstyler.mo
+share/locale/bg/LC_MESSAGES/dvdstyler.mo
 share/locale/ca/LC_MESSAGES/dvdstyler.mo
 share/locale/cs/LC_MESSAGES/dvdstyler.mo
 share/locale/da/LC_MESSAGES/dvdstyler.mo
@@ -272,6 +296,7 @@ share/locale/pt/LC_MESSAGES/dvdstyler.mo
 share/locale/pt_BR/LC_MESSAGES/dvdstyler.mo
 share/locale/ro/LC_MESSAGES/dvdstyler.mo
 share/locale/ru/LC_MESSAGES/dvdstyler.mo
+share/locale/si/LC_MESSAGES/dvdstyler.mo
 share/locale/sk/LC_MESSAGES/dvdstyler.mo
 share/locale/sl/LC_MESSAGES/dvdstyler.mo
 share/locale/sr/LC_MESSAGES/dvdstyler.mo