diff options
| author | Chris Lord <chris@openedhand.com> | 2006-09-11 19:53:06 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2006-09-11 19:53:06 +0000 |
| commit | b015278dc1724fec20f94a6de1074cbef208adda (patch) | |
| tree | 0b8c1b83bb925bb7eaf7a80061111243cb415a1e | |
| parent | 117d6257936b4efebd82762ff825412e95637170 (diff) | |
| download | openembedded-core-b015278dc1724fec20f94a6de1074cbef208adda.tar.gz openembedded-core-b015278dc1724fec20f94a6de1074cbef208adda.tar.bz2 openembedded-core-b015278dc1724fec20f94a6de1074cbef208adda.zip | |
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
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 @@ require gst-plugins.inc DEPENDS += "gst-plugins-base libmusicbrainz" -PR = "r1" +PR = "r2" EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl \ --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" RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ gnome-vfs-plugin-sftp" PROVIDES_${PN} += "gst-plugins" -PR = "r2" +PR = "r3" EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-theora" 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 @@ require gst-plugins.inc DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ speex" -PR = "r2" +PR = "r3" EXTRA_OECONF += " --with-plugins=ximagesrc,cairo,flac,gconfelements,gdkpixbuf,jpeg,png,speex,taglib,avi,matroska,videofilter,autodetect,debug --disable-aalib --disable-esd --disable-shout2" 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 @@ require gst-plugins.inc DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame" -PR = "r2" +PR = "r3" SRC_URI += " file://lame-autoconf.patch;patch=1" EXTRA_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" LIBV = "0.10" PACKAGES_DYNAMIC = "gst-plugin-*" +#FILES_${PN} += "${libdir}/gstreamer-${LIBV}/*.so" +#FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/*.la ${libdir}/gstreamer-${LIBV}/*.a" +FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug" python populate_packages_prepend () { gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d) postinst = bb.data.getVar('plugin_postinst', d, 1) - do_split_packages(d, gst_libdir, '^libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst) - do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)') +# Can't package separate debug packages yet +# 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) + do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst, extra_depends=bb.data.expand('${PN}',d)) + 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)) } #do_stage() { |