[arch-commits] Commit in netpbm/trunk (PKGBUILD netpbm-10.35-jpeg7.patch)

[Eric Bélanger]

    Date: Wednesday, July 8, 2009 @ 18:25:10
  Author: eric
Revision: 45263

upgpkg: netpbm 10.35.841-1
    libjpeg rebuild, fixed pkgver, added build patches

Added:
  netpbm/trunk/netpbm-10.35-jpeg7.patch
Modified:
  netpbm/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   18 +++++++++++-------
 netpbm-10.35-jpeg7.patch |   11 +++++++++++
 2 files changed, 22 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-08 21:36:41 UTC (rev 45262)
+++ PKGBUILD	2009-07-08 22:25:10 UTC (rev 45263)
@@ -3,26 +3,30 @@
 # Contributor: Jochem Kossen <j.kossen at home.nl>
 
 pkgname=netpbm
-pkgver=10.35
-pkgrel=841
+pkgver=10.35.841
+pkgrel=1
 pkgdesc="A toolkit for manipulation of graphic images"
 arch=(i686 x86_64)
 license=('custom' 'BSD' 'GPL' 'LGPL')
 url="http://netpbm.sourceforge.net/"
-depends=('perl' 'libjpeg' 'libpng' 'libtiff' 'libxml2')
+depends=('perl' 'libjpeg>=7' 'libpng' 'libtiff' 'libxml2')
 makedepends=('python')
 options=('!makeflags')
 # Releases after 10.34 are available via SVN only.
 # remake snapshot with: svn export http://netpbm.svn.sourceforge.net/svnroot/netpbm/stable@${pkgrel} netpbm
 # get doc with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/
-source=(ftp://ftp.archlinux.org/other/netpbm/$pkgname-$pkgver-$pkgrel.tar.bz2 \
-        ftp://ftp.archlinux.org/other/netpbm/netpbm-doc-20090222.tar.bz2 Makefile.config arch.patch)
+source=(ftp://ftp.archlinux.org/other/netpbm/$pkgname-$pkgver.tar.bz2 \
+        ftp://ftp.archlinux.org/other/netpbm/netpbm-doc-20090222.tar.bz2 \
+        Makefile.config arch.patch netpbm-10.35-glibc.patch netpbm-10.35-jpeg7.patch)
 md5sums=('04d94bf5eefd56e6443b4008196d5969' '20f5392fd1deacfa267bf64ab9d420c5'\
-         'cfdb69f77f8ef06f8863fe02ce27db71' '88992e053dbfa9fdde2cccea32e6632b')
+         'cfdb69f77f8ef06f8863fe02ce27db71' '88992e053dbfa9fdde2cccea32e6632b'\
+         '8e278fba37c8f70f6a8658b98686dfad' '6a3da4565f6623f4875bd62871a8dda5')
 
 build() {
   cd ${srcdir}/${pkgname}
-  patch -p1 < ../arch.patch
+  patch -p1 < ../arch.patch || return 1
+  patch -p0 < ../netpbm-10.35-glibc.patch || return 1
+  patch -p0 < ../netpbm-10.35-jpeg7.patch || return 1
   cp ../Makefile.config .
 
   if [ "${CARCH}" == "x86_64" ]; then

Added: netpbm-10.35-jpeg7.patch
===================================================================
--- netpbm-10.35-jpeg7.patch	                        (rev 0)
+++ netpbm-10.35-jpeg7.patch	2009-07-08 22:25:10 UTC (rev 45263)
@@ -0,0 +1,11 @@
+--- converter/ppm/ppmtompeg/jpeg.c.orig	2009-07-08 17:29:05.000000000 -0400
++++ converter/ppm/ppmtompeg/jpeg.c	2009-07-08 17:31:00.000000000 -0400
+@@ -470,7 +470,7 @@
+ #ifdef JPEG4
+     buffer_height = 8;  /* could be 2, 4,8 rows high */
+ #else
+-    buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
++    buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size;
+ #endif
+   
+     for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;