summaryrefslogtreecommitdiff
path: root/extra/xine-ui
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-02-06 23:14:50 +0000
committerroot <root@rshg054.dnsready.net>2012-02-06 23:14:50 +0000
commit1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 (patch)
tree8d7ccc2dc9d08a4c3cde26aa01c887e9a0fc2fa1 /extra/xine-ui
parentbdb5b3e66f6afa586ea147f69af5e4ba388f7615 (diff)
Mon Feb 6 23:14:50 UTC 2012
Diffstat (limited to 'extra/xine-ui')
-rw-r--r--extra/xine-ui/PKGBUILD10
-rw-r--r--extra/xine-ui/xine-ui-0.99.6-libpng15.patch13
2 files changed, 19 insertions, 4 deletions
diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD
index d5ca4e7ee..15e2b70d1 100644
--- a/extra/xine-ui/PKGBUILD
+++ b/extra/xine-ui/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146430 2012-01-10 23:37:56Z eric $
+# $Id: PKGBUILD 148980 2012-02-05 11:58:50Z ibiru $
# Maintainer: Eric BĂ©langer <eric@archlinux.org>
pkgname=xine-ui
pkgver=0.99.6
-pkgrel=4
+pkgrel=5
pkgdesc="A free video player for Unix"
arch=('i686' 'x86_64')
license=('GPL')
@@ -16,12 +16,13 @@ options=('!strip')
install=xine-ui.install
source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz
lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch
- fix_lirc.diff xine-ui-xdg.diff)
+ fix_lirc.diff xine-ui-xdg.diff xine-ui-0.99.6-libpng15.patch)
sha1sums=('abbdb331898c14025ee6b132f63ab7d3c1b5b31e'
'b2df43ede3a9d1a34b80139704a4cbbc7295c584'
'8bbd39f61de7b6991385457a4944b8ea104da88b'
'2361df9ddad59c426b0f863414c6d527b463a38a'
- '9c70c6543dae6815710b239b4638ffe3843bac86')
+ '9c70c6543dae6815710b239b4638ffe3843bac86'
+ 'bc7ec3153e61553dee8c0b6e04d1ca7cfe4a6f14')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,6 +30,7 @@ build() {
patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch"
patch -p1 < "${srcdir}/fix_lirc.diff"
patch -p1 < "${srcdir}/xine-ui-xdg.diff"
+ patch -p1 < "${srcdir}/xine-ui-0.99.6-libpng15.patch"
sed -i '/\#include <curl\/types.h>/d' src/xitk/download.c
autoconf
./configure --prefix=/usr --mandir=/usr/share/man \
diff --git a/extra/xine-ui/xine-ui-0.99.6-libpng15.patch b/extra/xine-ui/xine-ui-0.99.6-libpng15.patch
new file mode 100644
index 000000000..6a5fb5522
--- /dev/null
+++ b/extra/xine-ui/xine-ui-0.99.6-libpng15.patch
@@ -0,0 +1,13 @@
+Index: xine-ui-0.99.6/src/xitk/Imlib-light/load.c
+===================================================================
+--- xine-ui-0.99.6.orig/src/xitk/Imlib-light/load.c
++++ xine-ui-0.99.6/src/xitk/Imlib-light/load.c
+@@ -61,7 +61,7 @@ unsigned char *_LoadPNG(ImlibData * id,
+ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return NULL;
+ }
+- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return NULL;