summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-07-28 11:44:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-08 13:41:19 +0100
commit2ac54c45196ae1409f60f0cc314208a0c422660b (patch)
tree59fbcdad7bd1d34afb471253fc2e5f0ce0e60db4
parent35fa8dc5f7da90fdd40091a3c3600d3fcd232922 (diff)
downloadpoky-2ac54c45196ae1409f60f0cc314208a0c422660b.tar.gz
gst-plugins: partially sync packaging with OE .dev
Gst-plugins get 2 extra packages: ${PN}-apps: helper apps in ${bindir} ${PN}-meta: meta package that will drag in all plugins, libs and apps ${PN} generates And all libs are split out and run through debian style renaming if enabled. The packaging include was split out to be reused by external plugins (e.g. gst-plugin-gl, gst-fluendo-*). The new package list looks like: libgstapp-0.10-0_0.10.32-r1_armv7a.ipk libgstfft-0.10-0_0.10.32-r1_armv7a.ipk [..] gst-plugins-base-videorate_0.10.32-r1_armv7a.ipk gst-plugins-base-videoscale_0.10.32-r1_armv7a.ipk [..] gst-plugins-base-meta_0.10.32-r1_armv7a.ipk [..] gst-plugins-base-apps_0.10.32-r1_armv7a.ipk (From OE-Core rev: 4bfd595934c1f6839ae848b09ecca439d92bf014) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.21.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-package.inc34
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.17.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins.inc18
6 files changed, 40 insertions, 20 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.21.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.21.bb
index 2b8a89cc05..a7023e3f82 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.21.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.21.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
9 9
10DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg" 10DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg"
11 11
12PR = "r0" 12PR = "r1"
13 13
14inherit gettext 14inherit gettext
15 15
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb
index a9e2b529b6..82d9afcb08 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb
@@ -13,7 +13,7 @@ SRC_URI += " file://gst-plugins-base-tremor.patch"
13SRC_URI[md5sum] = "2920af2b3162f3d9fbaa7fabc8ed4d38" 13SRC_URI[md5sum] = "2920af2b3162f3d9fbaa7fabc8ed4d38"
14SRC_URI[sha256sum] = "e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b" 14SRC_URI[sha256sum] = "e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b"
15 15
16PR = "r0" 16PR = "r1"
17 17
18inherit gettext 18inherit gettext
19 19
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.bb
index b9648e30df..cca63e923b 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
7 7
8DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ 8DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
9 speex libsoup-2.4" 9 speex libsoup-2.4"
10PR = "r0" 10PR = "r1"
11 11
12inherit gettext 12inherit gettext
13 13
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
new file mode 100644
index 0000000000..796df14a9e
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
@@ -0,0 +1,34 @@
1LIBV = "0.10"
2
3python populate_packages_prepend () {
4 gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
5 postinst = bb.data.getVar('plugin_postinst', d, 1)
6 glibdir = bb.data.expand('${libdir}', d)
7
8 do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True)
9 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))
10 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))
11
12 pn = bb.data.getVar('PN', d, 1)
13 metapkg = pn + '-meta'
14 bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
15 bb.data.setVar('FILES_' + metapkg, "", d)
16 blacklist = [ pn + '-locale', pn + '-dev', pn + '-dbg', pn + '-doc' ]
17 metapkg_rdepends = []
18 packages = bb.data.getVar('PACKAGES', d, 1).split()
19 for pkg in packages[1:]:
20 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'):
21 metapkg_rdepends.append(pkg)
22 bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
23 bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d)
24}
25
26ALLOW_EMPTY = "1"
27
28PACKAGES += "${PN}-apps ${PN}-meta"
29FILES_${PN}-apps = "${bindir}"
30
31FILES_${PN} = "${datadir}/gstreamer-${LIBV}"
32FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug"
33
34
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.17.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.17.bb
index 76e00a52b0..2a79c2a782 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.17.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.17.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
7 file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9" 7 file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9"
8 8
9DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame" 9DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame"
10PR = "r0" 10PR = "r1"
11 11
12inherit gettext 12inherit gettext
13 13
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index ad6c3a4cf6..b23d399349 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -14,13 +14,6 @@ EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples "
14 14
15acpaths = "-I ${S}/common/m4 -I ${S}/m4" 15acpaths = "-I ${S}/common/m4 -I ${S}/m4"
16 16
17LIBV = "0.10"
18#FILES_${PN} += "${libdir}/gstreamer-${LIBV}/*.so"
19#FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/*.la ${libdir}/gstreamer-${LIBV}/*.a"
20FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug"
21
22PACKAGES_DYNAMIC = "${PN}-*"
23
24# orc.m4 calls pkg-config ----variable=orcc orc-0.4 to get the path to orcc, 17# orc.m4 calls pkg-config ----variable=orcc orc-0.4 to get the path to orcc,
25# resulting in /usr/bin/orcc. Force it to use the staged orcc. 18# resulting in /usr/bin/orcc. Force it to use the staged orcc.
26do_configure_append() { 19do_configure_append() {
@@ -29,14 +22,7 @@ do_configure_append() {
29 done 22 done
30} 23}
31 24
32python populate_packages_prepend () { 25require gst-plugins-package.inc
33 gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
34 postinst = bb.data.getVar('plugin_postinst', d, 1)
35 26
36# Can't package separate debug packages yet 27PACKAGES_DYNAMIC = "${PN}-*"
37# do_split_packages(d, gst_libdir, '\.debug/libgst(.*)\.so$', bb.data.expand('${PN}-%s-dbg', d), 'GStreamer plugin for %s (with debugging symbols)', recursive=True, extra_depends=bb.data.expand('${PN}-dbg', d), match_path=True)
38 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))
39 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))
40}
41 28
42ALLOW_EMPTY = "1"