- up to 1.2.41

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

diff --git a/libpng-opt.patch b/libpng-opt.patch
index 392206a09b39428621579ac9b963bd6b362304a8..b6f5e7b1cde5e8514235c3a19632ccdae225e2b4 100644 (file)
--- a/libpng-opt.patch
+++ b/libpng-opt.patch
@@ -1,8 +1,7 @@
-diff -Nru libpng-1.0.5/scripts/makefile.linux libpng-1.0.5.new/scripts/makefile.linux
---- libpng-1.0.5/scripts/makefile.linux        Thu Oct 14 14:43:10 1999
-+++ libpng-1.0.5.new/scripts/makefile.linux    Sun Oct 17 23:10:19 1999
-@@ -11,8 +11,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
@@ -12,14 +11,36 @@ diff -Nru libpng-1.0.5/scripts/makefile.linux libpng-1.0.5.new/scripts/makefile.
  
  ALIGN=
  # for i386:
-@@ -24,8 +24,8 @@
+@@ -58,8 +58,8 @@
  
- # for pgcc version 2.95.1, -O3 is buggy; don't us it.
+ # Remove -DPNG_THREAD_UNSAFE_OK if you need thread safety
+ ### for generic gcc:
+-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 -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
+-ZLIBINC=../zlib
++ZLIBLIB=/usr/lib
++ZLIBINC=
+ 
+ ALIGN=
+ # for i386:
+@@ -48,7 +48,7 @@
+ 
+ # for pgcc version 2.95.1, -O3 is buggy; don't use it.
  
--CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
--      $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
-+CFLAGS=-I$(ZLIBINC) -Wall $(RPM_OPT_FLAGS) -funroll-loops \
-+      $(ALIGN) # $(WARNMORE) -DPNG_DEBUG=5
- LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
+-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
  
- RANLIB=ranlib
+ LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm