summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb1
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc9
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0.inc8
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb1
6 files changed, 20 insertions, 7 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index a8bff19b1c..9e2b94ede8 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -6,6 +6,10 @@ DEPENDS += "gstreamer1.0-plugins-base libpng jpeg"
6 6
7inherit gettext bluetooth 7inherit gettext bluetooth
8 8
9SRC_URI_append = " \
10 file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
11"
12
9# opengl packageconfig factored out to make it easy for distros 13# opengl packageconfig factored out to make it easy for distros
10# and BSP layers to pick either (desktop) opengl, gles2, or no GL 14# and BSP layers to pick either (desktop) opengl, gles2, or no GL
11PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}" 15PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb
index 323177b35a..8eb47c265f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb
@@ -20,7 +20,6 @@ SRC_URI = " \
20 file://configure-allow-to-disable-libssh2.patch \ 20 file://configure-allow-to-disable-libssh2.patch \
21 file://0001-glimagesink-Downrank-to-marginal.patch \ 21 file://0001-glimagesink-Downrank-to-marginal.patch \
22 file://0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch \ 22 file://0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch \
23 file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
24" 23"
25 24
26SRC_URI[md5sum] = "4857adcafe41e4b9b8805cf88303bd55" 25SRC_URI[md5sum] = "4857adcafe41e4b9b8805cf88303bd55"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index f0c80cef79..7381458f47 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -1,5 +1,12 @@
1require gstreamer1.0-plugins.inc 1require gstreamer1.0-plugins.inc
2 2
3SRC_URI_append = "\
4 file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
5 file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \
6 file://0003-riff-add-missing-include-directories-when-calling-in.patch \
7 file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \
8"
9
3LICENSE = "GPLv2+ & LGPLv2+" 10LICENSE = "GPLv2+ & LGPLv2+"
4 11
5DEPENDS += "iso-codes util-linux zlib" 12DEPENDS += "iso-codes util-linux zlib"
@@ -39,5 +46,5 @@ CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmm
39FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" 46FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
40 47
41do_compile_prepend() { 48do_compile_prepend() {
42 export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs" 49 export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs"
43} 50}
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb
index 287d287d70..429dc9338f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb
@@ -17,10 +17,6 @@ SRC_URI = " \
17 file://0004-subparse-set-need_segment-after-sink-pad-received-GS.patch \ 17 file://0004-subparse-set-need_segment-after-sink-pad-received-GS.patch \
18 file://encodebin-Need-more-buffers-in-output-queue-for-bett.patch \ 18 file://encodebin-Need-more-buffers-in-output-queue-for-bett.patch \
19 file://0005-convertframe-Support-video-crop-when-convert-frame.patch \ 19 file://0005-convertframe-Support-video-crop-when-convert-frame.patch \
20 file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
21 file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \
22 file://0003-riff-add-missing-include-directories-when-calling-in.patch \
23 file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \
24" 20"
25 21
26SRC_URI[md5sum] = "3ddde0ad598ef69f58d6a2e87f8b460f" 22SRC_URI[md5sum] = "3ddde0ad598ef69f58d6a2e87f8b460f"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
index e8f29ca549..10b4668e5f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
@@ -10,6 +10,14 @@ DEPENDS = "glib-2.0 glib-2.0-native libcap libxml2 bison-native flex-native"
10 10
11inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspection 11inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspection
12 12
13# This way common/m4/introspection.m4 will come first
14# (it has a custom INTROSPECTION_INIT macro, and so must be used instead of our common introspection.m4 file)
15acpaths = "-I ${S}/common/m4 -I ${S}/m4"
16
17SRC_URI_append = " \
18 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
19"
20
13PACKAGECONFIG ??= "" 21PACKAGECONFIG ??= ""
14 22
15PACKAGECONFIG[check] = "--enable-check,--disable-check" 23PACKAGECONFIG[check] = "--enable-check,--disable-check"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb
index a79f449d0b..ba1b83b08c 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
6SRC_URI = " \ 6SRC_URI = " \
7 http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ 7 http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
8 file://0001-Fix-crash-with-gst-inspect.patch \ 8 file://0001-Fix-crash-with-gst-inspect.patch \
9 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
10" 9"
11 10
12SRC_URI[md5sum] = "b4cdeb2b9cb20dd6ac022a4f417eae0d" 11SRC_URI[md5sum] = "b4cdeb2b9cb20dd6ac022a4f417eae0d"