update to 2.3

changes:
-minor feature extensions
-bugfixes
-support newer ffmpeg/libav

4 files changed, 59 insertions, 23 deletions

diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index db172ff445d..3611b8c44d2 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2012/10/08 23:02:10 adam Exp $
+# $NetBSD: Makefile,v 1.47 2012/10/10 16:36:37 drochner Exp $
 #
 
-DISTNAME=	DVDStyler-2.1
-PKGREVISION=	7
+DISTNAME=	DVDStyler-2.3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/dvdstyler/PLIST b/multimedia/dvdstyler/PLIST
index 7cd82e35529..8c8a69751de 100644
--- a/multimedia/dvdstyler/PLIST
+++ b/multimedia/dvdstyler/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/01/20 12:31:57 drochner Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/10/10 16:36:37 drochner Exp $
 bin/dvdstyler
 man/man1/dvdstyler.1
 share/applications/dvdstyler.desktop
@@ -41,7 +41,7 @@ share/dvdstyler/buttons/arrow-green.xml
 share/dvdstyler/buttons/arrow-mirror-left.xml
 share/dvdstyler/buttons/arrow-mirror-right.xml
 share/dvdstyler/buttons/arrow-red.xml
-share/dvdstyler/buttons/arrow-simple.xml
+share/dvdstyler/buttons/arrow-simple-v2.xml
 share/dvdstyler/buttons/arrow-star.xml
 share/dvdstyler/buttons/arrow-text-left.xml
 share/dvdstyler/buttons/arrow-text-right.xml
@@ -57,35 +57,43 @@ share/dvdstyler/buttons/deprecated/arrow-down.xml
 share/dvdstyler/buttons/deprecated/arrow-left.xml
 share/dvdstyler/buttons/deprecated/arrow-next.xml
 share/dvdstyler/buttons/deprecated/arrow-right.xml
+share/dvdstyler/buttons/deprecated/arrow-simple.xml
 share/dvdstyler/buttons/deprecated/arrow-up.xml
 share/dvdstyler/buttons/deprecated/arrow2-down.xml
 share/dvdstyler/buttons/deprecated/arrow2-left.xml
 share/dvdstyler/buttons/deprecated/arrow2-right.xml
 share/dvdstyler/buttons/deprecated/arrow2-up.xml
+share/dvdstyler/buttons/deprecated/ellipse.xml
+share/dvdstyler/buttons/deprecated/frame-shadow.xml
+share/dvdstyler/buttons/deprecated/frame.xml
+share/dvdstyler/buttons/deprecated/home.xml
+share/dvdstyler/buttons/deprecated/text-circle.xml
 share/dvdstyler/buttons/deprecated/text-shadow.xml
+share/dvdstyler/buttons/deprecated/text-square.xml
+share/dvdstyler/buttons/deprecated/text-underlined-v2.xml
 share/dvdstyler/buttons/deprecated/text-underlined.xml
+share/dvdstyler/buttons/deprecated/text-v2.xml
 share/dvdstyler/buttons/deprecated/text.xml
-share/dvdstyler/buttons/ellipse.xml
-share/dvdstyler/buttons/frame-shadow.xml
-share/dvdstyler/buttons/frame.xml
+share/dvdstyler/buttons/ellipse-v2.xml
+share/dvdstyler/buttons/frame-v2.xml
 share/dvdstyler/buttons/hand-left.xml
 share/dvdstyler/buttons/hand-right.xml
-share/dvdstyler/buttons/home.xml
+share/dvdstyler/buttons/home-v2.xml
 share/dvdstyler/buttons/ok.xml
 share/dvdstyler/buttons/ok2.xml
 share/dvdstyler/buttons/pill.xml
 share/dvdstyler/buttons/pill2.xml
 share/dvdstyler/buttons/pill3.xml
-share/dvdstyler/buttons/text-circle.xml
-share/dvdstyler/buttons/text-shadow.xml
-share/dvdstyler/buttons/text-square.xml
-share/dvdstyler/buttons/text-underlined-v2.xml
-share/dvdstyler/buttons/text-v2.xml
+share/dvdstyler/buttons/text-circle-v2.xml
+share/dvdstyler/buttons/text-square-v2.xml
+share/dvdstyler/buttons/text-underlined-v3.xml
+share/dvdstyler/buttons/text-v3.xml
 share/dvdstyler/data/empty_ntsc_ac3.mpg
 share/dvdstyler/data/empty_ntsc_mp2.mpg
 share/dvdstyler/data/empty_pal_ac3.mpg
 share/dvdstyler/data/empty_pal_mp2.mpg
 share/dvdstyler/data/subtitles.rgb
+share/dvdstyler/docs/help_ca.zip
 share/dvdstyler/docs/help_de.zip
 share/dvdstyler/docs/help_en.zip
 share/dvdstyler/docs/help_fr.zip
@@ -93,16 +101,21 @@ share/dvdstyler/docs/help_it.zip
 share/dvdstyler/docs/help_ja.zip
 share/dvdstyler/docs/help_nb.zip
 share/dvdstyler/docs/help_pl.zip
+share/dvdstyler/docs/help_pt_BR.zip
 share/dvdstyler/docs/help_ru.zip
 share/dvdstyler/docs/help_uk.zip
 share/dvdstyler/docs/help_zh_CN.zip
 share/dvdstyler/docs/help_zh_TW.zip
-share/dvdstyler/objects/ellipse.xml
-share/dvdstyler/objects/frame.xml
+share/dvdstyler/objects/deprecated/ellipse.xml
+share/dvdstyler/objects/deprecated/frame.xml
+share/dvdstyler/objects/deprecated/rectangle.xml
+share/dvdstyler/objects/deprecated/text-shadow.xml
+share/dvdstyler/objects/deprecated/text.xml
+share/dvdstyler/objects/ellipse-v2.xml
+share/dvdstyler/objects/frame-v2.xml
 share/dvdstyler/objects/image.xml
-share/dvdstyler/objects/rectangle.xml
-share/dvdstyler/objects/text-shadow.xml
-share/dvdstyler/objects/text.xml
+share/dvdstyler/objects/rectangle-v2.xml
+share/dvdstyler/objects/text-v2.xml
 share/dvdstyler/rc/add.png
 share/dvdstyler/rc/dvdstyler.png
 share/dvdstyler/rc/files.png
@@ -129,12 +142,18 @@ share/dvdstyler/templates/Basic/neon.dvdt
 share/dvdstyler/templates/Basic/neon.png
 share/dvdstyler/templates/Basic/neonWS.dvdt
 share/dvdstyler/templates/Basic/neonWS.png
+share/dvdstyler/templates/Basic/ocean.dvdt
+share/dvdstyler/templates/Basic/ocean.png
+share/dvdstyler/templates/Basic/oceanWS.dvdt
+share/dvdstyler/templates/Basic/oceanWS.png
 share/dvdstyler/templates/Basic/turbulence.dvdt
 share/dvdstyler/templates/Basic/turbulence.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/locale/ar/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
 share/locale/de/LC_MESSAGES/dvdstyler.mo
@@ -158,7 +177,9 @@ share/locale/sk/LC_MESSAGES/dvdstyler.mo
 share/locale/sl/LC_MESSAGES/dvdstyler.mo
 share/locale/sr/LC_MESSAGES/dvdstyler.mo
 share/locale/sv/LC_MESSAGES/dvdstyler.mo
+share/locale/tr/LC_MESSAGES/dvdstyler.mo
 share/locale/uk/LC_MESSAGES/dvdstyler.mo
+share/locale/uz/LC_MESSAGES/dvdstyler.mo
 share/locale/vi/LC_MESSAGES/dvdstyler.mo
 share/locale/zh_CN/LC_MESSAGES/dvdstyler.mo
 share/locale/zh_TW/LC_MESSAGES/dvdstyler.mo
diff --git a/multimedia/dvdstyler/distinfo b/multimedia/dvdstyler/distinfo
index fe0f519ffec..803478288fe 100644
--- a/multimedia/dvdstyler/distinfo
+++ b/multimedia/dvdstyler/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.10 2012/01/20 12:31:57 drochner Exp $
+$NetBSD: distinfo,v 1.11 2012/10/10 16:36:37 drochner Exp $
 
-SHA1 (DVDStyler-2.1.tar.bz2) = 7b152001a687ba2f15bac1c75514dde2a31e78c8
-RMD160 (DVDStyler-2.1.tar.bz2) = 1fa2648a4b9509ce3baea916bb2d775bdb0d6449
-Size (DVDStyler-2.1.tar.bz2) = 3832722 bytes
+SHA1 (DVDStyler-2.3.tar.bz2) = 277f96a6ec3aad3da7ddeb5c6005bb2072dd8601
+RMD160 (DVDStyler-2.3.tar.bz2) = 722d193d75a04f17d6e40a9df1488ca677129473
+Size (DVDStyler-2.3.tar.bz2) = 4458253 bytes
+SHA1 (patch-aa) = 2629351931c11d2a3bf910fc7a3eed34486528a4
diff --git a/multimedia/dvdstyler/patches/patch-aa b/multimedia/dvdstyler/patches/patch-aa
new file mode 100644
index 00000000000..581a9419ec7
--- /dev/null
+++ b/multimedia/dvdstyler/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.7 2012/10/10 16:36:37 drochner Exp $
+
+wxGTK-2.8.10 doesn't have wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT
+
+--- src/VobListBox.cpp.orig	2012-07-24 17:59:30.000000000 +0000
++++ src/VobListBox.cpp
+@@ -61,7 +61,7 @@ void VobListBox::OnDrawItem(wxDC& dc, co
+ 	
+ 	// info
+ 	dc.SetFont(ITEM_FONT);
+-	dc.SetTextForeground((int)n == GetSelection() ? wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT)
++	dc.SetTextForeground((int)n == GetSelection() ? wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)
+ 			: wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT));
+ 	dc.SetTextForeground(*wxBLACK);
+ 	wxArrayString& info = m_info[n];