diff options
| author | Saul Wold <sgw@linux.intel.com> | 2012-01-19 23:10:57 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-24 11:23:55 +0000 |
| commit | 66c348403d2289ad9a4d95ee3f3aaf8088593e82 (patch) | |
| tree | 7d8c95765472487666397655c805052fbc83ab5b /meta/recipes-multimedia | |
| parent | 93135c19b9574d952aaf8a4b97425640b847847a (diff) | |
| download | openembedded-core-66c348403d2289ad9a4d95ee3f3aaf8088593e82.tar.gz openembedded-core-66c348403d2289ad9a4d95ee3f3aaf8088593e82.tar.bz2 openembedded-core-66c348403d2289ad9a4d95ee3f3aaf8088593e82.zip | |
gstreamer: refactor packages for staticdev
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-multimedia')
3 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb index a1b7cbbe53..5ee5066d87 100644 --- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb @@ -23,7 +23,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \ SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" SRC_URI[sha256sum] = "76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62" -PR = "r0" +PR = "r1" EXTRA_OECONF = "--with-ffmpeg-extra-configure=\"--target-os=linux\" " @@ -33,7 +33,8 @@ EXTRA_OECONF_append_x86 = " --disable-yasm " FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" -FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" +FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la" +FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a" # Hack to get STAGING_LIBDIR into the linker path when building ffmpeg CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}" diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.22.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.22.bb index ec067b8f37..56c54b5529 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.22.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.22.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg" -PR = "r0" +PR = "r1" inherit gettext diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc index 8ff9f82fb4..a71d8962af 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc @@ -7,7 +7,8 @@ python populate_packages_prepend () { do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True) do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', bb.data.expand('${PN}-%s', d), 'GStreamer plugin for %s', postinst=postinst, extra_depends=bb.data.expand('${PN}',d)) - do_split_packages(d, gst_libdir, 'libgst(.*)\.l?a$', bb.data.expand('${PN}-%s-dev', d), 'GStreamer plugin for %s (development files)', extra_depends=bb.data.expand('${PN}-dev',d)) + do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', bb.data.expand('${PN}-%s-dev', d), 'GStreamer plugin for %s (development files)', extra_depends=bb.data.expand('${PN}-dev',d)) + do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', bb.data.expand('${PN}-%s-staticdev', d), 'GStreamer plugin for %s (static development files)', extra_depends=bb.data.expand('${PN}-staticdev',d)) pn = d.getVar('PN', 1) metapkg = pn + '-meta' @@ -17,7 +18,7 @@ python populate_packages_prepend () { metapkg_rdepends = [] packages = d.getVar('PACKAGES', 1).split() for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.count('locale') and not pkg.count('-static'): + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.count('locale') and not pkg.count('-staticdev'): metapkg_rdepends.append(pkg) d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package') @@ -25,10 +26,10 @@ python populate_packages_prepend () { ALLOW_EMPTY = "1" -PACKAGES += "${PN}-apps ${PN}-meta" +PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib" FILES_${PN}-apps = "${bindir}" FILES_${PN} = "${datadir}/gstreamer-${LIBV}" FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug" - +FILES_${PN}-glib = "${datadir}/glib-2.0" |