git » vlc.git » commit 373d65f

diff --git a/PKGBUILD b/PKGBUILD
index f7b878c..3f025ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,23 +5,27 @@ pkgbase=vlc
 pkgname=('vlc' 
          'vlc-plugin')
 pkgver=1.0.4
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('GPL')
 makedepends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils'
-             'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav>=4.1.3' 
-             'lua' 'libv4l' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' 
-             'taglib' 'sysfsutils' 'libmpcdec' 'hal' 'ffmpeg>=20100108' 
+             'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav>='
+             'lua' 'libv4l' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
+             'taglib' 'sysfsutils' 'libmpcdec' 'hal' 'ffmpeg'
              'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
              'avahi' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'libxpm'
-             'xulrunner' 'pkgconfig' 'live-media>=2009.09.28' 'libnotify')
-source=(http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('3a0db00380b6d5b24dc7eb73e5d8ae51')
+             'xulrunner' 'pkgconfig' 'live-media' 'libnotify')
+source=(http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2
+	'libpng-1.4.patch')
+md5sums=('3a0db00380b6d5b24dc7eb73e5d8ae51'
+         'b1961688a9be282a126bfa1cad4b28fa')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
+  patch -Np1 -i ${srcdir}/libpng-1.4.patch
+
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
   [ "${CARCH}" = "i686" ] && EXTRAFEATURES="--enable-loader --enable-live555 --with-live555-tree=/usr/lib/live"
   [ "${CARCH}" = "x86_64" ] && EXTRAFEATURES="--enable-fast-install --enable-live555 --with-live555-tree=/usr/lib/live"
@@ -62,9 +66,9 @@ build() {
 package_vlc() {
   pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
   depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils'
-           'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav>=4.1.3' 
+           'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav'
            'lua' 'libv4l' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-           'taglib' 'sysfsutils' 'libmpcdec' 'hal' 'ffmpeg>=20100108' 
+           'taglib' 'sysfsutils' 'libmpcdec' 'hal' 'ffmpeg'
            'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
            'avahi' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils')
   optdepends=('libnotify: for notification plugin' 
diff --git a/libpng-1.4.patch b/libpng-1.4.patch
new file mode 100644
index 0000000..b0dba07
--- /dev/null
+++ b/libpng-1.4.patch
@@ -0,0 +1,20 @@
+--- vlc-1.0.4/modules/codec/png.c~	2010-01-19 02:31:45.575326077 +0100
++++ vlc-1.0.4/modules/codec/png.c	2010-01-19 02:32:21.465321175 +0100
+@@ -155,7 +155,7 @@
+     p_info = png_create_info_struct( p_png );
+     if( p_info == NULL )
+     {
+-        png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL );
++        png_destroy_read_struct( &p_png, NULL, NULL );
+         block_Release( p_block ); *pp_block = NULL;
+         return NULL;
+     }
+@@ -163,7 +163,7 @@
+     p_end_info = png_create_info_struct( p_png );
+     if( p_end_info == NULL )
+     {
+-        png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL );
++        png_destroy_read_struct( &p_png, &p_info, NULL );
+         block_Release( p_block ); *pp_block = NULL;
+         return NULL;
+     }