summaryrefslogtreecommitdiff
path: root/development/SDL2_image
diff options
context:
space:
mode:
authorDugan Chen <thedoogster@gmail.com>2014-01-14 23:07:54 +0700
committerErik Hanson <erik@slackbuilds.org>2014-01-29 23:21:01 -0600
commitad722f51d0dc2d2b4bc7f3142ad4acbb90499a72 (patch)
treefbb71ec56a417e74d8e982a9866e381cb5e5895d /development/SDL2_image
parentf7b3f20275c30754cf048fcbf727cdc61e66f715 (diff)
downloadslackbuilds-ad722f51d0dc2d2b4bc7f3142ad4acbb90499a72.tar.gz
development/SDL2_image: Added PNG Support.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development/SDL2_image')
-rw-r--r--development/SDL2_image/SDL2_image.SlackBuild16
-rw-r--r--development/SDL2_image/pngfix.patch14
2 files changed, 23 insertions, 7 deletions
diff --git a/development/SDL2_image/SDL2_image.SlackBuild b/development/SDL2_image/SDL2_image.SlackBuild
index 2295afe22a..49e211e65d 100644
--- a/development/SDL2_image/SDL2_image.SlackBuild
+++ b/development/SDL2_image/SDL2_image.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=SDL2_image
VERSION=${VERSION:-2.0.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -64,10 +64,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# To allow for compiling with png support.
+patch -p1 --verbose < $CWD/pngfix.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -78,8 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux \
- --disable-png # Building with PNG support on Slackware 14 doesn't work.
+ --build=$ARCH-slackware-linux
make
make install DESTDIR=$PKG
diff --git a/development/SDL2_image/pngfix.patch b/development/SDL2_image/pngfix.patch
new file mode 100644
index 0000000000..c93abc6514
--- /dev/null
+++ b/development/SDL2_image/pngfix.patch
@@ -0,0 +1,14 @@
+diff -rupN SDL2_image-2.0.0.orig/IMG_png.c SDL2_image-2.0.0/IMG_png.c
+--- SDL2_image-2.0.0.orig/IMG_png.c 2013-08-10 10:38:36.000000000 -0700
++++ SDL2_image-2.0.0/IMG_png.c 2014-01-13 09:33:32.569432897 -0800
+@@ -68,8 +68,8 @@
+ #include <png.h>
+
+ /* Check for the older version of libpng */
+-#if (PNG_LIBPNG_VER_MAJOR == 1)
+-#if (PNG_LIBPNG_VER_MINOR < 4)
++#if (PNG_LIBPNG_VER_MAJOR == 1)
++#if (PNG_LIBPNG_VER_MINOR < 5)
+ #define LIBPNG_VERSION_12
+ typedef png_bytep png_const_bytep;
+ #endif