The new version does not have the option to disable the old compat library name any more.
Signed-off-by: Robert Schwebel <[email protected]> --- patches/libpng-1.2.44/libpng_config_sysroot.diff | 35 ---------------------- patches/libpng-1.2.44/series | 1 - patches/libpng-1.5.4/libpng_config_sysroot.diff | 35 ++++++++++++++++++++++ patches/libpng-1.5.4/series | 1 + rules/libpng.make | 18 ++--------- 5 files changed, 40 insertions(+), 50 deletions(-) delete mode 100644 patches/libpng-1.2.44/libpng_config_sysroot.diff delete mode 100644 patches/libpng-1.2.44/series create mode 100644 patches/libpng-1.5.4/libpng_config_sysroot.diff create mode 100644 patches/libpng-1.5.4/series diff --git a/patches/libpng-1.2.44/libpng_config_sysroot.diff b/patches/libpng-1.2.44/libpng_config_sysroot.diff deleted file mode 100644 index 984dbc8..0000000 --- a/patches/libpng-1.2.44/libpng_config_sysroot.diff +++ /dev/null @@ -1,35 +0,0 @@ -From: Marc Kleine-Budde <[email protected]> -Subject: add SYSROOT handling to libpng-config - -Signed-off-by: Marc Kleine-Budde <[email protected]> - ---- -# 20091229 rsc: added as https://sourceforge.net/tracker/?func=detail&aid=2922975&group_id=5624&atid=105624 - - scripts/libpng-config.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -Index: libpng-1.2.41/scripts/libpng-config.in -=================================================================== ---- 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@" --I_opts="-I${includedir}" --L_opts="-L${libdir}" -+I_opts="-I${SYSROOT}${includedir}" -+L_opts="-L${SYSROOT}${libdir}" - R_opts="" - cppflags="" - ccopts="@LIBPNG_NO_MMX@" -@@ -59,7 +59,7 @@ while test $# -gt 0; do - case "$1" in - - --prefix) -- echo ${prefix} -+ echo ${SYSROOT}${prefix} - ;; - - --version) diff --git a/patches/libpng-1.2.44/series b/patches/libpng-1.2.44/series deleted file mode 100644 index fdab521..0000000 --- a/patches/libpng-1.2.44/series +++ /dev/null @@ -1 +0,0 @@ -libpng_config_sysroot.diff diff --git a/patches/libpng-1.5.4/libpng_config_sysroot.diff b/patches/libpng-1.5.4/libpng_config_sysroot.diff new file mode 100644 index 0000000..f5b820c --- /dev/null +++ b/patches/libpng-1.5.4/libpng_config_sysroot.diff @@ -0,0 +1,35 @@ +From: Marc Kleine-Budde <[email protected]> +Subject: add SYSROOT handling to libpng-config + +Signed-off-by: Marc Kleine-Budde <[email protected]> + +--- +# 20091229 rsc: added as https://sourceforge.net/tracker/?func=detail&aid=2922975&group_id=5624&atid=105624 + + libpng-config.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: libpng-1.5.4/libpng-config.in +=================================================================== +--- libpng-1.5.4.orig/libpng-config.in ++++ libpng-1.5.4/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@" +-I_opts="-I${includedir}" +-L_opts="-L${libdir}" ++I_opts="-I${SYSROOT}${includedir}" ++L_opts="-L${SYSROOT}${libdir}" + R_opts="" + cppflags="" + ccopts="" +@@ -59,7 +59,7 @@ while test $# -gt 0; do + case "$1" in + + --prefix) +- echo ${prefix} ++ echo ${SYSROOT}${prefix} + ;; + + --version) diff --git a/patches/libpng-1.5.4/series b/patches/libpng-1.5.4/series new file mode 100644 index 0000000..fdab521 --- /dev/null +++ b/patches/libpng-1.5.4/series @@ -0,0 +1 @@ +libpng_config_sysroot.diff diff --git a/rules/libpng.make b/rules/libpng.make index 5439586..b4ce187 100644 --- a/rules/libpng.make +++ b/rules/libpng.make @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_LIBPNG) += libpng # # Paths and names # -LIBPNG_VERSION := 1.2.44 -LIBPNG_MD5 := 89b62f8daaeeab1342e307d6d1411ff1 +LIBPNG_VERSION := 1.5.4 +LIBPNG_MD5 := dea4d1fd671160424923e92ff0cdda78 LIBPNG := libpng-$(LIBPNG_VERSION) LIBPNG_SUFFIX := tar.gz LIBPNG_URL := $(PTXCONF_SETUP_SFMIRROR)/libpng/$(LIBPNG).$(LIBPNG_SUFFIX) @@ -28,20 +28,10 @@ LIBPNG_DIR := $(BUILDDIR)/$(LIBPNG) LIBPNG_LICENSE := libpng # ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -$(LIBPNG_SOURCE): - @$(call targetinfo) - @$(call get, LIBPNG) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -LIBPNG_AUTOCONF := \ - $(CROSS_AUTOCONF_USR) \ - --without-libpng-compat +LIBPNG_CONF_TOOL := autoconf # ---------------------------------------------------------------------------- # Target-Install @@ -56,7 +46,7 @@ $(STATEDIR)/libpng.targetinstall: @$(call install_fixup, libpng,AUTHOR,"Robert Schwebel <[email protected]>") @$(call install_fixup, libpng,DESCRIPTION,missing) - @$(call install_lib, libpng, 0, 0, 0644, libpng12) + @$(call install_lib, libpng, 0, 0, 0644, libpng15) @$(call install_finish, libpng) -- 1.7.5.4 -- ptxdist mailing list [email protected]
