libraries/libglpng: Updated for version 1.45

4 files changed, 62 insertions, 13 deletions

diff --git a/libraries/libglpng/libglpng-1.45-extra_cflags.patch b/libraries/libglpng/libglpng-1.45-extra_cflags.patch
new file mode 100644
index 000000000000..16dd4db3fb67
--- /dev/null
+++ b/libraries/libglpng/libglpng-1.45-extra_cflags.patch
@@ -0,0 +1,9 @@
+diff -Nur libglpng-1.45.orig/Makefile libglpng-1.45/Makefile
+--- libglpng-1.45.orig/Makefile	2008-03-27 19:33:50.000000000 -0500
++++ libglpng-1.45/Makefile	2009-07-03 14:53:28.900650418 -0500
+@@ -1,4 +1,4 @@
+-CFLAGS=-Wall -g -O3 -fPIC -I$(shell pwd)/include
++CFLAGS=-Wall -g $(EXTRA_CFLAGS) -I$(shell pwd)/include
+ LDFLAGS=-lpng -lGL
+ SHAREDLIBFLAGS=-shared
+ DESTDIR=/usr/local
diff --git a/libraries/libglpng/libglpng.SlackBuild b/libraries/libglpng/libglpng.SlackBuild
index d1c04262fa73..781baccfd4e0 100644
--- a/libraries/libglpng/libglpng.SlackBuild
+++ b/libraries/libglpng/libglpng.SlackBuild
@@ -1,7 +1,26 @@
 #!/bin/sh
-
+#
 # Slackware build script for libglpng
-# Written by Erik Hanson  erik@slackbuilds.org
+#
+# Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libglpng
 VERSION=1.45
@@ -14,26 +33,45 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+fi
+
+set -eu
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-make || exit 1
-make install DESTDIR=$PKG/usr || exit 1
+patch -p1 < $CWD/libglpng-1.45-extra_cflags.patch
 
-strip --strip-unneeded $PKG/usr/lib/* 2> /dev/null
-rm $PKG/usr/lib/libglpng.a
+make EXTRA_CFLAGS="$SLKCFLAGS"
+make install DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG/usr
+
+# The Makefile doesn't make this easy :/
+if [ "$ARCH" = "x86_64" ]; then
+  mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX} 
+fi
+
+strip --strip-unneeded $PKG/usr/lib${LIBDIRSUFFIX}/* 2> /dev/null || true
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libglpng.a
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
-mv $PKG/usr/share/doc/libglpng/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libglpng/libglpng.info b/libraries/libglpng/libglpng.info
index c9bb8919a403..598f4277a56c 100644
--- a/libraries/libglpng/libglpng.info
+++ b/libraries/libglpng/libglpng.info
@@ -3,6 +3,8 @@ VERSION="1.45"
 HOMEPAGE="http://www.wyatt100.freeserve.co.uk/"
 DOWNLOAD="http://slackbuilds.org/sources/12.2/libglpng-1.45.tar.bz2"
 MD5SUM="ed0fee2b07e30c336bab1c14fafa1c15"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="David Somero,rworkman"
+APPROVED="rworkman"
diff --git a/libraries/libglpng/slack-desc b/libraries/libglpng/slack-desc
index 4b79a499a570..231d4613759b 100644
--- a/libraries/libglpng/slack-desc
+++ b/libraries/libglpng/slack-desc
@@ -15,5 +15,5 @@ libglpng:
 libglpng:
 libglpng:
 libglpng:
-libglpng: 
+libglpng:
 libglpng: