On Tue, Jun 06, 2017 at 04:36:35PM +0200, Clemens Gruber wrote:
> Also fix configure options.
>
patchin: quilt: apply 'ptxdist-git/patches/libpng-1.6.29/series'
Applying patch 0001-add-SYSROOT-handling-to-libpng-config.patch
can't find file to patch at input line 16
Perhaps you used the wrong -p or --strip option?
mol
> Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com>
> ---
> .../0001-add-SYSROOT-handling-to-libpng-config.patch | 0
> patches/{libpng-1.2.54 => libpng-1.6.29}/series | 0
> rules/libpng.make | 18
> +++++++++++++-----
> 3 files changed, 13 insertions(+), 5 deletions(-)
> rename patches/{libpng-1.2.54 =>
> libpng-1.6.29}/0001-add-SYSROOT-handling-to-libpng-config.patch (100%)
> rename patches/{libpng-1.2.54 => libpng-1.6.29}/series (100%)
>
> diff --git
> a/patches/libpng-1.2.54/0001-add-SYSROOT-handling-to-libpng-config.patch
> b/patches/libpng-1.6.29/0001-add-SYSROOT-handling-to-libpng-config.patch
> similarity index 100%
> rename from
> patches/libpng-1.2.54/0001-add-SYSROOT-handling-to-libpng-config.patch
> rename to
> patches/libpng-1.6.29/0001-add-SYSROOT-handling-to-libpng-config.patch
> diff --git a/patches/libpng-1.2.54/series b/patches/libpng-1.6.29/series
> similarity index 100%
> rename from patches/libpng-1.2.54/series
> rename to patches/libpng-1.6.29/series
> 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.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
