Also fix configure options. Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com> --- Changes from v1: - Forgot to remove a now obsolete patch.
...001-add-SYSROOT-handling-to-libpng-config.patch | 35 ---------------------- patches/libpng-1.2.54/series | 4 --- rules/libpng.make | 18 +++++++---- 3 files changed, 13 insertions(+), 44 deletions(-) delete mode 100644 patches/libpng-1.2.54/0001-add-SYSROOT-handling-to-libpng-config.patch delete mode 100644 patches/libpng-1.2.54/series diff --git a/patches/libpng-1.2.54/0001-add-SYSROOT-handling-to-libpng-config.patch b/patches/libpng-1.2.54/0001-add-SYSROOT-handling-to-libpng-config.patch deleted file mode 100644 index fd7890d8f..000000000 --- a/patches/libpng-1.2.54/0001-add-SYSROOT-handling-to-libpng-config.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Marc Kleine-Budde <m...@pengutronix.de> -Date: Wed, 18 Nov 2015 18:19:39 +0100 -Subject: [PATCH] add SYSROOT handling to libpng-config - -Upstream: https://sourceforge.net/p/libpng/feature-requests/17/ - -Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de> ---- - scripts/libpng-config.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scripts/libpng-config.in b/scripts/libpng-config.in -index 7ae7d50f2065..a61f9a58047d 100755 ---- a/scripts/libpng-config.in -+++ b/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.54/series b/patches/libpng-1.2.54/series deleted file mode 100644 index 5c10bac9e..000000000 --- a/patches/libpng-1.2.54/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-add-SYSROOT-handling-to-libpng-config.patch -# ad9e735a6e56ce6ad024d86b40f0020d - git-ptx-patches magic diff --git a/rules/libpng.make b/rules/libpng.make index f23d9543f..e15fe18b0 100644 --- a/rules/libpng.make +++ b/rules/libpng.make @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_LIBPNG) += libpng # # Paths and names # -LIBPNG_VERSION := 1.2.54 -LIBPNG_MD5 := bbb7a7264f1c7d9c444fd16bf6f89832 +LIBPNG_VERSION := 1.6.29 +LIBPNG_MD5 := 3245dbd76ea91e1437507357b858ec97 LIBPNG := libpng-$(LIBPNG_VERSION) LIBPNG_SUFFIX := tar.xz LIBPNG_URL := $(call ptx/mirror, SF, libpng/$(LIBPNG).$(LIBPNG_SUFFIX)) @@ -31,9 +31,17 @@ LIBPNG_LICENSE := Zlib # Prepare # ---------------------------------------------------------------------------- -LIBPNG_AUTOCONF := \ +LIBPNG_CONF_TOOL:= autoconf +LIBPNG_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --without-libpng-compat + --enable-unversioned-links \ + --enable-unversioned-libpng-pc \ + --enable-unversioned-libpng-config \ + --enable-arm-neon=$(call ptx/ifdef, PTXCONF_ARCH_ARM_NEON, yes, no) \ + --disable-mips-msa \ + --$(call ptx/endis, PTXCONF_ARCH_X86)-intel-sse \ + --disable-powerpc-vsx \ + --with-binconfigs # ---------------------------------------------------------------------------- # Target-Install @@ -48,7 +56,7 @@ $(STATEDIR)/libpng.targetinstall: @$(call install_fixup, libpng,AUTHOR,"Robert Schwebel <r.schwe...@pengutronix.de>") @$(call install_fixup, libpng,DESCRIPTION,missing) - @$(call install_lib, libpng, 0, 0, 0644, libpng12) + @$(call install_lib, libpng, 0, 0, 0644, libpng16) @$(call install_finish, libpng) -- 2.13.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de
