From 9ed7ac6ffaa45a068ac107beb2a8089ed038fa9c Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 19 Jan 2012 23:10:57 -0800 Subject: gstreamer: refactor packages for staticdev (From OE-Core rev: 66c348403d2289ad9a4d95ee3f3aaf8088593e82) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gst-plugins-package.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'meta/recipes-multimedia/gstreamer/gst-plugins-package.inc') 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" -- cgit v1.2.3-54-g00ecf