From dda36349496e0987f0ccf4f23929f7870ba11813 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>
Date: Wed, 3 Sep 2008 03:50:43 +0000
Subject: merging with changes made since 21th May

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1903 370017ae-e619-0410-ac65-c121f96126d4
---
 patches/libpng/libpng.SlackBuild | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'patches/libpng')

diff --git a/patches/libpng/libpng.SlackBuild b/patches/libpng/libpng.SlackBuild
index 77a67f06..a218cb32 100755
--- a/patches/libpng/libpng.SlackBuild
+++ b/patches/libpng/libpng.SlackBuild
@@ -31,7 +31,7 @@ fi
 # default settings
 PACKAGE="libpng"
 ARCH=${ARCH:=i486}
-VERSION=${VERSION:=1.2.18}
+VERSION=${VERSION:=1.2.29}
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC:=$CWD}
 TMP=${TMP:=/tmp}
@@ -95,14 +95,6 @@ if [ "$ARCH" == "x86_64" ]; then
   zcat $CWD/libpng.libs.diff.gz | patch -p1 --verbose || exit $ERROR_PATCH
   ln -sf scripts/makefile.linux ./Makefile
 
-  # makefile.linux breaks on trying to deal with MMX on AMD64.
-  # If we use automake, the Makefile doesn't deal with certain
-  # exported functions we need (e.g. png_read_destroy)
-  # We *could* patch libpng to use 64 bit safe MMX instructions, but
-  # the tested and recommended way appears to be to disable the MMX
-  # instructions on AMD64
-  zcat $CWD/libpng.mmx-x86-only.diff.gz | patch -p1 --verbose || exit 1 # Patch from Mandriva
-
   ./configure --prefix=/usr --libdir=$LIBDIR || exit $ERROR_CONF
 
 else
-- 
cgit v1.2.3