Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bwbar/PKGBUILD
	community/directfb/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gnash/PKGBUILD
	community/guake/PKGBUILD
	community/pidgin-libnotify/PKGBUILD
	community/png2ico/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/torcs/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/abiword/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-desktop2/PKGBUILD
	extra/gnome-python/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/koffice/PKGBUILD
	extra/lcms/PKGBUILD
	extra/libao/PKGBUILD
	extra/libcue/PKGBUILD
	extra/libdaemon/PKGBUILD
	extra/libgnome-media-profiles/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libots/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxfcegui4/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/rssh/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim-pinyin/PKGBUILD
	extra/scim-tables/PKGBUILD
	extra/scim-uim/PKGBUILD
	extra/tsocks/PKGBUILD
	extra/vigra/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wv/PKGBUILD
	extra/xclip/PKGBUILD
	extra/xfce4-datetime-plugin/PKGBUILD
	extra/xfce4-notes-plugin/PKGBUILD
	extra/xfce4-quicklauncher-plugin/PKGBUILD
	extra/xfce4-sensors-plugin/PKGBUILD
	extra/xorg-font-util/PKGBUILD
	extra/xorg-setxkbmap/PKGBUILD
	extra/xorg-xev/PKGBUILD
	extra/xsane/PKGBUILD
	extra/yakuake/PKGBUILD
	extra/zvbi/PKGBUILD
	multilib/lib32-cairo/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-libcanberra/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libglade/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/wine/PKGBUILD
	testing/vlc/PKGBUILD
	testing/xulrunner/PKGBUILD

2 files changed, 19 insertions, 4 deletions

diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD
index 30a5fe030..8c3f40317 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' 'mips64el')
 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;