[arch-commits] Commit in vlc/trunk (PKGBUILD libpng-1.4.patch)
Andrea Scarpino
andrea at archlinux.org
Tue Jan 19 01:56:01 UTC 2010
Date: Monday, January 18, 2010 @ 20:56:01
Author: andrea
Revision: 63914
upgpkg: vlc 1.0.4-4
libpng rebuild
Added:
vlc/trunk/libpng-1.4.patch
Modified:
vlc/trunk/PKGBUILD
------------------+
PKGBUILD | 22 +++++++++++++---------
libpng-1.4.patch | 20 ++++++++++++++++++++
2 files changed, 33 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-01-19 01:19:54 UTC (rev 63913)
+++ PKGBUILD 2010-01-19 01:56:01 UTC (rev 63914)
@@ -6,23 +6,27 @@
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"
@@ -63,9 +67,9 @@
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'
Added: libpng-1.4.patch
===================================================================
--- libpng-1.4.patch (rev 0)
+++ libpng-1.4.patch 2010-01-19 01:56:01 UTC (rev 63914)
@@ -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;
+ }
More information about the arch-commits
mailing list