- adapted for 1.2.21 version

Changed files:
    libpng-norpath.patch -> 1.4

diff --git a/libpng-norpath.patch b/libpng-norpath.patch
index fb7021c12a08e65a1b028a3f4450b672ca9f1bb7..0e2ca34bc9b51d65a418dd830b228ffafed5043a 100644 (file)
--- a/libpng-norpath.patch
+++ b/libpng-norpath.patch
@@ -1,6 +1,6 @@
---- libpng-1.2.9/scripts/makefile.gcmmx.orig   2006-04-17 01:12:53.813611500 +0200
-+++ libpng-1.2.9/scripts/makefile.gcmmx        2006-04-17 01:13:47.872990000 +0200
-@@ -72,8 +72,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 
  
@@ -11,16 +11,16 @@
  
  
  INCPATH=$(prefix)/include
-@@ -122,7 +122,7 @@
+@@ -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
-@@ -239,7 +239,6 @@
+@@ -238,7 +238,6 @@
  test-installed:
        $(CC) -I$(ZLIBINC) \
           `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
@@ -28,8 +28,8 @@
           -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
        ./pngtesti pngtest.png
  
---- libpng-1.2.9/scripts/makefile.linux.orig   2006-04-17 01:12:53.813611500 +0200
-+++ libpng-1.2.9/scripts/makefile.linux        2006-04-17 01:14:15.322705500 +0200
+--- 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
@@ -41,7 +41,7 @@
  
  INCPATH=$(prefix)/include
  LIBPATH=$(exec_prefix)/lib
-@@ -98,7 +98,7 @@
+@@ -102,7 +102,7 @@
        echo prefix=\"$(prefix)\"; \
        echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
        echo L_opts=\"-L$(LIBPATH)\"; \
@@ -50,7 +50,7 @@
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
-@@ -207,7 +207,6 @@
+@@ -214,7 +214,6 @@
  test-installed:
        $(CC) -I$(ZLIBINC) \
           `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \