From 735cc71cb1eef9d3ff532cc586dbde959c48bbbb Mon Sep 17 00:00:00 2001 From: hschang Date: Fri, 18 Jul 2014 13:02:50 +0900 Subject: [PATCH] [libpng] downgrade to 1.6.8 for prevent warning message. --- meta-openvuplus/conf/distro/vuplus.conf | 2 ++ .../gstreamer/gst-plugins-bad_0.10.23.1.bb | 2 +- ...0001-configure-lower-automake-requirement.patch | 31 ++++++++++++++++++++++ .../recipes-multimedia/libpng/libpng_1.6.8.bb | 27 +++++++++++++++++++ .../recipes-vuplus/aio-grab/aio-grab.bb | 2 +- 5 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 meta-openvuplus/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch create mode 100644 meta-openvuplus/recipes-multimedia/libpng/libpng_1.6.8.bb diff --git a/meta-openvuplus/conf/distro/vuplus.conf b/meta-openvuplus/conf/distro/vuplus.conf index c0f4753..3d11c66 100644 --- a/meta-openvuplus/conf/distro/vuplus.conf +++ b/meta-openvuplus/conf/distro/vuplus.conf @@ -47,6 +47,8 @@ PREFERRED_VERSION_freetype ?= "2.4.12" # chang : udev_182 is not working with linux-libc-headers_2.6.31. PREFERRED_VERSION_udev ?= "124" +PREFERRED_VERSION_libpng ?= "1.6.8" + PREFERRED_PROVIDER_jpeg = "jpeg" PREFERRED_PROVIDER_jpeg-native = "jpeg-native" PREFERRED_PROVIDER_libfribidi = "libfribidi" diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.1.bb b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.1.bb index e9019ef..61b163d 100644 --- a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.1.bb +++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.1.bb @@ -10,7 +10,7 @@ DEPENDS += "libmusicbrainz tremor curl libmms librtmp libmms faad2" DEPENDS += "gst-plugins-base" CONFLICTS = "librsvg" -PR = "r5" +PR = "r6" GIT_PV = "" SRCREV = "cef47d85294a0dca38631f938b81a3f0dd6891bd" diff --git a/meta-openvuplus/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch b/meta-openvuplus/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch new file mode 100644 index 0000000..bbbca89 --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch @@ -0,0 +1,31 @@ +From fff7cbc01e061a235852f385866fe75fb17867e3 Mon Sep 17 00:00:00 2001 +From: Valentin Popa +Date: Tue, 26 Nov 2013 12:06:55 +0200 +Subject: [PATCH] configure: lower automake requirement + +We're not using parallel tests in OE-core yet + +Signed-off-by: Valentin Popa +Signed-off-by: Koen Kooi + +Upstream-Status: Inapropriate [OE specific build hack] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 28200c3..fab2515 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,7 @@ AC_CONFIG_MACRO_DIR([scripts]) + # dist-xz requires automake 1.11 or later + # 1.12.2 fixes a security issue in 1.11.2 and 1.12.1 + # 1.13 is required for parallel tests +-AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules subdir-objects]) ++AM_INIT_AUTOMAKE([1.12.2 foreign dist-xz color-tests silent-rules subdir-objects]) + # The following line causes --disable-maintainer-mode to be the default to + # configure, this is necessary because libpng distributions cannot rely on the + # time stamps of the autotools generated files being correct +-- +1.8.3.2 + diff --git a/meta-openvuplus/recipes-multimedia/libpng/libpng_1.6.8.bb b/meta-openvuplus/recipes-multimedia/libpng/libpng_1.6.8.bb new file mode 100644 index 0000000..d063495 --- /dev/null +++ b/meta-openvuplus/recipes-multimedia/libpng/libpng_1.6.8.bb @@ -0,0 +1,27 @@ +SUMMARY = "PNG image format decoding library" +HOMEPAGE = "http://www.libpng.org/" +SECTION = "libs" +LICENSE = "Libpng" +LIC_FILES_CHKSUM = "file://LICENSE;md5=44bc22578be94b6536c8bdc3a01e5db9 \ + file://png.h;endline=15;md5=aa42e53406a5ebb9500bae72fa314b6d \ + file://png.h;beginline=209;endline=323;md5=83e13159b5bf0a4d9fb634acbda7cb5b" +DEPENDS = "zlib" +LIBV = "16" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ + file://0001-configure-lower-automake-requirement.patch \ + " + +SRC_URI[md5sum] = "51ce71a1642cdde1f4485a7ff82193c0" +SRC_URI[sha256sum] = "24f73d8b5e1d74a9482c81b65c3f93f96c7da7ed0417b8a948a75d2d99133081" + +inherit autotools binconfig pkgconfig + +# Work around missing symbols +EXTRA_OECONF_append_arm = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}" + +PACKAGES =+ "${PN}-tools" + +FILES_${PN}-tools = "${bindir}/png-fix-itxt ${bindir}/pngfix" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb b/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb index 779678e..0c59a25 100755 --- a/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb +++ b/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb @@ -2,7 +2,7 @@ SUMMARY = "Screen grabber for Set-Top-Boxes" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" SRCREV = "8394e1ba98c73d7c56d3235ef16cce253dc597cd" -PR = "r1" +PR = "r2" SRC_URI = " \ git://schwerkraft.elitedvb.net/aio-grab/aio-grab.git;protocol=git;tag=${SRCREV} \ -- 2.7.4