update to 2.1

changes:
-more backgrounds/buttons/effects/features
-bugfixes

4 files changed, 56 insertions, 30 deletions

diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 59f7ba85d1c..92fb9f65c77 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2012/01/14 02:09:37 hans Exp $
+# $NetBSD: Makefile,v 1.37 2012/01/20 12:31:57 drochner Exp $
 #
 
-DISTNAME=	DVDStyler-1.8.2.1
-PKGREVISION=	4
+DISTNAME=	DVDStyler-2.1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
 EXTRACT_SUFX=	.tar.bz2
@@ -34,6 +33,8 @@ post-install:
 .include "../../graphics/wxsvg/buildlink3.mk"
 .include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../multimedia/mjpegtools/buildlink3.mk"
+# needs mediactrl
+BUILDLINK_API_DEPENDS.wxGTK28+= wxGTK28>=2.8.10nb14
 .include "../../x11/wxGTK28/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/dvdstyler/PLIST b/multimedia/dvdstyler/PLIST
index 9dd31c3cd07..7cd82e35529 100644
--- a/multimedia/dvdstyler/PLIST
+++ b/multimedia/dvdstyler/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2011/02/16 20:34:43 gls Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/01/20 12:31:57 drochner Exp $
 bin/dvdstyler
 man/man1/dvdstyler.1
 share/applications/dvdstyler.desktop
@@ -13,6 +13,8 @@ share/dvdstyler/backgrounds/04_kiel_kanal.jpg
 share/dvdstyler/backgrounds/05_easyblue.jpg
 share/dvdstyler/backgrounds/10_turbulence_blue.jpg
 share/dvdstyler/backgrounds/11_turbulence_green.jpg
+share/dvdstyler/backgrounds/12_neon_blue.jpg
+share/dvdstyler/backgrounds/13_ocean.jpg
 share/dvdstyler/backgrounds/15_bordes_blue.jpg
 share/dvdstyler/backgrounds/16_bordes_green.jpg
 share/dvdstyler/backgrounds/20_blue.jpg
@@ -25,12 +27,32 @@ share/dvdstyler/backgrounds/32_blue_fractal.jpg
 share/dvdstyler/backgrounds/40_swans.jpg
 share/dvdstyler/backgrounds/45_nevado.jpg
 share/dvdstyler/backgrounds/46_paisaje.jpg
+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/red_sky.jpg
+share/dvdstyler/buttons/arrow-blue.xml
+share/dvdstyler/buttons/arrow-cool.xml
+share/dvdstyler/buttons/arrow-double.xml
+share/dvdstyler/buttons/arrow-gold.xml
+share/dvdstyler/buttons/arrow-green-double.xml
+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-star.xml
+share/dvdstyler/buttons/arrow-text-left.xml
+share/dvdstyler/buttons/arrow-text-right.xml
 share/dvdstyler/buttons/arrow.xml
 share/dvdstyler/buttons/arrow2.xml
 share/dvdstyler/buttons/arrow3.xml
+share/dvdstyler/buttons/arrow3d-left.xml
+share/dvdstyler/buttons/arrow3d-right.xml
 share/dvdstyler/buttons/buttons.lst
 share/dvdstyler/buttons/cancel.xml
+share/dvdstyler/buttons/cancel2.xml
 share/dvdstyler/buttons/deprecated/arrow-down.xml
 share/dvdstyler/buttons/deprecated/arrow-left.xml
 share/dvdstyler/buttons/deprecated/arrow-next.xml
@@ -44,9 +66,16 @@ share/dvdstyler/buttons/deprecated/text-shadow.xml
 share/dvdstyler/buttons/deprecated/text-underlined.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/hand-left.xml
+share/dvdstyler/buttons/hand-right.xml
+share/dvdstyler/buttons/home.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
@@ -59,12 +88,15 @@ share/dvdstyler/data/empty_pal_mp2.mpg
 share/dvdstyler/data/subtitles.rgb
 share/dvdstyler/docs/help_de.zip
 share/dvdstyler/docs/help_en.zip
+share/dvdstyler/docs/help_fr.zip
+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_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/image.xml
@@ -74,6 +106,7 @@ share/dvdstyler/objects/text.xml
 share/dvdstyler/rc/add.png
 share/dvdstyler/rc/dvdstyler.png
 share/dvdstyler/rc/files.png
+share/dvdstyler/rc/help.png
 share/dvdstyler/rc/logo.png
 share/dvdstyler/rc/logoSmall.png
 share/dvdstyler/rc/minus.png
@@ -88,14 +121,20 @@ share/dvdstyler/rc/preferences.png
 share/dvdstyler/rc/remove.png
 share/dvdstyler/rc/run.png
 share/dvdstyler/rc/save.png
-share/dvdstyler/templates/blue.dvdt
-share/dvdstyler/templates/blue.png
-share/dvdstyler/templates/blueWS.dvdt
-share/dvdstyler/templates/travel.dvdt
-share/dvdstyler/templates/travel.png
-share/dvdstyler/templates/travelWS.dvdt
-share/dvdstyler/templates/turbulence.dvdt
-share/dvdstyler/templates/turbulence.png
+share/dvdstyler/templates/Basic/blue.dvdt
+share/dvdstyler/templates/Basic/blue.png
+share/dvdstyler/templates/Basic/blueWS.dvdt
+share/dvdstyler/templates/Basic/blueWS.png
+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/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/cs/LC_MESSAGES/dvdstyler.mo
 share/locale/da/LC_MESSAGES/dvdstyler.mo
 share/locale/de/LC_MESSAGES/dvdstyler.mo
diff --git a/multimedia/dvdstyler/distinfo b/multimedia/dvdstyler/distinfo
index 6c30c78139b..fe0f519ffec 100644
--- a/multimedia/dvdstyler/distinfo
+++ b/multimedia/dvdstyler/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2011/10/30 17:45:44 drochner Exp $
+$NetBSD: distinfo,v 1.10 2012/01/20 12:31:57 drochner Exp $
 
-SHA1 (DVDStyler-1.8.2.1.tar.bz2) = 5d0b1971f3a18e83f27111140dc59c927998e45b
-RMD160 (DVDStyler-1.8.2.1.tar.bz2) = 5a98ce47e21e8cf5b6a20af612572ef154cfdbf4
-Size (DVDStyler-1.8.2.1.tar.bz2) = 1942753 bytes
-SHA1 (patch-aa) = ad9f2613cbaba903b9fcd1a45c419c9f497e08df
+SHA1 (DVDStyler-2.1.tar.bz2) = 7b152001a687ba2f15bac1c75514dde2a31e78c8
+RMD160 (DVDStyler-2.1.tar.bz2) = 1fa2648a4b9509ce3baea916bb2d775bdb0d6449
+Size (DVDStyler-2.1.tar.bz2) = 3832722 bytes
diff --git a/multimedia/dvdstyler/patches/patch-aa b/multimedia/dvdstyler/patches/patch-aa
deleted file mode 100644
index 984b0bde895..00000000000
--- a/multimedia/dvdstyler/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2011/10/30 17:45:44 drochner Exp $
-
---- src/mediatrc_ffmpeg.cpp.orig	2010-10-10 15:55:37.000000000 +0000
-+++ src/mediatrc_ffmpeg.cpp
-@@ -2551,7 +2551,7 @@ bool wxFfmpegMediaTranscoder::DoVideoOut
- 			} else
- 				big_picture.quality = (int) ost->st->quality;
- 			if (!me_threshold)
--				big_picture.pict_type = 0;
-+				big_picture.pict_type = AV_PICTURE_TYPE_NONE;
- //			big_picture.pts = AV_NOPTS_VALUE;
- 			big_picture.pts= ost->sync_opts;
- //			big_picture.pts= av_rescale(ost->sync_opts, AV_TIME_BASE*(int64_t)enc->time_base.num, enc->time_base.den);