- APNG provides for consistency with native libpng

[packages/crossmingw32-libpng.git] / libpng-norpath.patch

diff --git a/libpng-norpath.patch b/libpng-norpath.patch
index 8f50ef28aa0cebbb1c8e680589002bcacc549c79..0e2ca34bc9b51d65a418dd830b228ffafed5043a 100644 (file)
--- a/libpng-norpath.patch
+++ b/libpng-norpath.patch
@@ -1,48 +1,47 @@
---- libpng-1.2.5/scripts/makefile.gcmmx.orig   2003-04-21 02:18:40.000000000 +0200
-+++ libpng-1.2.5/scripts/makefile.gcmmx        2003-04-21 02:32:00.000000000 +0200
-@@ -55,8 +55,8 @@
+--- libpng-1.2.21/scripts/makefile.gcmmx~      2007-10-08 19:52:12.000000000 +0200
++++ libpng-1.2.21/scripts/makefile.gcmmx       2007-10-08 19:55:00.000000000 +0200
+@@ -70,8 +70,8 @@
  #     -m486 -malign-double -ffast-math \
  #     $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer 
  
 -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
 -LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-+LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
-+LDFLAGS_A=-L$(ZLIBLIB) libpng.a -lz -lm
++LDFLAGS=-L. -lpng12 -lz -lm
++LDFLAGS_A=libpng.a -lz -lm
  
- RANLIB=ranlib
- #RANLIB=echo
-@@ -107,7 +107,7 @@
+ 
+ INCPATH=$(prefix)/include
+@@ -124,7 +124,7 @@
        echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cppflags=\"-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD\"; \
+       echo cppflags=\"-DPNG_THREAD_UNSAFE_OK \"; \
        echo L_opts=\"-L$(LIBPATH)\"; \
 -      echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
 +      echo R_opts=\"\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
-@@ -213,7 +213,7 @@
+@@ -238,7 +238,6 @@
  test-installed:
        $(CC) -I$(ZLIBINC) \
-          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
 -         -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-+         -L$(ZLIBLIB) \
-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
+          -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
        ./pngtesti pngtest.png
  
---- libpng-1.2.5/scripts/makefile.linux.orig   2003-04-21 02:18:40.000000000 +0200
-+++ libpng-1.2.5/scripts/makefile.linux        2003-04-21 02:32:24.000000000 +0200
-@@ -34,8 +34,8 @@
+--- libpng-1.2.21/scripts/makefile.linux~      2007-10-08 19:52:12.000000000 +0200
++++ libpng-1.2.21/scripts/makefile.linux       2007-10-08 19:56:43.000000000 +0200
+@@ -50,8 +50,8 @@
  CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops \
        $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
  
 -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
 -LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-+LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
-+LDFLAGS_A=-L$(ZLIBLIB) libpng.a -lz -lm
++LDFLAGS=-L. -lpng12 -lz -lm
++LDFLAGS_A=libpng.a -lz -lm
  
- RANLIB=ranlib
- #RANLIB=echo
-@@ -85,7 +85,7 @@
+ INCPATH=$(prefix)/include
+ LIBPATH=$(exec_prefix)/lib
+@@ -102,7 +102,7 @@
        echo prefix=\"$(prefix)\"; \
        echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
        echo L_opts=\"-L$(LIBPATH)\"; \
@@ -51,12 +50,11 @@
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
-@@ -185,7 +185,7 @@
+@@ -214,7 +214,6 @@
  test-installed:
        $(CC) -I$(ZLIBINC) \
-          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
 -         -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-+         -L$(ZLIBLIB) \
-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
+          -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
        ./pngtesti pngtest.png