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 d8be5969aa3d74491cf368ce0541c69dbafcc4b4..385e1d7c35d3b510782f0c11742c1ee0a7c55db7 100644 (file)
--- a/libpng-pngminus.patch
+++ b/libpng-pngminus.patch
@@ -1,72 +1,33 @@
---- 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 =
-+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
  
--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
-@@ -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)
- 
- png2pnm$(O): png2pnm$(C)
-       $(CC) -c $(CFLAGS) png2pnm$(C)
---- libpng-1.6.32/contrib/pngminus/pnm2png.c~  2017-08-24 21:44:51.000000000 +0200
-+++ libpng-1.6.32/contrib/pngminus/pnm2png.c   2017-10-22 11:21:14.284686698 +0200
-@@ -376,7 +376,7 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_
-   /* row_bytes is the width x number of channels x (bit-depth / 8) */
-     row_bytes = width * channels * ((bit_depth <= 8) ? 1 : 2);
- 
--  if ((row_bytes == 0 || (size_t)height > ((size_t)(-1))/(size_t)row_bytes)
-+  if ((row_bytes == 0 || (size_t)height > ((size_t)(-1))/(size_t)row_bytes))
-   {
-     /* too big */ 
-     return FALSE;
---- libpng-1.6.32/contrib/pngminus/png2pnm.c~  2017-08-24 21:44:51.000000000 +0200
-+++ libpng-1.6.32/contrib/pngminus/png2pnm.c   2017-10-22 11:25:16.018590786 +0200
-@@ -443,7 +443,7 @@ BOOL png2pnm (FILE *png_file, FILE *pnm_
-   if (png_pixels != (unsigned char*) NULL)
-     free (png_pixels);
- 
--  PNG_UNUSED(raw) /* to quiet a Coverity defect */
-+  
-   return TRUE;
- 
- } /* end of source */
---- libpng-1.6.32/contrib/pngminus/pnm2png.c~  2017-10-22 11:26:20.000000000 +0200
-+++ libpng-1.6.32/contrib/pngminus/pnm2png.c   2017-10-22 11:26:43.537683599 +0200
-@@ -513,7 +513,6 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_
-   if (png_pixels != (unsigned char*) NULL)
-     free (png_pixels);
- 
--  PNG_UNUSED(raw) /* Quiet a Coverity defect */
+-all: png2pnm$(EXEEXT) pnm2png$(EXEEXT) png2pnm-static$(EXEEXT) pnm2png-static$(EXEEXT)
++all: png2pnm$(EXEEXT) pnm2png$(EXEEXT)
  
-   return TRUE;
- } /* end of pnm2png */
+ png2pnm.o: png2pnm.c
+       $(CC) -c $(CPPFLAGS) $(CFLAGS) png2pnm.c