summaryrefslogtreecommitdiffstats
path: root/meta/packages/gstreamer
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2010-07-12 15:29:37 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-14 09:55:55 +0100
commite1ed3900fabad7d62dea4ee84ecfd4db62f8ad08 (patch)
tree685af087ce360d6db5b692110bd70e8492111843 /meta/packages/gstreamer
parente388cb142a9f79faf528aee6e7d56714f5596450 (diff)
downloadpoky-e1ed3900fabad7d62dea4ee84ecfd4db62f8ad08.tar.gz
gst-plugins: fix multiple providers warning
Rename all the sub-plugin to eliminate the inclusion by all plugins set This can fix the multple providers warning Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Diffstat (limited to 'meta/packages/gstreamer')
-rw-r--r--meta/packages/gstreamer/gst-meta-base_0.10.bb42
-rw-r--r--meta/packages/gstreamer/gst-plugins-base_0.10.29.bb1
-rw-r--r--meta/packages/gstreamer/gst-plugins-good_0.10.23.bb2
-rw-r--r--meta/packages/gstreamer/gst-plugins.inc9
4 files changed, 26 insertions, 28 deletions
diff --git a/meta/packages/gstreamer/gst-meta-base_0.10.bb b/meta/packages/gstreamer/gst-meta-base_0.10.bb
index 0f78e10276..3bda87ec15 100644
--- a/meta/packages/gstreamer/gst-meta-base_0.10.bb
+++ b/meta/packages/gstreamer/gst-meta-base_0.10.bb
@@ -13,39 +13,39 @@ ALLOW_EMPTY = "1"
13 13
14RDEPENDS_gst-meta-base = "\ 14RDEPENDS_gst-meta-base = "\
15 gstreamer \ 15 gstreamer \
16 gst-plugin-playbin \ 16 gst-plugins-base-playbin \
17 gst-plugin-decodebin \ 17 gst-plugins-base-decodebin \
18 gst-plugin-gnomevfs \ 18 gst-plugins-base-gnomevfs \
19 gst-plugin-alsa \ 19 gst-plugins-base-alsa \
20 gst-plugin-volume \ 20 gst-plugins-base-volume \
21 gst-plugin-ximagesink \ 21 gst-plugins-base-ximagesink \
22 gst-plugin-audioconvert \ 22 gst-plugins-base-audioconvert \
23 gst-plugin-audioresample \ 23 gst-plugins-base-audioresample \
24 gst-plugin-typefindfunctions \ 24 gst-plugins-base-typefindfunctions \
25 gst-plugin-videoscale \ 25 gst-plugins-base-videoscale \
26 gst-plugin-ffmpegcolorspace \ 26 gst-plugins-base-ffmpegcolorspace \
27 gst-plugin-autodetect" 27 gst-plugins-good-autodetect"
28 28
29 29
30RDEPENDS_gst-meta-audio = "\ 30RDEPENDS_gst-meta-audio = "\
31 gst-meta-base \ 31 gst-meta-base \
32 gst-plugin-ivorbis \ 32 gst-plugins-base-ivorbis \
33 gst-plugin-ogg \ 33 gst-plugins-base-ogg \
34 gst-plugin-mad" 34 gst-plugins-ugly-mad"
35 35
36 36
37RDEPENDS_gst-meta-debug = "\ 37RDEPENDS_gst-meta-debug = "\
38 gst-meta-base \ 38 gst-meta-base \
39 gst-plugin-debug \ 39 gst-plugins-good-debug \
40 gst-plugin-audiotestsrc \ 40 gst-plugins-base-audiotestsrc \
41 gst-plugin-videotestsrc" 41 gst-plugins-base-videotestsrc"
42 42
43 43
44RDEPENDS_gst-meta-video = "\ 44RDEPENDS_gst-meta-video = "\
45 gst-meta-base \ 45 gst-meta-base \
46 gst-plugin-avi \ 46 gst-plugins-good-avi \
47 gst-plugin-matroska \ 47 gst-plugins-good-matroska \
48 gst-plugin-mpeg2dec" 48 gst-plugins-ugly-mpeg2dec"
49 49
50RRECOMMENDS_gst-meta-video = "\ 50RRECOMMENDS_gst-meta-video = "\
51 gst-meta-audio" 51 gst-meta-audio"
diff --git a/meta/packages/gstreamer/gst-plugins-base_0.10.29.bb b/meta/packages/gstreamer/gst-plugins-base_0.10.29.bb
index d55f85d86d..bfbe28108d 100644
--- a/meta/packages/gstreamer/gst-plugins-base_0.10.29.bb
+++ b/meta/packages/gstreamer/gst-plugins-base_0.10.29.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
9DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv" 9DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv"
10RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ 10RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \
11 gnome-vfs-plugin-sftp" 11 gnome-vfs-plugin-sftp"
12PROVIDES_${PN} += "gst-plugins"
13 12
14PR = "r0" 13PR = "r0"
15 14
diff --git a/meta/packages/gstreamer/gst-plugins-good_0.10.23.bb b/meta/packages/gstreamer/gst-plugins-good_0.10.23.bb
index fe5c722f49..528dcbf540 100644
--- a/meta/packages/gstreamer/gst-plugins-good_0.10.23.bb
+++ b/meta/packages/gstreamer/gst-plugins-good_0.10.23.bb
@@ -13,8 +13,6 @@ inherit gettext
13 13
14EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --without-check" 14EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --without-check"
15 15
16PACKAGES += "gst-plugin-id3demux"
17
18do_configure_prepend() { 16do_configure_prepend() {
19 # This m4 file contains nastiness which conflicts with libtool 2.2.2 17 # This m4 file contains nastiness which conflicts with libtool 2.2.2
20 rm ${S}/m4/lib-link.m4 || true 18 rm ${S}/m4/lib-link.m4 || true
diff --git a/meta/packages/gstreamer/gst-plugins.inc b/meta/packages/gstreamer/gst-plugins.inc
index 9146d3eb85..bc7a373619 100644
--- a/meta/packages/gstreamer/gst-plugins.inc
+++ b/meta/packages/gstreamer/gst-plugins.inc
@@ -14,19 +14,20 @@ EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples "
14acpaths = "-I ${S}/common/m4 -I ${S}/m4" 14acpaths = "-I ${S}/common/m4 -I ${S}/m4"
15 15
16LIBV = "0.10" 16LIBV = "0.10"
17PACKAGES_DYNAMIC = "gst-plugin-*"
18#FILES_${PN} += "${libdir}/gstreamer-${LIBV}/*.so" 17#FILES_${PN} += "${libdir}/gstreamer-${LIBV}/*.so"
19#FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/*.la ${libdir}/gstreamer-${LIBV}/*.a" 18#FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/*.la ${libdir}/gstreamer-${LIBV}/*.a"
20FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug" 19FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug"
21 20
21PACKAGES_DYNAMIC = "${PN}-*"
22
22python populate_packages_prepend () { 23python populate_packages_prepend () {
23 gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d) 24 gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
24 postinst = bb.data.getVar('plugin_postinst', d, 1) 25 postinst = bb.data.getVar('plugin_postinst', d, 1)
25 26
26# Can't package separate debug packages yet 27# Can't package separate debug packages yet
27# do_split_packages(d, gst_libdir, '\.debug/libgst(.*)\.so$', 'gst-plugin-%s-dbg', 'GStreamer plugin for %s (with debugging symbols)', recursive=True, extra_depends=bb.data.expand('${PN}-dbg', d), match_path=True) 28# do_split_packages(d, gst_libdir, '\.debug/libgst(.*)\.so$', '${PN}-%s-dbg', 'GStreamer plugin for %s (with debugging symbols)', recursive=True, extra_depends=bb.data.expand('${PN}-dbg', d), match_path=True)
28 do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst, extra_depends=bb.data.expand('${PN}',d)) 29 do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', '${PN}-%s', 'GStreamer plugin for %s', postinst=postinst, extra_depends=bb.data.expand('${PN}',d))
29 do_split_packages(d, gst_libdir, 'libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)', extra_depends=bb.data.expand('${PN}-dev',d)) 30 do_split_packages(d, gst_libdir, 'libgst(.*)\.l?a$', '${PN}-%s-dev', 'GStreamer plugin for %s (development files)', extra_depends=bb.data.expand('${PN}-dev',d))
30} 31}
31 32
32ALLOW_EMPTY = "1" 33ALLOW_EMPTY = "1"