don't try to enable neon on anything lower than armv7

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

diff --git a/libpng-pngminus.patch b/libpng-pngminus.patch
index 09852ee2bdf0901fc9d0298796297b6264678b64..385e1d7c35d3b510782f0c11742c1ee0a7c55db7 100644 (file)
--- a/libpng-pngminus.patch
+++ b/libpng-pngminus.patch
@@ -1,34 +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 @@
- #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 = 
-+ZLIB = -lz
-+ZLIBS = -lz
+--- libpng-1.6.37/contrib/pngminus/Makefile~   2019-04-14 20:10:32.000000000 +0200
++++ libpng-1.6.37/contrib/pngminus/Makefile    2019-04-23 09:25:47.422459927 +0200
+@@ -8,7 +8,7 @@
+ RM = rm -f
  
--CFLAGS=-O3 $(PNGINC) $(ZINC)
-+CFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC)
- LDFLAGS=$(PNGLIB) $(ZLIB)
--LDFLAGSS=$(PNGLIBS) $(ZLIBS)
-+LDFLAGSS=$(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 @@
+ PNGINC = -I../..
+-PNGLIB_SHARED = -L../.. -lpng
++PNGLIB_SHARED = -L../.. -L../../.libs/ -lpng16
+ PNGLIB_STATIC = ../../libpng.a
+ 
+ # Uncomment the following if you have a custom zlib build at ../../../zlib
+@@ -20,10 +20,10 @@
+ ZLIB_SHARED = -lz
+ ZLIB_STATIC = -lz
+ 
+-CPPFLAGS = $(PNGINC) $(ZINC)
++CPPFLAGS = $(OPT_FLAGS) $(PNGINC) $(ZINC)
+ CFLAGS =
+ LDFLAGS =
+-LIBS_SHARED = $(PNGLIB_SHARED) $(ZLIB_SHARED)
++LIBS_SHARED = $(LD_FLAGS) $(PNGLIB_SHARED) $(ZLIB_SHARED)
+ LIBS_STATIC = $(PNGLIB_STATIC) $(ZLIB_STATIC)
+ 
+ EXEEXT =
+@@ -31,7 +31,7 @@
  
  # dependencies
  
--#all: png2pnm$(E) pnm2png$(E)
--all: png2pnm$(E) pnm2png$(E) png2pnm-static$(E) pnm2png-static$(E)
-+all: png2pnm$(E) pnm2png$(E)
+-all: png2pnm$(EXEEXT) pnm2png$(EXEEXT) png2pnm-static$(EXEEXT) pnm2png-static$(EXEEXT)
++all: png2pnm$(EXEEXT) pnm2png$(EXEEXT)
  
- png2pnm$(O): png2pnm$(C)
-       $(CC) -c $(CFLAGS) png2pnm$(C)
+ png2pnm.o: png2pnm.c
+       $(CC) -c $(CPPFLAGS) $(CFLAGS) png2pnm.c