- up to 1.2.41

[packages/libpng.git] / libpng-opt.patch

diff --git a/libpng-opt.patch b/libpng-opt.patch
index 5a588181783219eaf9c9cf5311a7694d1f1c5dc2..b6f5e7b1cde5e8514235c3a19632ccdae225e2b4 100644 (file)
--- a/libpng-opt.patch
+++ b/libpng-opt.patch
@@ -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.31/scripts/makefile.gcmmx.orig  2008-08-21 12:54:14.000000000 +0200
++++ libpng-1.2.31/scripts/makefile.gcmmx       2008-08-23 01:23:37.018625344 +0200
+@@ -43,8 +43,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 @@
+@@ -58,8 +58,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_USE_PNGGCCRD -I$(ZLIBINC) -Wall \
+-CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -W -Wall -O \
+-      $(ALIGN) -funroll-loops \
++CFLAGS=-DPNG_USE_PNGGCCRC -I$(ZLIBINC) -W -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) -W -Wall -O \
+--- libpng-1.2.31/scripts/makefile.linux.orig  2008-08-21 12:54:14.000000000 +0200
++++ libpng-1.2.31/scripts/makefile.linux       2008-08-23 01:26:41.342625344 +0200
+@@ -35,8 +35,8 @@
+ # Where the zlib library and include files are located.
  #ZLIBLIB=/usr/local/lib
  #ZLIBINC=/usr/local/include
 -ZLIBLIB=../zlib
@@ -35,12 +35,12 @@
  
  ALIGN=
  # for i386:
-@@ -30,7 +30,7 @@
+@@ -48,7 +48,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 $(OPT_FLAGS) -funroll-loops \
+-CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
++CFLAGS=-I$(ZLIBINC) -W -Wall $(OPT_FLAGS) -DPNG_NO_MMX_CODE \
        $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
  
  LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm