diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-01-30 15:04:45 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-10 14:38:44 +0000 |
commit | a142cbd47eb78b4ea63459286d97ab5e769c7bdc (patch) | |
tree | ea9296d1fccd617a7257258064aaf5b89c4f9c55 /meta/recipes-multimedia | |
parent | 65d296a235a7d2f2689c530c91557ed6263afc01 (diff) | |
download | poky-a142cbd47eb78b4ea63459286d97ab5e769c7bdc.tar.gz |
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 <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
5 files changed, 6 insertions, 4 deletions
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" | |||
6 | 6 | ||
7 | inherit autotools pkgconfig | 7 | inherit autotools pkgconfig |
8 | 8 | ||
9 | PR = "r1" | ||
10 | |||
9 | FILESPATH =. "${FILE_DIRNAME}/gst-plugins:" | 11 | FILESPATH =. "${FILE_DIRNAME}/gst-plugins:" |
10 | 12 | ||
11 | SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2" | 13 | 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 \ | |||
9 | file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4" | 9 | file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4" |
10 | DEPENDS = "glib-2.0 libxml2 bison-native flex-native" | 10 | DEPENDS = "glib-2.0 libxml2 bison-native flex-native" |
11 | 11 | ||
12 | PR = "r1" | 12 | PR = "r2" |
13 | 13 | ||
14 | SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ | 14 | SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ |
15 | file://check_fix.patch \ | 15 | 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 \ | |||
7 | file://version.h;beginline=1;endline=8;md5=86ac68b67f054b7afde9e149bbc3fe63" | 7 | file://version.h;beginline=1;endline=8;md5=86ac68b67f054b7afde9e149bbc3fe63" |
8 | SECTION = "libs" | 8 | SECTION = "libs" |
9 | DEPENDS = "zlib gperf-native" | 9 | DEPENDS = "zlib gperf-native" |
10 | PR = "r4" | 10 | PR = "r5" |
11 | 11 | ||
12 | SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz \ | 12 | SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz \ |
13 | file://addpkgconfig.patch" | 13 | 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" | |||
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=21b4b6e3523afa9f03f00b43b991dad0 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=21b4b6e3523afa9f03f00b43b991dad0 \ |
7 | file://png.h;startline=172;endline=261;md5=996460063a9bf2de35b2d61d2776dabc" | 7 | file://png.h;startline=172;endline=261;md5=996460063a9bf2de35b2d61d2776dabc" |
8 | DEPENDS = "zlib" | 8 | DEPENDS = "zlib" |
9 | PR = "r2" | 9 | PR = "r3" |
10 | 10 | ||
11 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2" | 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2" |
12 | 12 | ||
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" | |||
3 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=34da3db46fab7501992f9615d7e158cf" | 3 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=34da3db46fab7501992f9615d7e158cf" |
4 | HOMEPAGE = "http://www.remotesensing.org/libtiff/" | 4 | HOMEPAGE = "http://www.remotesensing.org/libtiff/" |
5 | DEPENDS = "zlib jpeg lzo" | 5 | DEPENDS = "zlib jpeg lzo" |
6 | PR = "r2" | 6 | PR = "r3" |
7 | 7 | ||
8 | SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${PV}.tar.gz \ | 8 | SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${PV}.tar.gz \ |
9 | file://libtool2.patch" | 9 | file://libtool2.patch" |