[arch-commits] Commit in lib32-libjpeg-turbo/trunk (PKGBUILD)

[Laurent Carlier]

    Date: Sunday, May 26, 2013 @ 23:05:44
  Author: lcarlier
Revision: 91734

upgpkg: lib32-libjpeg-turbo 1.3.0-1

Sync with extra

Modified:
  lib32-libjpeg-turbo/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-26 19:25:26 UTC (rev 91733)
+++ PKGBUILD	2013-05-26 21:05:44 UTC (rev 91734)
@@ -4,7 +4,7 @@
 
 _pkgbasename=libjpeg-turbo
 pkgname=lib32-$_pkgbasename
-pkgver=1.2.1
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression (32-bit)"
 arch=('x86_64')
@@ -17,29 +17,30 @@
 replaces=('lib32-libjpeg')
 options=('!libtool')
 source=(http://sourceforge.net/projects/$_pkgbasename/files/$pkgver/$_pkgbasename-$pkgver.tar.gz)
-sha1sums=('a4992e102c6d88146709e8e6ce5896d5d0b5a361')
+sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28')
 
 build() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
+  cd "$_pkgbasename-$pkgver"
 
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  sed -i "s|NAFLAGS='-felf64 -DELF -D__x86_64__'|NAFLAGS='-felf32 -DELF -D__x86_64__'|" configure
+  # it doesn't seem necessary....
+  # sed -i "s|NAFLAGS='-felf64 -DELF -D__x86_64__'|NAFLAGS='-felf32 -DELF -D__x86_64__'|" configure
   ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man --libdir=/usr/lib32 --without-simd
+
   make
 }
 
 package() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
+  cd "$_pkgbasename-$pkgver"
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir/" docdir=/usr/share/doc/libjpeg-turbo \
+    exampledir=/usr/share/doc/libjpeg-turbo install
 
-  # do not distributre libturbojpeg as it is unversioned
-  rm "$pkgdir"/usr/lib32/libturbojpeg.{so,a}
+  rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
 
-  rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
   mkdir -p "$pkgdir/usr/share/licenses"
   ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
 }