diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-04-27 17:03:40 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-04-27 17:04:44 +0200 |
| commit | 9840bcba8f5bc647a6bb860a3e6fbbb80156d444 (patch) | |
| tree | 4d0ab35906d4605698d40c3ee226580499879f52 /libpng | |
| parent | 2d0ff6aa5d6951aaa00e2d6cf3878788b025983e (diff) | |
Upgrading libpng
Change-Id: I0a87cdc3e0d9db5b4375c27ba240fefb933a82c6
Diffstat (limited to 'libpng')
| -rw-r--r-- | libpng/libpng-1.5.10.patch (renamed from libpng/libpng-1.5.1.patch) | 49 | ||||
| -rw-r--r-- | libpng/makefile.mk | 4 |
2 files changed, 19 insertions, 34 deletions
diff --git a/libpng/libpng-1.5.1.patch b/libpng/libpng-1.5.10.patch index ebae94ac000a..db3105db1b7f 100644 --- a/libpng/libpng-1.5.1.patch +++ b/libpng/libpng-1.5.10.patch @@ -1,6 +1,6 @@ ---- misc/libpng-1.5.1/makefile.mk 2011-03-24 21:49:50.911397154 +0100 -+++ misc/build/libpng-1.5.1/makefile.mk 2011-03-24 21:47:23.379397048 +0100 -@@ -1 +1,49 @@ +--- misc/libpng-1.5.10/makefile.mk 2011-03-24 21:49:50.911397154 +0100 ++++ misc/build/libpng-1.5.10/makefile.mk 2011-03-24 21:47:23.379397048 +0100 +@@ -1 +1,48 @@ -dummy +#************************************************************************* +# @@ -39,7 +39,6 @@ + $(SLO)$/pngset.obj \ + $(SLO)$/pngtest.obj \ + $(SLO)$/pngtrans.obj \ -+ $(SLO)$/pngvalid.obj \ + $(SLO)$/pngwio.obj \ + $(SLO)$/pngwrite.obj \ + $(SLO)$/pngwtran.obj \ @@ -51,9 +50,9 @@ + +.INCLUDE : target.mk + ---- misc/libpng-1.5.1/pnglibconf.h 2011-03-24 21:49:50.913397154 +0100 -+++ misc/build/libpng-1.5.1/pnglibconf.h 2011-03-24 21:47:23.380397048 +0100 -@@ -1 +1,176 @@ +--- misc/libpng-1.5.10/pnglibconf.h 2011-03-24 21:49:50.913397154 +0100 ++++ misc/build/libpng-1.5.10/pnglibconf.h 2011-03-24 21:47:23.380397048 +0100 +@@ -1 +1,177 @@ -dummy + +/* libpng STANDARD API DEFINITION */ @@ -229,10 +228,11 @@ +#define PNG_tEXt_SUPPORTED +#define PNG_zTXt_SUPPORTED +#define PNG_iTXt_SUPPORTED ++#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED +/* end of options */ +#endif /* PNGLCONF_H */ ---- misc/libpng-1.5.1/pngstruct.h 2011-02-03 05:58:17.000000000 +0100 -+++ misc/build/libpng-1.5.1/pngstruct.h 2011-03-24 21:47:23.380397048 +0100 +--- misc/libpng-1.5.10/pngstruct.h 2011-02-03 05:58:17.000000000 +0100 ++++ misc/build/libpng-1.5.10/pngstruct.h 2011-03-24 21:47:23.380397048 +0100 @@ -24,7 +24,15 @@ * in this structure and is required for decompressing the LZ compressed * data in PNG files. @@ -241,7 +241,7 @@ + * internal zlib, not on OS... But yeah, so maybe MacOSX, iOS and Android are the only OSes for which + * we use a system zlib but internal libpng, at least by default. + */ -+#if defined MACOSX || defined IOS || defined ANDROID ++#if defined MACOSX || defined IOS || defined ANDROID || defined LINUX #include "zlib.h" +#else +#include <external/zlib/zlib.h> @@ -249,13 +249,13 @@ struct png_struct_def { ---- misc/libpng-1.5.1/pngtest.c 2011-02-03 05:58:17.000000000 +0100 -+++ misc/build/libpng-1.5.1/pngtest.c 2011-03-24 21:47:23.380397048 +0100 -@@ -31,7 +31,12 @@ - * of files at once by typing "pngtest -m file1.png file2.png ..." - */ - -+#if defined MACOSX || defined IOS || defined ANDROID +--- misc/libpng-1.5.10/pngtest.c 2011-02-03 05:58:17.000000000 +0100 ++++ misc/build/libpng-1.5.10/pngtest.c 2011-03-24 21:47:23.380397048 +0100 +@@ -33,7 +33,12 @@ + + #define _POSIX_SOURCE 1 + ++#if defined MACOSX || defined IOS || defined ANDROID || defined LINUX #include "zlib.h" +#else +#include <external/zlib/zlib.h> @@ -264,18 +264,3 @@ #include "png.h" /* Copied from pngpriv.h but only used in error messages below. */ #ifndef PNG_ZBUF_SIZE ---- misc/libpng-1.5.1/pngvalid.c 2011-02-03 05:58:17.000000000 +0100 -+++ misc/build/libpng-1.5.1/pngvalid.c 2011-03-24 21:47:23.381397048 +0100 -@@ -51,7 +51,11 @@ - #define PNG_READ_16BIT_SUPPORTED - #endif - --#include "zlib.h" /* For crc32 */ -+#if defined MACOSX || defined IOS || defined ANDROID -+#include "zlib.h" -+#else -+#include <external/zlib/zlib.h> -+#endif - - #include <float.h> /* For floating point constants */ - #include <stdlib.h> /* For malloc */ diff --git a/libpng/makefile.mk b/libpng/makefile.mk index f40e3a72921c..100b9bbbdeb3 100644 --- a/libpng/makefile.mk +++ b/libpng/makefile.mk @@ -42,10 +42,10 @@ all: # --- Files -------------------------------------------------------- -LIBPNGVERSION=1.5.1 +LIBPNGVERSION=1.5.10 TARFILE_NAME=$(PRJNAME)-$(LIBPNGVERSION) -TARFILE_MD5=220035f111ea045a51e290906025e8b5 +TARFILE_MD5=9e5d864bce8f06751bbd99962ecf4aad PATCH_FILES=$(PRJNAME)-$(LIBPNGVERSION).patch ADDITIONAL_FILES=makefile.mk pnglibconf.h |