Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9846
Modified Files:
gd2-nox.info gd2-nox.patch gd2.info gd2.patch
Log Message:
graphics-lib coherence and misc cleanups among the variants
Index: gd2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/gd2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gd2.patch 11 Jul 2013 12:57:37 -0000 1.3
+++ gd2.patch 11 Jul 2013 17:43:40 -0000 1.4
@@ -24,60 +24,6 @@
echo "libdir: $libdir"
echo "features: @FEATURES@"
;;
---- ./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,
-+# 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
- # 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([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 "$LIBPNG16_CONFIG"; then
-+ libpng_CPPFLAGS=`libpng16-config --cflags`
- # should be --ldopts, but it's currently broken
-- libpng_LDFLAGS=`libpng12-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`
-@@ -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 "$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"
-@@ -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: 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_png16_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 @@
Index: gd2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/gd2.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gd2.info 11 Jul 2013 12:57:47 -0000 1.3
+++ gd2.info 11 Jul 2013 17:43:40 -0000 1.4
@@ -1,36 +1,46 @@
Package: gd2
Version: 2.0.35
-Revision: 12
+Revision: 13
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
autoconf2.6,
- automake1.11,
- expat1,
- fink (>= 0.24.12),
+ automake1.13,
fink-package-precedence,
- fontconfig2-dev (>= 2.8.0-4),
- freetype219 (>= 2.3.12-1),
+ fontconfig2-dev (>= 2.10.0-1),
+ freetype219 (>= 2.4.11-1),
gettext-tools,
libiconv-dev,
- libjpeg9 (>= 9-3),
+ libjpeg9,
libpng16,
libtool2,
x11-dev
<<
-Conflicts: gd, gd2-nox, gd209
-Replaces: gd, gd2-nox, gd209, %N-bin (<< 2.0.33-3)
+Conflicts: <<
+ gd,
+ gd2, gd2-nox,
+ gd209
+<<
+Replaces: <<
+ gd,
+ gd2, gd2-nox,
+ gd209,
+ gd2-bin (<< 2.0.33-3)
+<<
Source: http://www.libgd.org/releases/gd-%v.tar.bz2
Source-MD5: 6c6c3dbb7bf079e0bb5fbbfd3bb8a71c
-SetCPPFLAGS: -I%p/lib/fontconfig2/include
-SetLDFLAGS: -L%p/lib/fontconfig2/lib
-ConfigureParams: --with-fontconfig=%p/lib/fontconfig2
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
--enable-dependency-tracking --disable-static
-PatchFile: gd2.patch
-PatchFile-MD5: f54aa1b36ce77a966e3b77a927e75bf4
+ConfigureParams: <<
+ --enable-dependency-tracking \
+ --disable-static
+<<
+PatchFile: %n.patch
+PatchFile-MD5: e3fd8823eaaafd71236368e9891f8694
PatchScript: <<
- #!/bin/sh -ev
- %{default_script}
+ %{default_script}
+ perl -pi -e 's/(png)12/${1}16/gi' configure.ac
<<
CompileScript: <<
+ # Seems to rerun some autotools anyway (broken timestamps on
+ # some file?) so may as well run them from scratch to start
autoreconf -fi
./configure %c
make
@@ -41,10 +51,10 @@
SplitOff2: <<
Package: %N-shlibs
Depends: <<
- fontconfig2-shlibs (>= 2.8.0-4),
- freetype219-shlibs (>= 2.3.12-1),
+ fontconfig2-shlibs (>= 2.10.0-1),
+ freetype219-shlibs (>= 2.4.11-1),
libiconv,
- libjpeg9-shlibs (>= 9-3),
+ libjpeg9-shlibs,
libpng16-shlibs,
x11-shlibs
<<
@@ -58,16 +68,24 @@
Package: %N-bin
Depends: <<
%N-shlibs (>= %v-%r),
- fontconfig2-shlibs (>= 2.8.0-4),
- freetype219-shlibs (>= 2.3.12-1),
+ fontconfig2-shlibs (>= 2.10.0-1),
+ freetype219-shlibs (>= 2.4.11-1),
libiconv,
- libjpeg-bin (>= 9-3),
- libjpeg9-shlibs (>= 9-3),
+ libjpeg-bin,
+ libjpeg9-shlibs,
libpng16-shlibs,
x11
<<
- Conflicts: gd-bin, gd2-nox-bin, gd209-bin
- Replaces: gd-bin, gd2-nox-bin, gd209-bin
+ Conflicts: <<
+ gd-bin,
+ gd2-bin, gd2-nox-bin,
+ gd209-bin
+ <<
+ Replaces: <<
+ gd-bin,
+ gd2-bin, gd2-nox-bin,
+ gd209-bin
+ <<
Files: <<
bin/annotate
bin/bdftogd
@@ -92,7 +110,7 @@
you use TrueType fonts rendered via freetype2.
<<
DescPort: <<
- Patch for compiling gd2 against libpng14 borrowed from slackware:
+ Patch for compiling gd2 against libpng14+ borrowed from slackware:
http://www.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware64-current/source/l/gd/gd.png14.diff.gz
<<
DescPackaging: <<
Index: gd2-nox.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/gd2-nox.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gd2-nox.patch 9 Aug 2011 13:53:08 -0000 1.1
+++ gd2-nox.patch 11 Jul 2013 17:43:40 -0000 1.2
@@ -1,57 +1,3 @@
---- ./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 @@
Index: gd2-nox.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/gd2-nox.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gd2-nox.info 10 Aug 2011 00:58:44 -0000 1.2
+++ gd2-nox.info 11 Jul 2013 17:43:40 -0000 1.3
@@ -1,26 +1,45 @@
Package: gd2-nox
Version: 2.0.35
-Revision: 10
+Revision: 11
BuildDepends: <<
- autoconf2.6,
- automake1.11,
- fink (>= 0.24.12),
- fink-package-precedence,
- freetype219 (>= 2.3.12-1),
- gettext-tools,
- libiconv-dev,
- libjpeg8 (>= 8-2),
- libpng14,
- libtool2
+ autoconf2.6,
+ automake1.13,
+ fink-package-precedence,
+ freetype219 (>= 2.4.11-1),
+ gettext-tools,
+ libiconv-dev,
+ libjpeg9,
+ libpng16,
+ libtool2
+<<
+Conflicts: <<
+ gd,
+ gd2, gd2-nox,
+ gd209
+<<
+Replaces: <<
+ gd,
+ gd2, gd2-nox,
+ gd209,
+ gd2-bin (<< 2.0.33-3)
<<
-Conflicts: gd, gd2, gd209
-Replaces: gd, gd2, gd209, gd2-bin (<< 2.0.33-3)
Source: http://www.libgd.org/releases/gd-%v.tar.bz2
Source-MD5: 6c6c3dbb7bf079e0bb5fbbfd3bb8a71c
-ConfigureParams: --without-fontconfig --enable-dependency-tracking --without-x
--disable-shared
-PatchFile: gd2-nox.patch
-PatchFile-MD5: d32c3cb1afea7b094dbf0cae20594a98
+ConfigureParams: <<
+ --without-fontconfig \
+ --enable-dependency-tracking \
+ --without-x \
+ --disable-shared
+<<
+PatchFile: %n.patch
+PatchFile-MD5: a4946ad1c1826d007fc4c1a14667d5a7
+PatchScript: <<
+ %{default_script}
+ perl -pi -e 's/(png)12/${1}16/gi' configure.ac
+<<
CompileScript: <<
+ # Seems to rerun some autotools anyway (broken timestamps on
+ # some file?) so may as well run them from scratch to start
autoreconf -fi
./configure %c
make
@@ -31,14 +50,22 @@
SplitOff: <<
Package: %N-bin
Depends: <<
- freetype219-shlibs (>= 2.3.12-1),
+ freetype219-shlibs (>= 2.4.11-1),
libiconv,
- libjpeg-bin (>= 8-2),
- libjpeg8-shlibs (>= 8-2),
- libpng14-shlibs
+ libjpeg-bin,
+ libjpeg9-shlibs,
+ libpng16-shlibs
+ <<
+ Conflicts: <<
+ gd-bin,
+ gd2-bin, gd2-nox-bin,
+ gd209-bin
+ <<
+ Replaces: <<
+ gd-bin,
+ gd2-bin, gd2-nox-bin,
+ gd209-bin
<<
- Conflicts: gd-bin, gd2-bin, gd209-bin
- Replaces: gd-bin, gd2-bin, gd209-bin
Files: <<
bin/annotate
bin/bdftogd
@@ -63,7 +90,7 @@
you use TrueType fonts rendered via freetype2.
<<
DescPort: <<
- Patch for compiling gd2 against libpng14 borrowed from slackware:
+ Patch for compiling gd2 against libpng14+ borrowed from slackware:
http://www.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware64-current/source/l/gd/gd.png14.diff.gz
<<
DescPackaging: <<
@@ -71,7 +98,8 @@
and Peter O'Gorman. Previously maintained by Christoph Pfisterer.
The -nox version installs only static libraries, for use by other programs
- which need gd2 functionality in a -nox environment.
+ which need gd2 functionality in a -nox environment. It is not suitable
+ for "OR" dependencies with the standard gd2 (not -nox) package.
<<
License: OSI-Approved
Homepage: http://www.libgd.org/
------------------------------------------------------------------------------
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
