Date: Thursday, January 19, 2012 @ 17:25:27 Author: giovanni Revision: 146985
archrelease: copy trunk to staging-i686, staging-x86_64 Added: dvdauthor/repos/staging-i686/ dvdauthor/repos/staging-i686/PKGBUILD (from rev 146984, dvdauthor/trunk/PKGBUILD) dvdauthor/repos/staging-i686/dvdauthor-0.7.0-libpng15.patch (from rev 146984, dvdauthor/trunk/dvdauthor-0.7.0-libpng15.patch) dvdauthor/repos/staging-x86_64/ dvdauthor/repos/staging-x86_64/PKGBUILD (from rev 146984, dvdauthor/trunk/PKGBUILD) dvdauthor/repos/staging-x86_64/dvdauthor-0.7.0-libpng15.patch (from rev 146984, dvdauthor/trunk/dvdauthor-0.7.0-libpng15.patch) -----------------------------------------------+ staging-i686/PKGBUILD | 35 ++++++++++++++++++++++++ staging-i686/dvdauthor-0.7.0-libpng15.patch | 19 +++++++++++++ staging-x86_64/PKGBUILD | 35 ++++++++++++++++++++++++ staging-x86_64/dvdauthor-0.7.0-libpng15.patch | 19 +++++++++++++ 4 files changed, 108 insertions(+) Copied: dvdauthor/repos/staging-i686/PKGBUILD (from rev 146984, dvdauthor/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2012-01-19 22:25:27 UTC (rev 146985) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Travis Willard <trav...@wmpub.ca> +# Contributor: Jaroslaw Swierczynski <swier...@juvepoland.com> +# Contributor: Nicolai Lissner <nlis...@linux01.gwdg.de> + +pkgname=dvdauthor +pkgver=0.7.0 +pkgrel=4 +pkgdesc="DVD authoring tools" +arch=('i686' 'x86_64') +url="http://dvdauthor.sourceforge.net/" +license=('GPL') +depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') +options=('!makeflags') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'dvdauthor-0.7.0-libpng15.patch') +md5sums=('33a447fb98ab3293ac40f869eedc17ff' + '9ea90bbea6adb0469c8c1b2f7d033f11') + +build() { + cd "${srcdir}/${pkgname}" + + patch -Np0 -i "${srcdir}/dvdauthor-0.7.0-libpng15.patch" + + ./configure --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}" + + make DESTDIR="${pkgdir}" install +} Copied: dvdauthor/repos/staging-i686/dvdauthor-0.7.0-libpng15.patch (from rev 146984, dvdauthor/trunk/dvdauthor-0.7.0-libpng15.patch) =================================================================== --- staging-i686/dvdauthor-0.7.0-libpng15.patch (rev 0) +++ staging-i686/dvdauthor-0.7.0-libpng15.patch 2012-01-19 22:25:27 UTC (rev 146985) @@ -0,0 +1,19 @@ +--- src/spuunmux.c ++++ src/spuunmux.c +@@ -39,6 +39,7 @@ + #include <netinet/in.h> + + #include <png.h> ++#include <zlib.h> + + #include "rgb.h" + #include "common.h" +@@ -610,7 +611,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + return -1; + } /*if*/ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); Copied: dvdauthor/repos/staging-x86_64/PKGBUILD (from rev 146984, dvdauthor/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2012-01-19 22:25:27 UTC (rev 146985) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Travis Willard <trav...@wmpub.ca> +# Contributor: Jaroslaw Swierczynski <swier...@juvepoland.com> +# Contributor: Nicolai Lissner <nlis...@linux01.gwdg.de> + +pkgname=dvdauthor +pkgver=0.7.0 +pkgrel=4 +pkgdesc="DVD authoring tools" +arch=('i686' 'x86_64') +url="http://dvdauthor.sourceforge.net/" +license=('GPL') +depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') +options=('!makeflags') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'dvdauthor-0.7.0-libpng15.patch') +md5sums=('33a447fb98ab3293ac40f869eedc17ff' + '9ea90bbea6adb0469c8c1b2f7d033f11') + +build() { + cd "${srcdir}/${pkgname}" + + patch -Np0 -i "${srcdir}/dvdauthor-0.7.0-libpng15.patch" + + ./configure --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}" + + make DESTDIR="${pkgdir}" install +} Copied: dvdauthor/repos/staging-x86_64/dvdauthor-0.7.0-libpng15.patch (from rev 146984, dvdauthor/trunk/dvdauthor-0.7.0-libpng15.patch) =================================================================== --- staging-x86_64/dvdauthor-0.7.0-libpng15.patch (rev 0) +++ staging-x86_64/dvdauthor-0.7.0-libpng15.patch 2012-01-19 22:25:27 UTC (rev 146985) @@ -0,0 +1,19 @@ +--- src/spuunmux.c ++++ src/spuunmux.c +@@ -39,6 +39,7 @@ + #include <netinet/in.h> + + #include <png.h> ++#include <zlib.h> + + #include "rgb.h" + #include "common.h" +@@ -610,7 +611,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + return -1; + } /*if*/ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp);