diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-07-23 08:40:39 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-07-23 08:40:39 +0000 |
commit | afeeae15600d459b44db97c574fb2d0249689b9d (patch) | |
tree | 3459c40152e21088c2dedcc69cd6332809fe712a /Build | |
parent | c4bce815cd1209f4585de8949555b208809a5731 (diff) |
new directory libs/libpng/libpng-x.y.z-PATCHES/ with patch(es)
git-svn-id: svn://tug.org/texlive/trunk@14398 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/libs/libpng/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/libs/libpng/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/libs/libpng/Makefile.in | 2 | ||||
-rw-r--r-- | Build/source/libs/libpng/README | 7 | ||||
-rw-r--r-- | Build/source/libs/libpng/libpng-1.2.38-PATCHES/ChangeLog | 10 | ||||
-rw-r--r-- | Build/source/libs/libpng/libpng-1.2.38-PATCHES/patch-01-static | 12 |
6 files changed, 38 insertions, 3 deletions
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog index bd06702047c..cc85e7fe81c 100644 --- a/Build/source/libs/libpng/ChangeLog +++ b/Build/source/libs/libpng/ChangeLog @@ -1,3 +1,9 @@ +2009-07-23 Peter Breitenlohner <peb@mppmu.mpg.de> + + * libpng-1.2.38-PATCHES: New directory to hold patches, if any, + applied to the distributed source tree. + * Makefile.am: Adjust. + 2009-07-17 Peter Breitenlohner <peb@mppmu.mpg.de> Import libpng-1.2.38. diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am index 6a249f92b5f..90db63ece24 100644 --- a/Build/source/libs/libpng/Makefile.am +++ b/Build/source/libs/libpng/Makefile.am @@ -15,6 +15,10 @@ ACLOCAL_AMFLAGS = -I ../../m4 ## Thus nodist_* for all files in $(LIBPNG_TREE). EXTRA_DIST = $(LIBPNG_TREE) +## Patches applied to the original source tree +## +EXTRA_DIST += $(LIBPNG_TREE)-PATCHES + # in case of an SVN repository dist-hook: rm -rf `find $(distdir)/$(LIBPNG_TREE) -name .svn` diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in index cf94b428574..bac8fbfa629 100644 --- a/Build/source/libs/libpng/Makefile.in +++ b/Build/source/libs/libpng/Makefile.in @@ -199,7 +199,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = $(LIBPNG_TREE) +EXTRA_DIST = $(LIBPNG_TREE) $(LIBPNG_TREE)-PATCHES INCLUDES = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) AM_CPPFLAGS = $(LIBPNG_DEFINES) AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/libs/libpng/README b/Build/source/libs/libpng/README index dc8d6edc3f6..ace3e93c773 100644 --- a/Build/source/libs/libpng/README +++ b/Build/source/libs/libpng/README @@ -2,12 +2,15 @@ ============================================= This directory libs/libpng/ uses a proxy Makefile.am to build the libpng library -from the unmodified source tree in libs/libpng/libpng-x.y.z/, bypassing +from the unmodified (*) source tree in libs/libpng/libpng-x.y.z/, bypassing the original build system. +(*) The directory libpng-x.y.z-PATCHES contains patches (if any) applied to +the original source tree. + As far as applicable, the tests in libs/libpng-x.y.z/configure.ac have been copied to libs/libpng/configure.ac. ============================= -2009-01-31 Peter Breitenlohner <peb@mppmu.mpg.de> +2009-07-23 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/libs/libpng/libpng-1.2.38-PATCHES/ChangeLog b/Build/source/libs/libpng/libpng-1.2.38-PATCHES/ChangeLog new file mode 100644 index 00000000000..e33fa4c4fe6 --- /dev/null +++ b/Build/source/libs/libpng/libpng-1.2.38-PATCHES/ChangeLog @@ -0,0 +1,10 @@ +2009-07-17 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-01-static: Adjust for libpng-1.2.38. + +2009-06-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + Create patch-01-static: + * libpng-1.2.37/png.c (png_64bit_product): declare as static to + avoid compiler warning. + diff --git a/Build/source/libs/libpng/libpng-1.2.38-PATCHES/patch-01-static b/Build/source/libs/libpng/libpng-1.2.38-PATCHES/patch-01-static new file mode 100644 index 00000000000..f0a83ec1aca --- /dev/null +++ b/Build/source/libs/libpng/libpng-1.2.38-PATCHES/patch-01-static @@ -0,0 +1,12 @@ +diff -ur libpng-1.2.38.orig/png.c libpng-1.2.38/png.c +--- libpng-1.2.38.orig/png.c 2009-07-16 12:58:31.000000000 +0200 ++++ libpng-1.2.38/png.c 2009-07-17 12:11:51.000000000 +0200 +@@ -828,7 +828,7 @@ + * A and D, and X || Y is (X << 16) + Y. + */ + +-void png_64bit_product (long v1, long v2, unsigned long *hi_product, ++static void png_64bit_product (long v1, long v2, unsigned long *hi_product, + unsigned long *lo_product) + { + int a, b, c, d; |