gst-plugins: fixed pattern for meta package dependencies.

This fixes package name matching so that gst-plugins-*-meta
packages include all the plugin ones. The current matching
implementation doesn't make meta packages depend on gst-plugins
with 'locale' and 'dev' in their names (f.e. gstfbdevsink).
Also use INC_PR for gstremer-plugins as requested on ML.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Signed-off-by: Koen Kooi <koen@openembedded.org>

diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb
index dbfe6a978d6c8e58146235f1654f1358b1e2a5bb..a90b88ee45fef38dffd2ab2dc61c9a4d3d211a53 100644 (file)
--- a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb
@@ -1,5 +1,7 @@
 require gst-plugins.inc
 
+PR = "${INC_PR}.1"
+
 SRC_URI += "file://vorbisenc.h file://vorbisdec.h \
             file://ivorbis-thumb.patch;patch=1"
 DEPENDS += "gst-plugins-base directfb"

diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb
index df7bf75852ebe8a5a078dbebe5ed8b621963ae60..bfc7217b5080278ef8887b221715d6c3cb5597c5 100644 (file)
--- a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb
@@ -1,5 +1,6 @@
 require gst-plugins.inc
-PR = "r2"
+
+PR = "${INC_PR}.1"
 
 SRC_URI += "file://vorbisenc.h file://vorbisdec.h \
             file://gst-plugins-directfb-fix.patch;patch=1;pnum=2 \

diff --git a/recipes/gstreamer/gst-plugins-base_0.10.17.bb b/recipes/gstreamer/gst-plugins-base_0.10.17.bb
index 0a1f17fcd8e003ee61757b0e41d40c3b090c942e..3b076689022aeec0afa604817fdf0df80ad13923 100644 (file)
--- a/recipes/gstreamer/gst-plugins-base_0.10.17.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.17.bb
@@ -1,5 +1,7 @@
 require gst-plugins.inc
 
+PR = "${INC_PR}.1"
+
 PROVIDES += "gst-plugins"
 
 # gst-plugins-base only builds the alsa plugin

diff --git a/recipes/gstreamer/gst-plugins-base_0.10.22.bb b/recipes/gstreamer/gst-plugins-base_0.10.22.bb
index 3086d93ffd861e0ee8bb8fda830ecffab6e20c17..bcbfd6871dc3399968632ab8d05d5bdd2915534d 100644 (file)
--- a/recipes/gstreamer/gst-plugins-base_0.10.22.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.22.bb
@@ -1,5 +1,7 @@
 require gst-plugins.inc
 
+PR = "${INC_PR}.1"
+
 PROVIDES += "gst-plugins"
 
 PR = "r2"

diff --git a/recipes/gstreamer/gst-plugins-base_0.10.23.bb b/recipes/gstreamer/gst-plugins-base_0.10.23.bb
index d3bfb6c6714c50c586800e2fd24ecd70b9d91f77..26dcfe3e3b14b5222ce41072a60e79c9cea4dc21 100644 (file)
--- a/recipes/gstreamer/gst-plugins-base_0.10.23.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.23.bb
@@ -1,5 +1,7 @@
 require gst-plugins.inc
 
+PR = "${INC_PR}.1"
+
 PROVIDES += "gst-plugins"
 
 # gst-plugins-base only builds the alsa plugin

diff --git a/recipes/gstreamer/gst-plugins-good_0.10.13.bb b/recipes/gstreamer/gst-plugins-good_0.10.13.bb
index b77d1fcf47eb22265f5df0b067c66753725048e5..d077d06d1cd73b85a0ba40fe5dbfd6b83c522378 100644 (file)
--- a/recipes/gstreamer/gst-plugins-good_0.10.13.bb
+++ b/recipes/gstreamer/gst-plugins-good_0.10.13.bb
@@ -1,6 +1,6 @@
 require gst-plugins.inc
 
-PR = "r1"
+PR = "${INC_PR}.1"
 
 inherit gconf 
 

diff --git a/recipes/gstreamer/gst-plugins-good_0.10.14.bb b/recipes/gstreamer/gst-plugins-good_0.10.14.bb
index d9f03491018e570e8c40cf8d84ee469ce3232d28..d077d06d1cd73b85a0ba40fe5dbfd6b83c522378 100644 (file)
--- a/recipes/gstreamer/gst-plugins-good_0.10.14.bb
+++ b/recipes/gstreamer/gst-plugins-good_0.10.14.bb
@@ -1,5 +1,7 @@
 require gst-plugins.inc
 
+PR = "${INC_PR}.1"
+
 inherit gconf 
 
 EXTRA_OECONF += " --enable-experimental  --enable-gst_v4l2 --enable-gconftool  --enable-external --with-check=no"

diff --git a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb
index 545a43a49471aeb02aa10c16e70a4dd2f9627c40..0d024e15ea3a6b62ce3eeaed551c325a89e4d2c4 100644 (file)
--- a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb
+++ b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb
@@ -1,7 +1,8 @@
 require gst-plugins.inc
 DEPENDS += "gst-plugins-base libsidplay"
 PROVIDES += "gst-plugin-sid"
-PR = "r5"
+
+PR = "${INC_PR}.1"
 
 SRC_URI = "\
   http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.bz2 \

diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb
index 49350ed6410907b0445095a8bd7c1d171ab2b0bf..4d4f893075575aaa07fe3955f5211c316655d33c 100644 (file)
--- a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb
+++ b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb
@@ -1,6 +1,6 @@
 require gst-plugins.inc
 
-PR = "r1"
+PR = "${INC_PR}.1"
 
 DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
 

diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb
index 062404179ed7234516549394d4c01b2045df65d0..9c28d208dff7715ad14d423e52fb67404656566c 100644 (file)
--- a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb
+++ b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb
@@ -1,5 +1,7 @@
 require gst-plugins.inc
 
+PR = "${INC_PR}.1"
+
 DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
 
 SRC_URI += "\

diff --git a/recipes/gstreamer/gst-plugins.inc b/recipes/gstreamer/gst-plugins.inc
index bcb3e39321ed887582130a018dac51760d7b49bb..536555c18f86a9feb68f7cd8cfdec08a22ab871e 100644 (file)
--- a/recipes/gstreamer/gst-plugins.inc
+++ b/recipes/gstreamer/gst-plugins.inc
@@ -3,6 +3,8 @@ DESCRIPTION = "Plugins for GStreamer"
 DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis"
 DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}"
 
+INC_PR = "r5"
+
 PACKAGES_DYNAMIC = "gst-plugin-*"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2"
@@ -33,7 +35,7 @@ python populate_packages_prepend () {
        metapkg_rdepends = []
        packages = bb.data.getVar('PACKAGES', d, 1).split()
        for pkg in packages[1:]:
-               if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count('dev') and not pkg.count( 'locale' ):
+               if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-locale'):
                        metapkg_rdepends.append(pkg)
        bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
        bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d)