summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb5
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.22.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-package.inc9
3 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
index a1b7cbbe53..5ee5066d87 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
@@ -23,7 +23,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
23SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" 23SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4"
24SRC_URI[sha256sum] = "76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62" 24SRC_URI[sha256sum] = "76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62"
25 25
26PR = "r0" 26PR = "r1"
27 27
28EXTRA_OECONF = "--with-ffmpeg-extra-configure=\"--target-os=linux\" " 28EXTRA_OECONF = "--with-ffmpeg-extra-configure=\"--target-os=linux\" "
29 29
@@ -33,7 +33,8 @@ EXTRA_OECONF_append_x86 = " --disable-yasm "
33 33
34FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" 34FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
35FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" 35FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
36FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" 36FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
37FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a"
37 38
38# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg 39# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
39CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}" 40CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}"
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.22.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.22.bb
index ec067b8f37..56c54b5529 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.22.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.22.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
8 8
9DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg" 9DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg"
10 10
11PR = "r0" 11PR = "r1"
12 12
13inherit gettext 13inherit gettext
14 14
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
index 8ff9f82fb4..a71d8962af 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
@@ -7,7 +7,8 @@ python populate_packages_prepend () {
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$', bb.data.expand('${PN}-%s', d), 'GStreamer plugin for %s', postinst=postinst, extra_depends=bb.data.expand('${PN}',d)) 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)) 10 do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', bb.data.expand('${PN}-%s-dev', d), 'GStreamer plugin for %s (development files)', extra_depends=bb.data.expand('${PN}-dev',d))
11 do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', bb.data.expand('${PN}-%s-staticdev', d), 'GStreamer plugin for %s (static development files)', extra_depends=bb.data.expand('${PN}-staticdev',d))
11 12
12 pn = d.getVar('PN', 1) 13 pn = d.getVar('PN', 1)
13 metapkg = pn + '-meta' 14 metapkg = pn + '-meta'
@@ -17,7 +18,7 @@ python populate_packages_prepend () {
17 metapkg_rdepends = [] 18 metapkg_rdepends = []
18 packages = d.getVar('PACKAGES', 1).split() 19 packages = d.getVar('PACKAGES', 1).split()
19 for pkg in packages[1:]: 20 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 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 metapkg_rdepends.append(pkg) 22 metapkg_rdepends.append(pkg)
22 d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) 23 d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
23 d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package') 24 d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package')
@@ -25,10 +26,10 @@ python populate_packages_prepend () {
25 26
26ALLOW_EMPTY = "1" 27ALLOW_EMPTY = "1"
27 28
28PACKAGES += "${PN}-apps ${PN}-meta" 29PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib"
29FILES_${PN}-apps = "${bindir}" 30FILES_${PN}-apps = "${bindir}"
30 31
31FILES_${PN} = "${datadir}/gstreamer-${LIBV}" 32FILES_${PN} = "${datadir}/gstreamer-${LIBV}"
32FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug" 33FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug"
33 34FILES_${PN}-glib = "${datadir}/glib-2.0"
34 35