From a142cbd47eb78b4ea63459286d97ab5e769c7bdc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 30 Jan 2012 15:04:45 -0800 Subject: zlib: Upgrade 1.2.5 -> 1.2.6 Dont use autotools, it really not so autoconf like. the configure script gets updated with every release of zlib and we overwrite that. Instead use the upstream provided configure copyright year was changed in zlib.h which caused change in LIC_FILE_CHECKSUM fix.inverted.LFS.logic.patch is already applied upstream so drop it Drop the configure.ac and Makefile.am scripts since we do not autoreconf anymore and do not inherit autotools anymore Bump PR for depending recipes so a rebuild it ensues so that they dont depend on .la anymore and add missing dependencies discovered during incremental build (From OE-Core rev: 50ad5230ea9e0982cdfda23fb9fcfccf89d28f29) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gst-plugins.inc | 2 ++ meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb | 2 +- meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb | 2 +- meta/recipes-multimedia/libpng/libpng_1.2.46.bb | 2 +- meta/recipes-multimedia/libtiff/tiff_3.9.5.bb | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc index b23d399349..a71a868049 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc +++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc @@ -6,6 +6,8 @@ DEPENDS = "gstreamer" inherit autotools pkgconfig +PR = "r1" + FILESPATH =. "${FILE_DIRNAME}/gst-plugins:" SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb index 650c708225..b58f34d72e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \ file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4" DEPENDS = "glib-2.0 libxml2 bison-native flex-native" -PR = "r1" +PR = "r2" SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ file://check_fix.patch \ diff --git a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb index 05e566ea4b..c5d53e63eb 100644 --- a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb +++ b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://version.h;beginline=1;endline=8;md5=86ac68b67f054b7afde9e149bbc3fe63" SECTION = "libs" DEPENDS = "zlib gperf-native" -PR = "r4" +PR = "r5" SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz \ file://addpkgconfig.patch" diff --git a/meta/recipes-multimedia/libpng/libpng_1.2.46.bb b/meta/recipes-multimedia/libpng/libpng_1.2.46.bb index dc93132d97..a917691e32 100644 --- a/meta/recipes-multimedia/libpng/libpng_1.2.46.bb +++ b/meta/recipes-multimedia/libpng/libpng_1.2.46.bb @@ -6,7 +6,7 @@ LICENSE = "Libpng" LIC_FILES_CHKSUM = "file://LICENSE;md5=21b4b6e3523afa9f03f00b43b991dad0 \ file://png.h;startline=172;endline=261;md5=996460063a9bf2de35b2d61d2776dabc" DEPENDS = "zlib" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2" diff --git a/meta/recipes-multimedia/libtiff/tiff_3.9.5.bb b/meta/recipes-multimedia/libtiff/tiff_3.9.5.bb index 78a4859428..ae8df15918 100644 --- a/meta/recipes-multimedia/libtiff/tiff_3.9.5.bb +++ b/meta/recipes-multimedia/libtiff/tiff_3.9.5.bb @@ -3,7 +3,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=34da3db46fab7501992f9615d7e158cf" HOMEPAGE = "http://www.remotesensing.org/libtiff/" DEPENDS = "zlib jpeg lzo" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${PV}.tar.gz \ file://libtool2.patch" -- cgit v1.2.3-54-g00ecf