- outdated

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

diff --git a/libpng-opt.patch b/libpng-opt.patch
index c34d7e959a1b615c049d7c62bb8e2a019812463d..954a595f288a63708f78cad93f26c60ad225482b 100644 (file)
--- a/libpng-opt.patch
+++ b/libpng-opt.patch
@@ -1,8 +1,7 @@
-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
+--- 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
@@ -12,20 +11,21 @@ diff -urN libpng-1.0.9.org/scripts/makefile.gcmmx libpng-1.0.9/scripts/makefile.
  
  ALIGN=
  # for i386:
-@@ -31,7 +31,7 @@
- # for pgcc version 2.95.1, -O3 is buggy; don't use it.
+@@ -60,8 +60,8 @@
  
+ # Remove -DPNG_THREAD_UNSAFE_OK if you need thread safety
  ### 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 \
+-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_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
+ #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,12 +35,12 @@ diff -urN libpng-1.0.9.org/scripts/makefile.linux libpng-1.0.9/scripts/makefile.
  
  ALIGN=
  # for i386:
-@@ -24,7 +24,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
- LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
  
+ LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm