diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-12-03 18:00:03 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-12-03 18:03:15 +0100 |
| commit | 05dc60908915b986629abcda160557c811412821 (patch) | |
| tree | 37e33b322ca7f135fc95090febf307bd436a5026 | |
| parent | 79765c99d12f9ce33091f179c881dffb824fd1a2 (diff) | |
| download | ptxdist-05dc60908915b986629abcda160557c811412821.tar.gz ptxdist-05dc60908915b986629abcda160557c811412821.tar.xz | |
[libpng] version bump to 1.2.41
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | patches/libpng-1.2.39/series | 1 | ||||
| -rw-r--r-- | patches/libpng-1.2.41/libpng_config_sysroot.diff (renamed from patches/libpng-1.2.39/libpng_config_sysroot.diff) | 10 | ||||
| -rw-r--r-- | patches/libpng-1.2.41/series | 1 | ||||
| -rw-r--r-- | rules/libpng.make | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/patches/libpng-1.2.39/series b/patches/libpng-1.2.39/series deleted file mode 100644 index 20e9e5ee9..000000000 --- a/patches/libpng-1.2.39/series +++ /dev/null @@ -1 +0,0 @@ -libpng_config_sysroot.diff -p0 diff --git a/patches/libpng-1.2.39/libpng_config_sysroot.diff b/patches/libpng-1.2.41/libpng_config_sysroot.diff index b1d1d2672..7cf1cd8ed 100644 --- a/patches/libpng-1.2.39/libpng_config_sysroot.diff +++ b/patches/libpng-1.2.41/libpng_config_sysroot.diff @@ -7,11 +7,11 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> scripts/libpng-config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: scripts/libpng-config.in +Index: libpng-1.2.41/scripts/libpng-config.in =================================================================== ---- scripts/libpng-config.in.orig -+++ scripts/libpng-config.in -@@ -15,8 +15,8 @@ libdir="@libdir@" +--- libpng-1.2.41.orig/scripts/libpng-config.in ++++ libpng-1.2.41/scripts/libpng-config.in +@@ -18,8 +18,8 @@ libdir="@libdir@" includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@" libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@" all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@" @@ -22,7 +22,7 @@ Index: scripts/libpng-config.in R_opts="" cppflags="" ccopts="@LIBPNG_NO_MMX@" -@@ -56,7 +56,7 @@ while test $# -gt 0; do +@@ -59,7 +59,7 @@ while test $# -gt 0; do case "$1" in --prefix) diff --git a/patches/libpng-1.2.41/series b/patches/libpng-1.2.41/series new file mode 100644 index 000000000..fdab52170 --- /dev/null +++ b/patches/libpng-1.2.41/series @@ -0,0 +1 @@ +libpng_config_sysroot.diff diff --git a/rules/libpng.make b/rules/libpng.make index fff5fba89..11ba771cc 100644 --- a/rules/libpng.make +++ b/rules/libpng.make @@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_LIBPNG) += libpng # # Paths and names # -LIBPNG_VERSION := 1.2.39 +LIBPNG_VERSION := 1.2.41 LIBPNG := libpng-$(LIBPNG_VERSION) LIBPNG_SUFFIX := tar.bz2 LIBPNG_URL := $(PTXCONF_SETUP_SFMIRROR)/libpng/$(LIBPNG).$(LIBPNG_SUFFIX) @@ -76,7 +76,7 @@ $(STATEDIR)/libpng.targetinstall: @$(call install_fixup, libpng,DESCRIPTION,missing) @$(call install_copy, libpng, 0, 0, 0644, -, \ - /usr/lib/libpng12.so.0.39.0) + /usr/lib/libpng12.so.0.41.0) @$(call install_link, libpng, libpng12.so.0.39.0, /usr/lib/libpng12.so.0) @$(call install_link, libpng, libpng12.so.0.39.0, /usr/lib/libpng12.so) |