Hi,

Here's an update to dvdstyler-3.0.4. Unlike the dvdstyler-2.9.4 in tree,
this builds with the ffmpeg-4.1 update.

Release notes:
https://sourceforge.net/projects/dvdstyler/files/dvdstyler/3.0.4/

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/dvdstyler/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile    2 Jan 2019 12:44:07 -0000       1.42
+++ Makefile    3 Feb 2019 04:20:06 -0000
@@ -2,12 +2,11 @@
 
 COMMENT=               DVD authoring application
 
-DISTNAME=              DVDStyler-2.9.4
+DISTNAME=              DVDStyler-3.0.4
 PKGNAME=               ${DISTNAME:L}
 CATEGORIES=            multimedia
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
 EXTRACT_SUFX=          .tar.bz2
-REVISION=              6
 
 HOMEPAGE=              https://www.dvdstyler.org/
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/dvdstyler/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo    1 Nov 2015 07:16:40 -0000       1.9
+++ distinfo    3 Feb 2019 04:20:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (DVDStyler-2.9.4.tar.bz2) = ixXsmOPl7IxaHyPu4xb2RkdudrhrgNRLfIQoh5RqOeA=
-SIZE (DVDStyler-2.9.4.tar.bz2) = 7863263
+SHA256 (DVDStyler-3.0.4.tar.bz2) = 8Z6p5er2UXt4n0r/wS01FAWT3fhY6gOiQzlVkiwEjFM=
+SIZE (DVDStyler-3.0.4.tar.bz2) = 8870498
Index: patches/patch-src_mediaenc_ffmpeg_cpp
===================================================================
RCS file: patches/patch-src_mediaenc_ffmpeg_cpp
diff -N patches/patch-src_mediaenc_ffmpeg_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_mediaenc_ffmpeg_cpp       3 Feb 2019 04:20:06 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/mediaenc_ffmpeg.cpp
+--- src/mediaenc_ffmpeg.cpp.orig
++++ src/mediaenc_ffmpeg.cpp
+@@ -223,7 +223,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;
+ }
Index: patches/patch-wxVillaLib_ThumbnailFactory_cpp
===================================================================
RCS file: patches/patch-wxVillaLib_ThumbnailFactory_cpp
diff -N patches/patch-wxVillaLib_ThumbnailFactory_cpp
--- patches/patch-wxVillaLib_ThumbnailFactory_cpp       25 Jul 2017 08:18:53 
-0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-wxVillaLib_ThumbnailFactory_cpp,v 1.1 2017/07/25 08:18:53 
ajacoutot Exp $
-
-ThumbnailFactory.cpp:371: error: call of overloaded 'abs(float)' is ambiguous
-
-Index: wxVillaLib/ThumbnailFactory.cpp
---- wxVillaLib/ThumbnailFactory.cpp.orig
-+++ wxVillaLib/ThumbnailFactory.cpp
-@@ -17,6 +17,7 @@
- #include <wx/wx.h>
- #include <wx/filename.h>
- #include <sys/stat.h>
-+#include <cmath>
- #include "utils.h"
- 
- #ifdef GNOME2
Index: patches/patch-wxVillaLib_thumb_md5_cpp
===================================================================
RCS file: patches/patch-wxVillaLib_thumb_md5_cpp
diff -N patches/patch-wxVillaLib_thumb_md5_cpp
--- patches/patch-wxVillaLib_thumb_md5_cpp      2 Jan 2019 12:44:07 -0000       
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-wxVillaLib_thumb_md5_cpp,v 1.1 2019/01/02 12:44:07 jca Exp $
-
-Index: wxVillaLib/thumb_md5.cpp
---- wxVillaLib/thumb_md5.cpp.orig
-+++ wxVillaLib/thumb_md5.cpp
-@@ -307,9 +307,9 @@ const unsigned char acceptable[96] =
- #define ACCEPTABLE_CHAR(a) ((a)>=32 && (a)<128 && (acceptable[(a)-32] & 
UNSAFE_PATH))
- #endif
- #define HEX_ESCAPE '%'
--const char hex[17] = "0123456789ABCDEF";
- char* escape_string(const char *string)
- {
-+    static const char hex[] = "0123456789ABCDEF";
-     const char *p;
-     char *q;
-     char *result;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/dvdstyler/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST   27 Jun 2018 21:03:57 -0000      1.11
+++ pkg/PLIST   3 Feb 2019 04:20:06 -0000
@@ -30,11 +30,25 @@ share/dvdstyler/backgrounds/32_blue_frac
 share/dvdstyler/backgrounds/40_swans.jpg
 share/dvdstyler/backgrounds/45_nevado.jpg
 share/dvdstyler/backgrounds/46_paisaje.jpg
+share/dvdstyler/backgrounds/Autumn1.png
+share/dvdstyler/backgrounds/Autumn2.png
+share/dvdstyler/backgrounds/Balloons.png
 share/dvdstyler/backgrounds/Cake.jpg
+share/dvdstyler/backgrounds/Camera.jpg
+share/dvdstyler/backgrounds/Christmas_L1.png
+share/dvdstyler/backgrounds/Christmas_L6.png
+share/dvdstyler/backgrounds/Fireworks.jpg
+share/dvdstyler/backgrounds/Heart.jpg
+share/dvdstyler/backgrounds/Landscape.png
+share/dvdstyler/backgrounds/MothersDay.jpg
+share/dvdstyler/backgrounds/SnowField.png
+share/dvdstyler/backgrounds/Sun.png
+share/dvdstyler/backgrounds/Winter.png
 share/dvdstyler/backgrounds/blue_treetops.jpg
 share/dvdstyler/backgrounds/dark_wedding.jpg
 share/dvdstyler/backgrounds/frosty_forest.jpg
 share/dvdstyler/backgrounds/green_trees.jpg
+share/dvdstyler/backgrounds/penguin.png
 share/dvdstyler/backgrounds/red_sky.jpg
 share/dvdstyler/buttons/
 share/dvdstyler/buttons/arrow-blue.xml
@@ -97,6 +111,7 @@ share/dvdstyler/buttons/text-square-v2.x
 share/dvdstyler/buttons/text-underlined-v3.xml
 share/dvdstyler/buttons/text-v3.xml
 share/dvdstyler/data/
+share/dvdstyler/data/colors16.rgb
 share/dvdstyler/data/empty_ntsc_ac3.mpg
 share/dvdstyler/data/empty_ntsc_mp2.mpg
 share/dvdstyler/data/empty_pal_ac3.mpg
@@ -105,7 +120,10 @@ share/dvdstyler/data/subtitles.rgb
 share/dvdstyler/docs/
 share/dvdstyler/docs/help_ca.zip
 share/dvdstyler/docs/help_de.zip
+share/dvdstyler/docs/help_el.zip
 share/dvdstyler/docs/help_en.zip
+share/dvdstyler/docs/help_es.zip
+share/dvdstyler/docs/help_eu.zip
 share/dvdstyler/docs/help_fi.zip
 share/dvdstyler/docs/help_fr.zip
 share/dvdstyler/docs/help_hu.zip
@@ -117,6 +135,7 @@ share/dvdstyler/docs/help_pt.zip
 share/dvdstyler/docs/help_pt_BR.zip
 share/dvdstyler/docs/help_ro.zip
 share/dvdstyler/docs/help_ru.zip
+share/dvdstyler/docs/help_si.zip
 share/dvdstyler/docs/help_uk.zip
 share/dvdstyler/docs/help_zh_CN.zip
 share/dvdstyler/docs/help_zh_TW.zip
@@ -140,6 +159,7 @@ share/dvdstyler/objects/text-v2.xml
 share/dvdstyler/rc/
 share/dvdstyler/rc/add.png
 share/dvdstyler/rc/addVideo.png
+share/dvdstyler/rc/dvdOptions.png
 share/dvdstyler/rc/dvdstyler.png
 share/dvdstyler/rc/error.png
 share/dvdstyler/rc/files.png
@@ -167,6 +187,7 @@ share/dvdstyler/rc/remove.png
 share/dvdstyler/rc/rotate.cur
 share/dvdstyler/rc/run.png
 share/dvdstyler/rc/save.png
+share/dvdstyler/rc/settings.png
 share/dvdstyler/templates/
 share/dvdstyler/templates/Basic/
 share/dvdstyler/templates/Basic/blue.dvdt
@@ -185,11 +206,73 @@ share/dvdstyler/templates/Basic/turbulen
 share/dvdstyler/templates/Basic/turbulence.png
 share/dvdstyler/templates/Basic/turbulenceWS.dvdt
 share/dvdstyler/templates/Basic/turbulenceWS.png
+share/dvdstyler/templates/Birthday/
+share/dvdstyler/templates/Birthday/Balloons.dvdt
+share/dvdstyler/templates/Birthday/Balloons.png
+share/dvdstyler/templates/Birthday/BalloonsWS.dvdt
+share/dvdstyler/templates/Birthday/BalloonsWS.png
+share/dvdstyler/templates/Birthday/Cake.dvdt
+share/dvdstyler/templates/Birthday/Cake.png
+share/dvdstyler/templates/Birthday/CakeWS.dvdt
+share/dvdstyler/templates/Birthday/CakeWS.png
+share/dvdstyler/templates/Christmas/
+share/dvdstyler/templates/Christmas/ChristmasL1.dvdt
+share/dvdstyler/templates/Christmas/ChristmasL1.png
+share/dvdstyler/templates/Christmas/ChristmasL1WS.dvdt
+share/dvdstyler/templates/Christmas/ChristmasL1WS.png
+share/dvdstyler/templates/Christmas/ChristmasL6.dvdt
+share/dvdstyler/templates/Christmas/ChristmasL6.png
+share/dvdstyler/templates/Christmas/ChristmasL6WS.dvdt
+share/dvdstyler/templates/Christmas/ChristmasL6WS.png
+share/dvdstyler/templates/Christmas/Fireworks.dvdt
+share/dvdstyler/templates/Christmas/Fireworks.png
+share/dvdstyler/templates/Christmas/FireworksWS.dvdt
+share/dvdstyler/templates/Christmas/FireworksWS.png
+share/dvdstyler/templates/Miscellaneous/
+share/dvdstyler/templates/Miscellaneous/BlueFractal.dvdt
+share/dvdstyler/templates/Miscellaneous/BlueFractal.png
+share/dvdstyler/templates/Miscellaneous/Penguin.dvdt
+share/dvdstyler/templates/Miscellaneous/Penguin.png
+share/dvdstyler/templates/Miscellaneous/RedSky.dvdt
+share/dvdstyler/templates/Miscellaneous/RedSky.png
+share/dvdstyler/templates/Nature/
+share/dvdstyler/templates/Nature/BlueTreetops.dvdt
+share/dvdstyler/templates/Nature/BlueTreetops.png
+share/dvdstyler/templates/Nature/FrostyForest.dvdt
+share/dvdstyler/templates/Nature/FrostyForest.png
+share/dvdstyler/templates/Nature/GreenTrees.dvdt
+share/dvdstyler/templates/Nature/GreenTrees.png
+share/dvdstyler/templates/Seasons/
+share/dvdstyler/templates/Seasons/Autumn.dvdt
+share/dvdstyler/templates/Seasons/Autumn.png
+share/dvdstyler/templates/Seasons/Autumn2.dvdt
+share/dvdstyler/templates/Seasons/Autumn2.png
+share/dvdstyler/templates/Seasons/AutumnWS.dvdt
+share/dvdstyler/templates/Seasons/AutumnWS.png
+share/dvdstyler/templates/Seasons/Landscape.dvdt
+share/dvdstyler/templates/Seasons/Landscape.png
+share/dvdstyler/templates/Seasons/LandscapeWS.dvdt
+share/dvdstyler/templates/Seasons/LandscapeWS.png
+share/dvdstyler/templates/Seasons/SnowField.dvdt
+share/dvdstyler/templates/Seasons/SnowField.png
+share/dvdstyler/templates/Seasons/SnowFieldWS.dvdt
+share/dvdstyler/templates/Seasons/SnowFieldWS.png
+share/dvdstyler/templates/Seasons/Sun.dvdt
+share/dvdstyler/templates/Seasons/Sun.png
+share/dvdstyler/templates/Seasons/Winter.dvdt
+share/dvdstyler/templates/Seasons/Winter.png
 share/dvdstyler/templates/Travel/
+share/dvdstyler/templates/Travel/Camera.dvdt
+share/dvdstyler/templates/Travel/Camera.png
+share/dvdstyler/templates/Travel/CameraWS.dvdt
+share/dvdstyler/templates/Travel/CameraWS.png
 share/dvdstyler/templates/Travel/travel.dvdt
 share/dvdstyler/templates/Travel/travel.png
 share/dvdstyler/templates/Travel/travelWS.dvdt
 share/dvdstyler/templates/Travel/travelWS.png
+share/dvdstyler/templates/Wedding/
+share/dvdstyler/templates/Wedding/DarkWedding.dvdt
+share/dvdstyler/templates/Wedding/DarkWedding.png
 share/dvdstyler/transitions/
 share/dvdstyler/transitions/fade.xml
 share/dvdstyler/transitions/wipeBottomToTop.xml
@@ -197,6 +280,7 @@ share/dvdstyler/transitions/wipeLeftToRi
 share/dvdstyler/transitions/wipeRightToLeft.xml
 share/dvdstyler/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

Reply via email to