[arch-commits] Commit in libpng/trunk (PKGBUILD libpng14-enable-read-dither.patch)

[Jan de Groot]

    Date: Wednesday, May 26, 2010 @ 06:07:00
  Author: jgc
Revision: 81055

upgpkg: libpng 1.4.2-1
Update to 1.4.2. Move to testing as the png_set_dither function has been renamed in this release

Modified:
  libpng/trunk/PKGBUILD
Deleted:
  libpng/trunk/libpng14-enable-read-dither.patch

-----------------------------------+
 PKGBUILD                          |   21 +++++++++------------
 libpng14-enable-read-dither.patch |   15 ---------------
 2 files changed, 9 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-26 09:49:23 UTC (rev 81054)
+++ PKGBUILD	2010-05-26 10:07:00 UTC (rev 81055)
@@ -1,10 +1,11 @@
 # $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: dorphell <dorphell at archlinux.org>
 # Contributor: Travis Willard <travis at archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=libpng
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files"
 arch=('i686' 'x86_64')
@@ -12,12 +13,10 @@
 license=('custom')
 depends=('zlib')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-        "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${pkgver}-apng.patch.gz"
-	'libpng14-enable-read-dither.patch')
-md5sums=('d4cb0236cce9ce8ff49a22994a01f9e0'
-         'cdf7cde368a4e0de8d5400a99a79957f'
-         'd4696db4af61b175b705f51aeb9c8d7e')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz
+        http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${pkgver}-apng.patch.gz)
+md5sums=('d22ef5878842d918d6d110c0e7cc3afc'
+         '378ade7c68c25d00e099b28911d06561')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -25,8 +24,6 @@
   # Add animated PNG (apng) support
   # see http://sourceforge.net/projects/libpng-apng/
   patch -p1 -i "${srcdir}/libpng-${pkgver}-apng.patch" || return 1
-  # Enabling read dither support - needed for xfig and transfig
-  patch -p1 -i "${srcdir}/libpng14-enable-read-dither.patch" || return 1
 
   libtoolize --force --copy || return 1
   aclocal || return 1
@@ -34,11 +31,11 @@
   automake --add-missing || return 1
 
   ./configure --prefix=/usr || return 1
-  make ECHO=echo || return 1
-  make ECHO=echo DESTDIR="${pkgdir}" install || return 1
+  make || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 
   cd contrib/pngminus
-  make ECHO=echo PNGLIB="-L${pkgdir}/usr/lib -lpng" -f makefile.std png2pnm pnm2png
+  make PNGLIB="-L${pkgdir}/usr/lib -lpng" -f makefile.std png2pnm pnm2png
   install -m755 png2pnm pnm2png "${pkgdir}/usr/bin/"
   install -D -m644 ../../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
 }

Deleted: libpng14-enable-read-dither.patch
===================================================================
--- libpng14-enable-read-dither.patch	2010-05-26 09:49:23 UTC (rev 81054)
+++ libpng14-enable-read-dither.patch	2010-05-26 10:07:00 UTC (rev 81055)
@@ -1,15 +0,0 @@
-diff -Naur libpng-1.4.0-orig/pngconf.h libpng-1.4.0/pngconf.h
---- libpng-1.4.0-orig/pngconf.h	2010-01-27 20:38:27.000000000 -0500
-+++ libpng-1.4.0/pngconf.h	2010-01-27 20:44:44.000000000 -0500
-@@ -497,11 +497,9 @@
- #  ifndef PNG_NO_READ_INVERT
- #    define PNG_READ_INVERT_SUPPORTED
- #  endif
--#if 0 /* removed from libpng-1.4.0 */
- #  ifndef PNG_NO_READ_DITHER
- #    define PNG_READ_DITHER_SUPPORTED
- #  endif
--#endif /* 0 */
- #  ifndef PNG_NO_READ_BACKGROUND
- #    define PNG_READ_BACKGROUND_SUPPORTED
- #  endif