summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChris Lord <chris@openedhand.com>2006-09-11 19:53:06 +0000
committerChris Lord <chris@openedhand.com>2006-09-11 19:53:06 +0000
commitb015278dc1724fec20f94a6de1074cbef208adda (patch)
tree0b8c1b83bb925bb7eaf7a80061111243cb415a1e /meta
parent117d6257936b4efebd82762ff825412e95637170 (diff)
downloadpoky-b015278dc1724fec20f94a6de1074cbef208adda.tar.gz
Fix gst-plugin-* depending on gst-plugins-*-dbg
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@703 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb2
-rw-r--r--meta/packages/gstreamer/gst-plugins-base_0.10.9.bb2
-rw-r--r--meta/packages/gstreamer/gst-plugins-good_0.10.4.bb2
-rw-r--r--meta/packages/gstreamer/gst-plugins-ugly_0.10.4.bb2
-rw-r--r--meta/packages/gstreamer/gst-plugins.inc9
5 files changed, 11 insertions, 6 deletions
diff --git a/meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb b/meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb
index cc3fde3e29..ecffc245ad 100644
--- a/meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb
+++ b/meta/packages/gstreamer/gst-plugins-bad_0.10.3.bb
@@ -1,6 +1,6 @@
1require gst-plugins.inc 1require gst-plugins.inc
2DEPENDS += "gst-plugins-base libmusicbrainz" 2DEPENDS += "gst-plugins-base libmusicbrainz"
3PR = "r1" 3PR = "r2"
4 4
5EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl \ 5EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl \
6 --with-plugins=musicbrainz,wavpack" 6 --with-plugins=musicbrainz,wavpack"
diff --git a/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb b/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb
index db947a3394..541b75f6a1 100644
--- a/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb
+++ b/meta/packages/gstreamer/gst-plugins-base_0.10.9.bb
@@ -3,7 +3,7 @@ DEPENDS += "libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis tremor"
3RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ 3RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \
4 gnome-vfs-plugin-sftp" 4 gnome-vfs-plugin-sftp"
5PROVIDES_${PN} += "gst-plugins" 5PROVIDES_${PN} += "gst-plugins"
6PR = "r2" 6PR = "r3"
7 7
8EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-theora" 8EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-theora"
9 9
diff --git a/meta/packages/gstreamer/gst-plugins-good_0.10.4.bb b/meta/packages/gstreamer/gst-plugins-good_0.10.4.bb
index e0375cc8c0..7ce0c390db 100644
--- a/meta/packages/gstreamer/gst-plugins-good_0.10.4.bb
+++ b/meta/packages/gstreamer/gst-plugins-good_0.10.4.bb
@@ -1,7 +1,7 @@
1require gst-plugins.inc 1require gst-plugins.inc
2DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ 2DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
3 speex" 3 speex"
4PR = "r2" 4PR = "r3"
5 5
6EXTRA_OECONF += " --with-plugins=ximagesrc,cairo,flac,gconfelements,gdkpixbuf,jpeg,png,speex,taglib,avi,matroska,videofilter,autodetect,debug --disable-aalib --disable-esd --disable-shout2" 6EXTRA_OECONF += " --with-plugins=ximagesrc,cairo,flac,gconfelements,gdkpixbuf,jpeg,png,speex,taglib,avi,matroska,videofilter,autodetect,debug --disable-aalib --disable-esd --disable-shout2"
7 7
diff --git a/meta/packages/gstreamer/gst-plugins-ugly_0.10.4.bb b/meta/packages/gstreamer/gst-plugins-ugly_0.10.4.bb
index eb1bf8b57d..56f46d7137 100644
--- a/meta/packages/gstreamer/gst-plugins-ugly_0.10.4.bb
+++ b/meta/packages/gstreamer/gst-plugins-ugly_0.10.4.bb
@@ -1,6 +1,6 @@
1require gst-plugins.inc 1require gst-plugins.inc
2DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame" 2DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame"
3PR = "r2" 3PR = "r3"
4 4
5SRC_URI += " file://lame-autoconf.patch;patch=1" 5SRC_URI += " file://lame-autoconf.patch;patch=1"
6EXTRA_OECONF += "--with-plugins=a52dec,lame,id3tag,mad,mpeg2dec,mpegstream,mpegaudioparse,asfdemux,realmedia" 6EXTRA_OECONF += "--with-plugins=a52dec,lame,id3tag,mad,mpeg2dec,mpegstream,mpegaudioparse,asfdemux,realmedia"
diff --git a/meta/packages/gstreamer/gst-plugins.inc b/meta/packages/gstreamer/gst-plugins.inc
index f5e60edb4c..ed04aa473f 100644
--- a/meta/packages/gstreamer/gst-plugins.inc
+++ b/meta/packages/gstreamer/gst-plugins.inc
@@ -14,13 +14,18 @@ acpaths = "-I ${S}/common/m4 -I ${S}/m4"
14 14
15LIBV = "0.10" 15LIBV = "0.10"
16PACKAGES_DYNAMIC = "gst-plugin-*" 16PACKAGES_DYNAMIC = "gst-plugin-*"
17#FILES_${PN} += "${libdir}/gstreamer-${LIBV}/*.so"
18#FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/*.la ${libdir}/gstreamer-${LIBV}/*.a"
19FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug"
17 20
18python populate_packages_prepend () { 21python populate_packages_prepend () {
19 gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d) 22 gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
20 postinst = bb.data.getVar('plugin_postinst', d, 1) 23 postinst = bb.data.getVar('plugin_postinst', d, 1)
21 24
22 do_split_packages(d, gst_libdir, '^libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst) 25# Can't package separate debug packages yet
23 do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)') 26# 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)
27 do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst, extra_depends=bb.data.expand('${PN}',d))
28 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))
24} 29}
25 30
26#do_stage() { 31#do_stage() {