X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=libpng-pngminus.patch;h=d929f9f5b7dbf9e02f78df6d11278060e6ca77a8;hb=refs%2Ftags%2Fauto%2Fth%2Fcrossmingw32-libpng-1.6.26-1;hp=09852ee2bdf0901fc9d0298796297b6264678b64;hpb=b62c16f174fcba6c0e2ba8609b59d0fad2f3edd3;p=packages%2Fcrossmingw32-libpng.git

diff --git a/libpng-pngminus.patch b/libpng-pngminus.patch
index 09852ee..d929f9f 100644
--- a/libpng-pngminus.patch
+++ b/libpng-pngminus.patch
@@ -1,27 +1,33 @@
-diff -urN libpng-1.2.1.org/contrib/pngminus/makefile.std libpng-1.2.1/contrib/pngminus/makefile.std
---- libpng-1.2.1.org/contrib/pngminus/makefile.std	Wed Mar 13 11:40:24 2002
-+++ libpng-1.2.1/contrib/pngminus/makefile.std	Wed Mar 13 11:46:05 2002
-@@ -19,13 +19,13 @@
+--- libpng-1.5.7/contrib/pngminus/makefile.std.orig	2011-12-15 16:45:32.000000000 +0100
++++ libpng-1.5.7/contrib/pngminus/makefile.std	2011-12-18 16:24:38.099367091 +0100
+@@ -12,21 +12,21 @@
+ #PNGLIB = -L$(PNGPATH)/lib -lpng16
+ #PNGLIBS = $(PNGPATH)/lib/libpng16.a
+ PNGINC = -I../..
+-PNGLIB = -L../.. -lpng
++PNGLIB = -L../.. -L../../.libs -lpng16
+ PNGLIBS = ../../libpng.a
+ 
+ #ZPATH = /usr/local
  #ZINC = -I$(ZPATH)/include
  #ZLIB = -L$(ZPATH)/lib -lz
  #ZLIBS = $(ZPATH)/lib/libz.a
 -ZINC = -I../../../zlib
 -ZLIB = -L../../../zlib -lz
 -ZLIBS = ../../../zlib/libz.a
-+ZINC = 
++ZINC =
 +ZLIB = -lz
 +ZLIBS = -lz
  
--CFLAGS=-O3 $(PNGINC) $(ZINC)
-+CFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC)
- LDFLAGS=$(PNGLIB) $(ZLIB)
--LDFLAGSS=$(PNGLIBS) $(ZLIBS)
-+LDFLAGSS=$(LD_FLAGS) $(PNGLIBS) $(ZLIBS)
+-CPPFLAGS=$(PNGINC) $(ZINC)
++CPPFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC)
+ CFLAGS=
+ LDLIBS=$(PNGLIB) $(ZLIB)
+-LDLIBSS=$(PNGLIBS) $(ZLIBS)
++LDLIBSS=$(LD_FLAGS) $(PNGLIBS) $(ZLIBS)
  C=.c
  O=.o
  L=.a
---- libpng-1.2.10/contrib/pngminus/makefile.std.orig	2006-05-01 17:54:46.000000000 +0200
-+++ libpng-1.2.10/contrib/pngminus/makefile.std	2006-05-01 17:56:33.000000000 +0200
 @@ -33,8 +33,7 @@
  
  # dependencies