[arch-commits] Commit in gstreamer0.10-good/trunk (PKGBUILD gst-png14.patch)

Jan de Groot jgc at archlinux.org
Sun Jan 17 08:24:18 EST 2010


    Date: Sunday, January 17, 2010 @ 08:24:17
  Author: jgc
Revision: 63395

upgpkg: gstreamer0.10-good 0.10.17-2
    Rebuild for libpng14 and libjpeg8, add patch to work with libpng14 API

Added:
  gstreamer0.10-good/trunk/gst-png14.patch
Modified:
  gstreamer0.10-good/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   12 +++++++-----
 gst-png14.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-17 13:20:50 UTC (rev 63394)
+++ PKGBUILD	2010-01-17 13:24:17 UTC (rev 63395)
@@ -4,17 +4,19 @@
 pkgbase=gstreamer0.10-good
 pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
 pkgver=0.10.17
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL')
-makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.25' 'libavc1394>=0.5.3-3' 'hal>=0.5.13' 'libiec61883>=1.2.0' 'aalib>=1.4rc5-5' 'libshout>=2.2.2' 'libdv>=1.0.0' 'esound>=0.2.41' 'flac>=1.2.1' 'gconf>=2.28.0' 'wavpack>=4.50.1' 'taglib>=1.5' 'libsoup-gnome>=2.28.0' 'libv4l>=0.6.0' 'libcaca>=0.99.beta16' 'bzip2')
+makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.25' 'libavc1394>=0.5.3-3' 'hal>=0.5.14' 'libiec61883>=1.2.0' 'aalib>=1.4rc5-5' 'libshout>=2.2.2' 'libdv>=1.0.0' 'esound>=0.2.41' 'flac>=1.2.1' 'gconf>=2.28.0' 'wavpack>=4.50.1' 'taglib>=1.5' 'libsoup-gnome>=2.28.2' 'libv4l>=0.6.0' 'libcaca>=0.99.beta16' 'bzip2' 'gtk2>=2.18.6' 'imlib2>=1.4.2-4')
 url="http://gstreamer.freedesktop.org/"
 options=(!libtool !emptydirs)
-source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2)
-md5sums=('833546cd2b8bbf86b8ed083b00897918')
+source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2
+        gst-png14.patch)
+md5sums=('833546cd2b8bbf86b8ed083b00897918' '0b370d00da10f032f2f9a98035c4ed07')
 
 build() {
   cd "${srcdir}/gst-plugins-good-${pkgver}"
+  patch -Np1 -i "${srcdir}/gst-png14.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
     --disable-schemas-install \
@@ -35,7 +37,7 @@
 }
 
 package_gstreamer0.10-good-plugins() {
-  depends=("gstreamer0.10-good=${pkgver}" 'libavc1394>=0.5.3-3' 'hal>=0.5.13' 'libiec61883>=1.2.0' 'aalib>=1.4rc5-5' 'libshout>=2.2.2' 'libdv>=1.0.0' 'esound>=0.2.41' 'flac>=1.2.1' 'gconf>=2.28.0' 'wavpack>=4.50.1' 'taglib>=1.5' 'libsoup-gnome>=2.28.0' 'libv4l>=0.6.0' 'libcaca>=0.99.beta16')
+  depends=("gstreamer0.10-good=${pkgver}" 'libavc1394>=0.5.3-3' 'hal>=0.5.13' 'libiec61883>=1.2.0' 'aalib>=1.4rc5-5' 'libshout>=2.2.2' 'libdv>=1.0.0' 'esound>=0.2.41' 'flac>=1.2.1' 'gconf>=2.28.0' 'wavpack>=4.50.1' 'taglib>=1.5' 'libsoup-gnome>=2.28.0' 'libv4l>=0.6.0' 'libcaca>=0.99.beta16' 'libpng>=1.4.0' 'libjpeg>=8' 'imlib2>=1.4.2-4')
   pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)"
   groups=('gstreamer0.10-plugins')
   replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-hal' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup')

Added: gst-png14.patch
===================================================================
--- gst-png14.patch	                        (rev 0)
+++ gst-png14.patch	2010-01-17 13:24:17 UTC (rev 63395)
@@ -0,0 +1,37 @@
+diff -ru gst-plugins-good-0.10.17/configure gst-plugins-good-0.10.17.png14/configure
+--- gst-plugins-good-0.10.17/configure	2009-11-16 23:40:59.000000000 +0100
++++ gst-plugins-good-0.10.17.png14/configure	2010-01-17 14:18:30.000000000 +0100
+@@ -30924,7 +30924,7 @@
+   HAVE_LIBPNG=no
+ 
+ 
+-  which="libpng12"
++  which="libpng14"
+     required="no"
+ 
+ 
+diff -ru gst-plugins-good-0.10.17/configure.ac gst-plugins-good-0.10.17.png14/configure.ac
+--- gst-plugins-good-0.10.17/configure.ac	2009-11-16 23:38:14.000000000 +0100
++++ gst-plugins-good-0.10.17.png14/configure.ac	2010-01-17 14:18:22.000000000 +0100
+@@ -749,7 +749,7 @@
+ dnl *** libpng ***
+ translit(dnm, m, l) AM_CONDITIONAL(USE_LIBPNG, true)
+ AG_GST_CHECK_FEATURE(LIBPNG, [Portable Network Graphics library], png, [
+-  AG_GST_PKG_CHECK_MODULES(LIBPNG, libpng12)
++  AG_GST_PKG_CHECK_MODULES(LIBPNG, libpng14)
+ ])
+ 
+ dnl *** pulseaudio ***
+diff -ru gst-plugins-good-0.10.17/ext/libpng/gstpngdec.c gst-plugins-good-0.10.17.png14/ext/libpng/gstpngdec.c
+--- gst-plugins-good-0.10.17/ext/libpng/gstpngdec.c	2009-09-11 17:36:16.000000000 +0200
++++ gst-plugins-good-0.10.17.png14/ext/libpng/gstpngdec.c	2010-01-17 14:17:34.000000000 +0100
+@@ -397,7 +397,7 @@
+     png_set_gray_to_rgb (pngdec->png);
+     if (bpc < 8) {              /* Convert to 8 bits */
+       GST_LOG_OBJECT (pngdec, "converting grayscale image to 8 bits");
+-      png_set_gray_1_2_4_to_8 (pngdec->png);
++      png_set_expand_gray_1_2_4_to_8 (pngdec->png);
+     }
+   }
+ 
+Only in gst-plugins-good-0.10.17.png14/ext/libpng: gstpngdec.c.orig



More information about the arch-commits mailing list