From 064038d07aeb96cfcc8af21612ebe07bd4a514f2 Mon Sep 17 00:00:00 2001 From: jakemsr Date: Wed, 26 May 2010 21:56:03 +0000 Subject: [PATCH] update to DVDStyler-1.8.0.3 lots of bug fixes and new features since 1.7.0, including use of newer ffmpeg. see News link on HOMEPAGE for details. --- multimedia/dvdstyler/Makefile | 54 ++++++++++--------- multimedia/dvdstyler/distinfo | 10 ++-- .../dvdstyler/patches/patch-Makefile_am | 11 ---- multimedia/dvdstyler/patches/patch-configure | 12 +++++ .../dvdstyler/patches/patch-configure_in | 12 ----- .../dvdstyler/patches/patch-docs_Makefile_am | 7 --- .../dvdstyler/patches/patch-src_Utils_cpp | 11 ---- multimedia/dvdstyler/pkg/PLIST | 45 +++++++++++++--- 8 files changed, 84 insertions(+), 78 deletions(-) delete mode 100644 multimedia/dvdstyler/patches/patch-Makefile_am create mode 100644 multimedia/dvdstyler/patches/patch-configure delete mode 100644 multimedia/dvdstyler/patches/patch-configure_in delete mode 100644 multimedia/dvdstyler/patches/patch-docs_Makefile_am delete mode 100644 multimedia/dvdstyler/patches/patch-src_Utils_cpp diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile index 791af527eb5..d11acc3cb07 100644 --- a/multimedia/dvdstyler/Makefile +++ b/multimedia/dvdstyler/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.10 2009/12/22 15:46:59 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.11 2010/05/26 21:56:03 jakemsr Exp $ COMMENT= DVD authoring application -DISTNAME= DVDStyler-1.7.0 -PKGNAME= ${DISTNAME:L}p4 +DISTNAME= DVDStyler-1.8.0.3 +PKGNAME= ${DISTNAME:L} CATEGORIES= multimedia HOMEPAGE= http://www.dvdstyler.de/ @@ -19,27 +19,32 @@ EXTRACT_SUFX= .tar.bz2 MODULES= devel/gettext -WANTLIB= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \ - Xext Xfixes Xi Xinerama Xrandr Xrender a52 art_lgpl_2 \ - atk-1.0 bonobo-2 bonobo-activation bonoboui-2 \ - bz2 c cairo expat faac faad fontconfig freetype \ - gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 \ - glitz gmodule-2.0 gnome-2 gnome-keyring gnomecanvas-2 \ - gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0 jpeg \ - m mp3lame ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 \ - pixman-1 png popt pthread stdc++ theora vorbis vorbisenc \ - wx_base wx_gtk2_adv wx_gtk2_core wx_gtk2_html x264 xml2 z \ - dbus-1 gio-2.0 oil-0.3 schroedinger-1.0 pthread-stubs xcb +WANTLIB= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor \ + Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \ + Xrender art_lgpl_2 atk-1.0 bonobo-2 \ + bonobo-activation bonoboui-2 bz2 c cairo \ + dbus-1 expat faac faad fontconfig freetype \ + gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 \ + gio-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 \ + gnome-keyring gnomecanvas-2 gnomevfs-2 \ + gobject-2.0 gsm gthread-2.0 gtk-x11-2.0 \ + jpeg m mp3lame ogg oil-0.3 pango-1.0 \ + pangocairo-1.0 pangoft2-1.0 pixman-1 \ + png popt pthread pthread-stubs \ + schroedinger-1.0 speex stdc++ theora \ + vorbis vorbisenc wx_base wx_base_net \ + wx_gtk2_adv wx_gtk2_core wx_gtk2_html \ + x264 xcb xcb-render xcb-render-util xml2 z -BUILD_DEPENDS= :autoconf-${AUTOCONF_VERSION}:devel/autoconf/${AUTOCONF_VERSION} \ - ::multimedia/dvdauthor \ +BUILD_DEPENDS= ::multimedia/dvdauthor \ ::multimedia/mjpegtools \ ::multimedia/mpgtx \ - ::sysutils/dvd+rw-tools + ::sysutils/dvd+rw-tools \ + ::textproc/xmlto LIB_DEPENDS= exif::graphics/libexif \ gnomeui-2::x11/gnome/libgnomeui \ wxsvg::x11/wxSVG \ - avcodec.>=13.1,avformat.>=12,avutil.>=6,swscale.>=1:ffmpeg->=20080620p10:graphics/ffmpeg + avcodec.>=14,avformat.>=13,avutil.>=7,swscale.>=2:ffmpeg->=20100512:graphics/ffmpeg RUN_DEPENDS= ::devel/desktop-file-utils \ ::multimedia/dvdauthor \ ::multimedia/mjpegtools \ @@ -47,19 +52,18 @@ RUN_DEPENDS= ::devel/desktop-file-utils \ ::multimedia/xine-ui \ ::sysutils/dvd+rw-tools - +# FIXME: locale/Makefile uses gmake constructs USE_GMAKE= Yes USE_X11= Yes -CONFIGURE_STYLE= automake -AUTOMAKE_VERSION= 1.8 -AUTOCONF_VERSION= 2.61 +CONFIGURE_STYLE= gnu CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" NO_REGRESS= Yes -pre-configure: - cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \ - AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/dvdstyler/templates + ${INSTALL_DATA} ${WRKSRC}/templates/*.{dvdt,png} \ + ${PREFIX}/share/dvdstyler/templates .include diff --git a/multimedia/dvdstyler/distinfo b/multimedia/dvdstyler/distinfo index 4aa286127fe..18fba23be89 100644 --- a/multimedia/dvdstyler/distinfo +++ b/multimedia/dvdstyler/distinfo @@ -1,5 +1,5 @@ -MD5 (DVDStyler-1.7.0.tar.bz2) = zHpxE0CcQxZ++Ecjk5RHAg== -RMD160 (DVDStyler-1.7.0.tar.bz2) = jcTM07Oirh01G5Sw1ugJ2tetb/s= -SHA1 (DVDStyler-1.7.0.tar.bz2) = 1sjG6/1l/o+inyt/+31ZyG34FK0= -SHA256 (DVDStyler-1.7.0.tar.bz2) = VMELmGbu1LLfZpr2rattJcqqgCi3Pob2vXchlOA0se8= -SIZE (DVDStyler-1.7.0.tar.bz2) = 817243 +MD5 (DVDStyler-1.8.0.3.tar.bz2) = RmP3A2sCVtKO10Xtlelzag== +RMD160 (DVDStyler-1.8.0.3.tar.bz2) = uy1Khj/i1FFrDnvA2W2MZLeZQE8= +SHA1 (DVDStyler-1.8.0.3.tar.bz2) = qUZB6xvK2+EUtfMhFp4Df83NIC0= +SHA256 (DVDStyler-1.8.0.3.tar.bz2) = TAAvOGqBFN13XANj6lJr7Bx4llo8XOrq6VNLqvEGocs= +SIZE (DVDStyler-1.8.0.3.tar.bz2) = 1815780 diff --git a/multimedia/dvdstyler/patches/patch-Makefile_am b/multimedia/dvdstyler/patches/patch-Makefile_am deleted file mode 100644 index 7565e70e37c..00000000000 --- a/multimedia/dvdstyler/patches/patch-Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-Makefile_am,v 1.1 2008/10/24 16:47:27 jasper Exp $ ---- Makefile.am.orig Thu Oct 23 00:15:42 2008 -+++ Makefile.am Thu Oct 23 00:15:53 2008 -@@ -1,6 +1,6 @@ - SUBDIRS = wxVillaLib src locale backgrounds buttons objects data docs - ACLOCAL_AMFLAGS=-I. - pkgdatadir=@datadir@/doc/@PACKAGE@ --pkgdata_DATA = AUTHORS COPYING INSTALL README ChangeLog -+pkgdata_DATA = README - run: all - $(MAKE) -C src run diff --git a/multimedia/dvdstyler/patches/patch-configure b/multimedia/dvdstyler/patches/patch-configure new file mode 100644 index 00000000000..616f5660695 --- /dev/null +++ b/multimedia/dvdstyler/patches/patch-configure @@ -0,0 +1,12 @@ +$OpenBSD: patch-configure,v 1.3 2010/05/26 21:56:03 jakemsr Exp $ +--- configure.orig Tue May 18 12:39:28 2010 ++++ configure Tue May 18 12:39:41 2010 +@@ -5821,7 +5821,7 @@ $as_echo "yes" >&6; } + : + fi + +-for ac_header in ffmpeg/avutil.h ++for ac_header in libavutil/avutil.h + do + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then diff --git a/multimedia/dvdstyler/patches/patch-configure_in b/multimedia/dvdstyler/patches/patch-configure_in deleted file mode 100644 index f75977f880b..00000000000 --- a/multimedia/dvdstyler/patches/patch-configure_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-configure_in,v 1.1 2008/10/24 16:47:27 jasper Exp $ ---- configure.in.orig Thu Oct 23 00:12:48 2008 -+++ configure.in Thu Oct 23 00:13:31 2008 -@@ -76,7 +76,7 @@ PKG_CHECK_MODULES(LIBEXIF, libexif, [LIBS="$LIBS -lexi - dnl check ffmpeg - PKG_CHECK_MODULES(FFMPEG, [libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale]) - dnl check path for old ffmpeg --AC_CHECK_HEADERS([ffmpeg/avutil.h]) -+AC_CHECK_HEADERS([libavutil/avutil.h]) - CXXFLAGS="$CXXFLAGS $FFMPEG_CFLAGS" - LIBS="$LIBS $FFMPEG_LIBS" - diff --git a/multimedia/dvdstyler/patches/patch-docs_Makefile_am b/multimedia/dvdstyler/patches/patch-docs_Makefile_am deleted file mode 100644 index 42c0eed4844..00000000000 --- a/multimedia/dvdstyler/patches/patch-docs_Makefile_am +++ /dev/null @@ -1,7 +0,0 @@ -$OpenBSD: patch-docs_Makefile_am,v 1.1 2008/10/24 16:47:27 jasper Exp $ ---- docs/Makefile.am.orig Thu Oct 23 00:27:03 2008 -+++ docs/Makefile.am Thu Oct 23 00:27:11 2008 -@@ -1,2 +1,2 @@ --pkgdatadir=@datadir@/man/man1 -+pkgdatadir=@prefix@/man/man1 - pkgdata_DATA = dvdstyler.1 diff --git a/multimedia/dvdstyler/patches/patch-src_Utils_cpp b/multimedia/dvdstyler/patches/patch-src_Utils_cpp deleted file mode 100644 index f515099bbba..00000000000 --- a/multimedia/dvdstyler/patches/patch-src_Utils_cpp +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_Utils_cpp,v 1.2 2008/10/24 16:47:27 jasper Exp $ ---- src/Utils.cpp.orig Sun Jul 13 21:28:02 2008 -+++ src/Utils.cpp Thu Oct 23 00:17:25 2008 -@@ -10,6 +10,7 @@ - - #include "Utils.h" - #include -+#include - #include - #include - #include diff --git a/multimedia/dvdstyler/pkg/PLIST b/multimedia/dvdstyler/pkg/PLIST index 792cd3c9b21..2c599d072e2 100644 --- a/multimedia/dvdstyler/pkg/PLIST +++ b/multimedia/dvdstyler/pkg/PLIST @@ -1,15 +1,19 @@ -@comment $OpenBSD: PLIST,v 1.4 2009/12/22 15:46:59 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.5 2010/05/26 21:56:03 jakemsr Exp $ @bin bin/dvdstyler @man man/man1/dvdstyler.1 share/applications/dvdstyler.desktop share/doc/dvdstyler/ +@comment share/doc/dvdstyler/AUTHORS +@comment share/doc/dvdstyler/COPYING +@comment share/doc/dvdstyler/ChangeLog +@comment share/doc/dvdstyler/INSTALL share/doc/dvdstyler/README share/dvdstyler/ share/dvdstyler/backgrounds/ -share/dvdstyler/backgrounds/01_autobahn.jpg share/dvdstyler/backgrounds/02_bi_domrep.jpg share/dvdstyler/backgrounds/03_creta.jpg 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/15_bordes_blue.jpg @@ -20,6 +24,10 @@ share/dvdstyler/backgrounds/22_gold.jpg share/dvdstyler/backgrounds/23_lava.jpg share/dvdstyler/backgrounds/30_brushed_aluminiun.jpg share/dvdstyler/backgrounds/31_texture_border.jpg +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/buttons/ share/dvdstyler/buttons/arrow-star.xml share/dvdstyler/buttons/arrow.xml @@ -38,20 +46,28 @@ 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/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.xml share/dvdstyler/buttons/ok.xml share/dvdstyler/buttons/pill.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/data/ 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/silence.ac3 -share/dvdstyler/data/silence.mp2 +share/dvdstyler/data/subtitles.rgb +share/dvdstyler/docs/ +share/dvdstyler/docs/help_de.zip +share/dvdstyler/docs/help_en.zip +share/dvdstyler/docs/help_ja.zip +share/dvdstyler/docs/help_ru.zip share/dvdstyler/objects/ share/dvdstyler/objects/ellipse.xml share/dvdstyler/objects/frame.xml @@ -60,11 +76,11 @@ share/dvdstyler/objects/rectangle.xml share/dvdstyler/objects/text-shadow.xml share/dvdstyler/objects/text.xml share/dvdstyler/rc/ +share/dvdstyler/rc/add.png share/dvdstyler/rc/dvdstyler.png share/dvdstyler/rc/files.png -share/dvdstyler/rc/folder1.png -share/dvdstyler/rc/folder2.png share/dvdstyler/rc/logo.png +share/dvdstyler/rc/logoSmall.png share/dvdstyler/rc/minus.png share/dvdstyler/rc/move.cur share/dvdstyler/rc/nesw.cur @@ -73,9 +89,16 @@ share/dvdstyler/rc/noaudio.png share/dvdstyler/rc/nwse.cur share/dvdstyler/rc/open.png share/dvdstyler/rc/plus.png +share/dvdstyler/rc/preferences.png share/dvdstyler/rc/run.png share/dvdstyler/rc/save.png -share/locale/ca/LC_MESSAGES/dvdstyler.mo +share/dvdstyler/templates/ +share/dvdstyler/templates/blue.dvdt +share/dvdstyler/templates/blue.png +share/dvdstyler/templates/travel.dvdt +share/dvdstyler/templates/travel.png +share/dvdstyler/templates/turbulence.dvdt +share/dvdstyler/templates/turbulence.png share/locale/cs/LC_MESSAGES/dvdstyler.mo share/locale/da/LC_MESSAGES/dvdstyler.mo share/locale/de/LC_MESSAGES/dvdstyler.mo @@ -86,14 +109,22 @@ share/locale/fr/LC_MESSAGES/dvdstyler.mo share/locale/hu/LC_MESSAGES/dvdstyler.mo share/locale/it/LC_MESSAGES/dvdstyler.mo share/locale/ja/LC_MESSAGES/dvdstyler.mo +share/locale/ko/LC_MESSAGES/dvdstyler.mo +share/locale/mk/ +share/locale/mk/LC_MESSAGES/ +share/locale/mk/LC_MESSAGES/dvdstyler.mo +share/locale/nb/LC_MESSAGES/dvdstyler.mo share/locale/nl/LC_MESSAGES/dvdstyler.mo share/locale/pl/LC_MESSAGES/dvdstyler.mo share/locale/pt/LC_MESSAGES/dvdstyler.mo share/locale/pt_BR/LC_MESSAGES/dvdstyler.mo share/locale/ru/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 share/locale/sv/LC_MESSAGES/dvdstyler.mo +share/locale/vi/LC_MESSAGES/dvdstyler.mo +share/locale/zh_TW/LC_MESSAGES/dvdstyler.mo share/pixmaps/dvdstyler.png @exec %D/bin/update-desktop-database @unexec-delete %D/bin/update-desktop-database