mirror of
git://slackware.nl/current.git
synced 2025-02-05 20:46:11 +01:00
b76270bf9e
Wed May 19 08:58:23 UTC 2010 Slackware 13.1 x86_64 stable is released! Lots of thanks are due -- see the RELEASE_NOTES and the rest of the ChangeLog for credits. The ISOs are on their way to replication, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. We are taking pre-orders now at store.slackware.com, and offering a discount if you sign up for a subscription. Consider picking up a copy to help support the project. Thanks again to the Slackware community for testing, contributing, and generally holding us to a high level of quality. :-) Enjoy!
65 lines
2.6 KiB
Diff
65 lines
2.6 KiB
Diff
--- ./configure.ac.orig 2007-04-25 07:48:41.000000000 -0500
|
|
+++ ./configure.ac 2010-02-12 01:37:29.000000000 -0600
|
|
@@ -342,20 +342,20 @@
|
|
[ --with-png=DIR where to find the png library],,
|
|
withval=yes)
|
|
|
|
-# libpng12.so is a nightmare. We have to test separately for
|
|
-# libpng12-config and libpng-config. If we find libpng12-config,
|
|
+# libpng14.so is a nightmare. We have to test separately for
|
|
+# libpng14-config and libpng-config. If we find libpng14-config,
|
|
# we don't look for the other, which will just be a symlink to it,
|
|
# confusing autoconf into thinking the library itself will be named -lpng,
|
|
# which it won't be. Awful. This code will suffice unless the libpng
|
|
# authors decide to do this AGAIN. Which I really hope they won't. TBB
|
|
|
|
if test "$withval" != no; then
|
|
- AC_PATH_PROG([LIBPNG12_CONFIG], [libpng12-config])
|
|
+ AC_PATH_PROG([LIBPNG14_CONFIG], [libpng14-config])
|
|
AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
|
|
- if test -n "$LIBPNG12_CONFIG"; then
|
|
- libpng_CPPFLAGS=`libpng12-config --cflags`
|
|
+ if test -n "$LIBPNG14_CONFIG"; then
|
|
+ libpng_CPPFLAGS=`libpng14-config --cflags`
|
|
# should be --ldopts, but it's currently broken
|
|
- libpng_LDFLAGS=`libpng12-config --ldflags`
|
|
+ libpng_LDFLAGS=`libpng14-config --ldflags`
|
|
libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
|
|
elif test -n "$LIBPNG_CONFIG"; then
|
|
libpng_CPPFLAGS=`libpng-config --cflags`
|
|
@@ -375,9 +375,9 @@
|
|
_ldflags="$LDFLAGS"
|
|
LDFLAGS="$libpng_LDFLAGS $LDFLAGS"
|
|
|
|
- if test -n "$LIBPNG12_CONFIG"; then
|
|
- AC_CHECK_LIB(png12,png_create_read_struct,
|
|
- [LIBS="-lpng12 $LIBS"
|
|
+ if test -n "$LIBPNG14_CONFIG"; then
|
|
+ AC_CHECK_LIB(png14,png_create_read_struct,
|
|
+ [LIBS="-lpng14 $LIBS"
|
|
FEATURES="GD_PNG $FEATURES"
|
|
AC_DEFINE(HAVE_LIBPNG, 1, [ Define if you have the png library. ])],
|
|
[LDFLAGS="$_ldflags"
|
|
@@ -402,9 +402,9 @@
|
|
AC_MSG_WARN([libpng is required - see http://www.libpng.org/pub/png/])
|
|
fi
|
|
|
|
-#TBB: png12's png_create_read_struct is just as good
|
|
+#TBB: png14's png_create_read_struct is just as good
|
|
#2.0.23: should be = not ==
|
|
-if test "$ac_cv_lib_png12_png_create_read_struct" = yes; then
|
|
+if test "$ac_cv_lib_png14_png_create_read_struct" = yes; then
|
|
ac_cv_lib_png_png_create_read_struct=yes
|
|
fi
|
|
|
|
--- ./gd_png.c.orig 2007-06-14 14:51:41.000000000 -0500
|
|
+++ ./gd_png.c 2010-02-12 01:43:36.000000000 -0600
|
|
@@ -149,7 +149,7 @@
|
|
return NULL;
|
|
}
|
|
|
|
- if (!png_check_sig (sig, 8)) { /* bad signature */
|
|
+ if (!(png_sig_cmp(sig, 0, 8) == 0)) { /* bad signature */
|
|
return NULL; /* bad signature */
|
|
}
|
|
|