[arch-commits] Commit in dvdauthor/repos (4 files)

[Ionut Biru]

    Date: Sunday, February 5, 2012 @ 06:47:32
  Author: ibiru
Revision: 148701

db-move: moved dvdauthor from [testing] to [extra] (i686)

Added:
  dvdauthor/repos/extra-i686/PKGBUILD
    (from rev 148654, dvdauthor/repos/testing-i686/PKGBUILD)
  dvdauthor/repos/extra-i686/dvdauthor-0.7.0-libpng15.patch
    (from rev 148654, dvdauthor/repos/testing-i686/dvdauthor-0.7.0-libpng15.patch)
Deleted:
  dvdauthor/repos/extra-i686/PKGBUILD
  dvdauthor/repos/testing-i686/

--------------------------------+
 PKGBUILD                       |   66 ++++++++++++++++++++-------------------
 dvdauthor-0.7.0-libpng15.patch |   19 +++++++++++
 2 files changed, 54 insertions(+), 31 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-02-05 11:47:29 UTC (rev 148700)
+++ extra-i686/PKGBUILD	2012-02-05 11:47:32 UTC (rev 148701)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Travis Willard <travisw at wmpub.ca> 
-# Contributor: Jaroslaw Swierczynski <swiergot at juvepoland.com>
-# Contributor: Nicolai Lissner <nlissne at linux01.gwdg.de>
-
-pkgname=dvdauthor
-pkgver=0.7.0
-pkgrel=3
-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")
-md5sums=('33a447fb98ab3293ac40f869eedc17ff')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-
-  make DESTDIR="${pkgdir}" install
-}

Copied: dvdauthor/repos/extra-i686/PKGBUILD (from rev 148654, dvdauthor/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-02-05 11:47:32 UTC (rev 148701)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Travis Willard <travisw at wmpub.ca> 
+# Contributor: Jaroslaw Swierczynski <swiergot at juvepoland.com>
+# Contributor: Nicolai Lissner <nlissne at 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/extra-i686/dvdauthor-0.7.0-libpng15.patch (from rev 148654, dvdauthor/repos/testing-i686/dvdauthor-0.7.0-libpng15.patch)
===================================================================
--- extra-i686/dvdauthor-0.7.0-libpng15.patch	                        (rev 0)
+++ extra-i686/dvdauthor-0.7.0-libpng15.patch	2012-02-05 11:47:32 UTC (rev 148701)
@@ -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);