SOURCES: libpng-opt.patch - adapted for 1.2.19 version

[lisu]

Author: lisu                         Date: Sun Aug 19 09:43:11 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adapted for 1.2.19 version

---- Files affected:
SOURCES:
   libpng-opt.patch (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SOURCES/libpng-opt.patch
diff -u SOURCES/libpng-opt.patch:1.9 SOURCES/libpng-opt.patch:1.10
--- SOURCES/libpng-opt.patch:1.9	Tue Nov 11 20:04:34 2003
+++ SOURCES/libpng-opt.patch	Sun Aug 19 11:43:06 2007
@@ -1,7 +1,7 @@
---- libpng-1.2.2/scripts/makefile.gcmmx.wiget	Mon Apr 15 16:25:45 2002
-+++ libpng-1.2.2/scripts/makefile.gcmmx	Tue Apr 16 15:54:12 2002
-@@ -27,8 +27,8 @@
- # Where the zlib library and include files are located
+--- libpng-1.2.19/scripts/makefile.gcmmx~	2007-08-18 12:33:48.000000000 +0200
++++ libpng-1.2.19/scripts/makefile.gcmmx	2007-08-19 00:46:42.000000000 +0200
+@@ -45,8 +45,8 @@
+ # Where the zlib library and include files are located.
  #ZLIBLIB=/usr/local/lib
  #ZLIBINC=/usr/local/include
 -ZLIBLIB=../zlib
@@ -11,21 +11,21 @@
  
  ALIGN=
  # for i386:
-@@ -42,8 +42,8 @@
+@@ -60,8 +60,8 @@
  
  # Remove -DPNG_THREAD_UNSAFE_OK if you need thread safety
  ### for generic gcc:
--CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall \
--	-O3 $(ALIGN) -funroll-loops \
+-CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -Wall -O \
+-	$(ALIGN) -funroll-loops \
 +CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall \
 +	$(OPT_FLAGS) $(ALIGN) \
  	-fomit-frame-pointer  # $(WARNMORE) -g -DPNG_DEBUG=5
  ### for gcc 2.95.2 on 686:
- #CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 \
---- libpng-1.2.2/scripts/makefile.linux.wiget	Mon Apr 15 16:25:46 2002
-+++ libpng-1.2.2/scripts/makefile.linux	Tue Apr 16 15:48:37 2002
-@@ -17,8 +17,8 @@
- # Where the zlib library and include files are located
+ #CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -Wall -O \
+--- libpng-1.2.19/scripts/makefile.linux~	2007-08-18 12:33:48.000000000 +0200
++++ libpng-1.2.19/scripts/makefile.linux	2007-08-19 00:49:15.000000000 +0200
+@@ -34,8 +34,8 @@
+ # Where the zlib library and include files are located.
  #ZLIBLIB=/usr/local/lib
  #ZLIBINC=/usr/local/include
 -ZLIBLIB=../zlib
@@ -35,11 +35,11 @@
  
  ALIGN=
  # for i386:
-@@ -30,7 +30,7 @@
+@@ -47,7 +47,7 @@
  
  # for pgcc version 2.95.1, -O3 is buggy; don't use it.
  
--CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
+-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
 +CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops \
  	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/libpng-opt.patch?r1=1.9&r2=1.10&f=u