summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-package.inc40
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc12
2 files changed, 26 insertions, 26 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
index 4572265ef4..f26aca5c85 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
@@ -1,27 +1,27 @@
1LIBV = "0.10" 1LIBV = "0.10"
2 2
3python populate_packages_prepend () { 3python populate_packages_prepend () {
4 gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}') 4 gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}')
5 postinst = d.getVar('plugin_postinst', True) 5 postinst = d.getVar('plugin_postinst', True)
6 glibdir = d.getVar('libdir', True) 6 glibdir = d.getVar('libdir', True)
7 7
8 do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True) 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$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) 9 do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}'))
10 do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', d.expand('${PN}-%s-dev'), 'GStreamer plugin for %s (development files)', extra_depends=d.expand('${PN}-dev')) 10 do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', d.expand('${PN}-%s-dev'), 'GStreamer plugin for %s (development files)', extra_depends=d.expand('${PN}-dev'))
11 do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer plugin for %s (static development files)', extra_depends=d.expand('${PN}-staticdev')) 11 do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer plugin for %s (static development files)', extra_depends=d.expand('${PN}-staticdev'))
12 12
13 pn = d.getVar('PN', True) 13 pn = d.getVar('PN', True)
14 metapkg = pn + '-meta' 14 metapkg = pn + '-meta'
15 d.setVar('ALLOW_EMPTY_' + metapkg, "1") 15 d.setVar('ALLOW_EMPTY_' + metapkg, "1")
16 d.setVar('FILES_' + metapkg, "") 16 d.setVar('FILES_' + metapkg, "")
17 blacklist = [ pn + '-locale', pn + '-dev', pn + '-dbg', pn + '-doc' ] 17 blacklist = [ pn + '-locale', pn + '-dev', pn + '-dbg', pn + '-doc' ]
18 metapkg_rdepends = [] 18 metapkg_rdepends = []
19 packages = d.getVar('PACKAGES', True).split() 19 packages = d.getVar('PACKAGES', True).split()
20 for pkg in packages[1:]: 20 for pkg in packages[1:]:
21 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('-staticdev'): 21 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('-staticdev'):
22 metapkg_rdepends.append(pkg) 22 metapkg_rdepends.append(pkg)
23 d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) 23 d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
24 d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package') 24 d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package')
25} 25}
26 26
27ALLOW_EMPTY = "1" 27ALLOW_EMPTY = "1"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index c3d6d9858e..ca8b71e952 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -74,10 +74,10 @@ FILES_libpulse = "${libdir}/libpulse.so.*"
74FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*" 74FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*"
75FILES_libpulse-browse = "${libdir}/libpulse-browse.so.*" 75FILES_libpulse-browse = "${libdir}/libpulse-browse.so.*"
76FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" 76FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*"
77 77
78FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \ 78FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \
79 ${libdir}/pulse-${PV}/modules/.debug" 79 ${libdir}/pulse-${PV}/modules/.debug"
80FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake" 80FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake"
81FILES_${PN}-conf = "${sysconfdir}" 81FILES_${PN}-conf = "${sysconfdir}"
82FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse" 82FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse"
83FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl ${base_libdir}/udev/rules.d/*.rules" 83FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl ${base_libdir}/udev/rules.d/*.rules"
@@ -105,11 +105,11 @@ pkg_postinst_${PN}-server() {
105} 105}
106 106
107python populate_packages_prepend() { 107python populate_packages_prepend() {
108 #d.setVar('PKG_pulseaudio', 'pulseaudio') 108 #d.setVar('PKG_pulseaudio', 'pulseaudio')
109 109
110 plugindir = d.expand('${libdir}/pulse-${PV}/modules/') 110 plugindir = d.expand('${libdir}/pulse-${PV}/modules/')
111 do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' ) 111 do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' )
112 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' ) 112 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
113} 113}
114 114
115RDEPENDS_pulseaudio-module-console-kit =+ "consolekit" 115RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"