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 a5c26b63d1c28273e2de82fc21528af0436bab81..385e1d7c35d3b510782f0c11742c1ee0a7c55db7 100644 (file)
--- a/libpng-pngminus.patch
+++ b/libpng-pngminus.patch
@@ -1,26 +1,33 @@
---- libpng-1.0.8/contrib/pngminus/makefile.std.old     Sat Nov 27 13:41:26 1999
-+++ libpng-1.0.8/contrib/pngminus/makefile.std Wed Nov  1 13:05:06 2000
-@@ -9,18 +9,18 @@
- RM=rm
- CP=cp
+--- 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
  
--PNGPATH = /usr/local
-+PNGPATH = ../..
- PNGINC = $(PNGPATH)/include
--#PNGLIB = $(PNGPATH)/lib -lpng
--PNGLIB = $(PNGPATH)/lib/libpng.a
-+PNGLIB = $(PNGPATH)/ -lpng
-+#PNGLIB = $(PNGPATH)/lib/libpng.a
+ PNGINC = -I../..
+-PNGLIB_SHARED = -L../.. -lpng
++PNGLIB_SHARED = -L../.. -L../../.libs/ -lpng16
+ PNGLIB_STATIC = ../../libpng.a
  
- ZPATH = /usr/local
- ZINC = $(ZPATH)/include
- #ZLIB = $(ZPATH)/lib -lz
- ZLIB = $(ZPATH)/lib/libz.a
+ # Uncomment the following if you have a custom zlib build at ../../../zlib
+@@ -20,10 +20,10 @@
+ ZLIB_SHARED = -lz
+ ZLIB_STATIC = -lz
  
--CCFLAGS=-I$(PNGINC) -I$(ZINC)
--LDFLAGS=-L$(PNGLIB) -L$(ZLIB)
-+CCFLAGS=$(RPM_OPT_FLAGS) -I$(PNGINC)
-+LDFLAGS= -s -L$(PNGLIB)
- C=.c
- O=.o
- L=.a
+-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$(EXEEXT) pnm2png$(EXEEXT) png2pnm-static$(EXEEXT) pnm2png-static$(EXEEXT)
++all: png2pnm$(EXEEXT) pnm2png$(EXEEXT)
+ 
+ png2pnm.o: png2pnm.c
+       $(CC) -c $(CPPFLAGS) $(CFLAGS) png2pnm.c