4e4f5a75058b97ffa9373b4b5ca38ea4 libpng-1.0.9.tar.gz

Changed files:
    libpng-opt.patch -> 1.5

diff --git a/libpng-opt.patch b/libpng-opt.patch
index 61452059f80746da8657f93dcef10cc3f0ff7050..c34d7e959a1b615c049d7c62bb8e2a019812463d 100644 (file)
--- a/libpng-opt.patch
+++ b/libpng-opt.patch
@@ -1,7 +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 @@
+diff -urN libpng-1.0.9.org/scripts/makefile.gcmmx libpng-1.0.9/scripts/makefile.gcmmx
+--- libpng-1.0.9.org/scripts/makefile.gcmmx    Thu Feb  1 15:22:46 2001
++++ libpng-1.0.9/scripts/makefile.gcmmx        Thu Feb  1 15:26:38 2001
+@@ -17,8 +17,8 @@
  # Where the zlib library and include files are located
  #ZLIBLIB=/usr/local/lib
  #ZLIBINC=/usr/local/include
@@ -12,20 +12,19 @@ diff -Nru libpng-1.0.5/scripts/makefile.linux libpng-1.0.5.new/scripts/makefile.
  
  ALIGN=
  # for i386:
-@@ -24,8 +24,8 @@
- 
- # for pgcc version 2.95.1, -O3 is buggy; don't us it.
- 
--CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
--      $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
-+CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops \
-+      $(ALIGN) # $(WARNMORE) -DPNG_DEBUG=5
- LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
+@@ -31,7 +31,7 @@
+ # for pgcc version 2.95.1, -O3 is buggy; don't use it.
  
- RANLIB=ranlib
---- libpng-1.0.8/scripts/makefile.gcmmx.old    Mon Jul 24 13:34:14 2000
-+++ libpng-1.0.8/scripts/makefile.gcmmx        Wed Nov  1 13:29:17 2000
-@@ -13,8 +13,8 @@
+ ### for generic gcc:
+-CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \
++CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall $(OPT_FLAGS) $(ALIGN) -funroll-loops \
+       -fomit-frame-pointer  # $(WARNMORE) -g -DPNG_DEBUG=5
+ ### for gcc 2.95.2 on 686:
+ #CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 \
+diff -urN libpng-1.0.9.org/scripts/makefile.linux libpng-1.0.9/scripts/makefile.linux
+--- libpng-1.0.9.org/scripts/makefile.linux    Thu Feb  1 15:22:46 2001
++++ libpng-1.0.9/scripts/makefile.linux        Thu Feb  1 15:25:49 2001
+@@ -11,8 +11,8 @@
  # Where the zlib library and include files are located
  #ZLIBLIB=/usr/local/lib
  #ZLIBINC=/usr/local/include
@@ -36,13 +35,12 @@ diff -Nru libpng-1.0.5/scripts/makefile.linux libpng-1.0.5.new/scripts/makefile.
  
  ALIGN=
  # for i386:
-@@ -26,8 +26,7 @@
+@@ -24,7 +24,7 @@
  
  # for pgcc version 2.95.1, -O3 is buggy; don't use it.
  
--CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \
--        -fomit-frame-pointer  # $(WARNMORE) -g -DPNG_DEBUG=5
-+CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall $(OPT_FLAGS) $(ALIGN) -funroll-loops 
+-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
++CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops \
+       $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
  LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
  
- RANLIB=ranlib