Contribs - libpng: Updates to 1.2.20. No more MMX optimisations, a few bugs are fixed.

diff --git a/extras/contrib/src/Patches/libpng-osx.patch b/extras/contrib/src/Patches/libpng-osx.patch
index e4a973d8cafaeddf5b7352d470b9e759959493cb..f85f06587e75bcb7c7a21b2e20e9a2fbb9e3ef32 100644 (file)
--- a/extras/contrib/src/Patches/libpng-osx.patch
+++ b/extras/contrib/src/Patches/libpng-osx.patch
@@ -1,6 +1,6 @@
-diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
---- libpng-1.2.12/scripts/makefile.darwin      2006-06-27 22:22:40.000000000 +0200
-+++ libpng/scripts/makefile.darwin     2006-12-08 18:15:36.000000000 +0100
+diff -ruN libpng-1.2.20/scripts/makefile.darwin libpng/scripts/makefile.darwin
+--- libpng-1.2.20/scripts/makefile.darwin      2007-09-08 05:23:01.000000000 +0200
++++ libpng/scripts/makefile.darwin     2007-09-23 15:31:21.000000000 +0200
 @@ -7,14 +7,14 @@
  # For conditions of distribution and use, see copyright notice in png.h
  
@@ -21,18 +21,18 @@ diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
  
  # Library name:
  LIBNAME = libpng12
-@@ -38,8 +38,8 @@
- RANLIB=ranlib
+@@ -39,8 +39,8 @@
  RM_F=/bin/rm -f
  
--CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops
+ # CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
+-CFLAGS=-I$(ZLIBINC) -Wall -O -funroll-loops
 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
 +CFLAGS=??EXTRA_CFLAGS?? -I$(ZLIBINC) -Wall -O3 -funroll-loops
 +LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng12 -lz
  
  INCPATH=$(prefix)/include
  LIBPATH=$(exec_prefix)/lib
-@@ -72,7 +72,7 @@
+@@ -73,7 +73,7 @@
  .c.pic.o:
        $(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
  
@@ -41,7 +41,7 @@ diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
  
  libpng.a: $(OBJS)
        $(AR_RC) $@ $(OBJS)
-@@ -178,7 +178,7 @@
+@@ -179,7 +179,7 @@
        chmod 755 $(DB)/$(LIBNAME)-config
        (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
  

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 25ef479a84b02777ff12c9327c08f5395888bdd0..df8d523a575e6b4ceec90782c5aefa5453d90334 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -122,7 +122,7 @@ VCDIMAGER_VERSION=0.7.23
 VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz
 CDIO_VERSION=0.78.2
 CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
-PNG_VERSION=1.2.18
+PNG_VERSION=1.2.20
 PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
 GPGERROR_VERSION=1.5
 GPGERROR_URL=http://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2