Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30190
Modified Files:
gd2.patch
Log Message:
unblock on 10.9 by updating to libjpeg9 and libpng16
Index: gd2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/gd2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gd2.patch 24 Aug 2011 14:20:36 -0000 1.2
+++ gd2.patch 11 Jul 2013 12:57:37 -0000 1.3
@@ -32,8 +32,8 @@
-# libpng12.so is a nightmare. We have to test separately for
-# libpng12-config and libpng-config. If we find libpng12-config,
-+# libpng15.so is a nightmare. We have to test separately for
-+# libpng15-config and libpng-config. If we find libpng15-config,
++# libpng16.so is a nightmare. We have to test separately for
++# libpng16-config and libpng-config. If we find libpng16-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
@@ -41,15 +41,15 @@
if test "$withval" != no; then
- AC_PATH_PROG([LIBPNG12_CONFIG], [libpng12-config])
-+ AC_PATH_PROG([LIBPNG15_CONFIG], [libpng15-config])
++ AC_PATH_PROG([LIBPNG16_CONFIG], [libpng16-config])
AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
- if test -n "$LIBPNG12_CONFIG"; then
- libpng_CPPFLAGS=`libpng12-config --cflags`
-+ if test -n "$LIBPNG15_CONFIG"; then
-+ libpng_CPPFLAGS=`libpng15-config --cflags`
++ if test -n "$LIBPNG16_CONFIG"; then
++ libpng_CPPFLAGS=`libpng16-config --cflags`
# should be --ldopts, but it's currently broken
- libpng_LDFLAGS=`libpng12-config --ldflags`
-+ libpng_LDFLAGS=`libpng15-config --ldflags`
++ libpng_LDFLAGS=`libpng16-config --ldflags`
libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
elif test -n "$LIBPNG_CONFIG"; then
libpng_CPPFLAGS=`libpng-config --cflags`
@@ -60,9 +60,9 @@
- if test -n "$LIBPNG12_CONFIG"; then
- AC_CHECK_LIB(png12,png_create_read_struct,
- [LIBS="-lpng12 $LIBS"
-+ if test -n "$LIBPNG15_CONFIG"; then
-+ AC_CHECK_LIB(png15,png_create_read_struct,
-+ [LIBS="-lpng15 $LIBS"
++ if test -n "$LIBPNG16_CONFIG"; then
++ AC_CHECK_LIB(png16,png_create_read_struct,
++ [LIBS="-lpng16 $LIBS"
FEATURES="GD_PNG $FEATURES"
AC_DEFINE(HAVE_LIBPNG, 1, [ Define if you have the png library. ])],
[LDFLAGS="$_ldflags"
@@ -71,10 +71,10 @@
fi
-#TBB: png12's png_create_read_struct is just as good
-+#TBB: png15's png_create_read_struct is just as good
++#TBB: png16'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_png15_png_create_read_struct" = yes; then
++if test "$ac_cv_lib_png16_png_create_read_struct" = yes; then
ac_cv_lib_png_png_create_read_struct=yes
fi
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
