diff options
3 files changed, 51 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc index 8a7c5c1d62..52ef3b8486 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | |||
@@ -8,19 +8,24 @@ S = "${WORKDIR}/gst-plugins-bad-${PV}" | |||
8 | 8 | ||
9 | inherit gettext | 9 | inherit gettext |
10 | 10 | ||
11 | # opengl packageconfig factored out to make it easy for distros | ||
12 | # and BSP layers to pick either (desktop) opengl, gles2, or no GL | ||
13 | PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}" | ||
11 | 14 | ||
12 | PACKAGECONFIG ??= " \ | 15 | PACKAGECONFIG ??= " \ |
16 | ${PACKAGECONFIG_GL} \ | ||
13 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ | 17 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ |
14 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)} \ | ||
15 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ | 18 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ |
16 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ | 19 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ |
17 | orc curl uvch264 neon sndfile \ | 20 | orc curl uvch264 neon sndfile \ |
18 | hls sbc dash bz2 smoothstreaming \ | 21 | hls sbc dash bz2 smoothstreaming \ |
19 | " | 22 | " |
23 | |||
20 | # dash = Dynamic Adaptive Streaming over HTTP | 24 | # dash = Dynamic Adaptive Streaming over HTTP |
21 | PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass" | 25 | PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass" |
22 | PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" | 26 | PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" |
23 | PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,virtual/egl virtual/libgles2" | 27 | PACKAGECONFIG[gles2] = "--enable-gles2 --enable-egl,--disable-gles2 --disable-egl,virtual/libgles2 virtual/egl" |
28 | PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu" | ||
24 | PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac" | 29 | PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac" |
25 | PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2" | 30 | PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2" |
26 | PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" | 31 | PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch new file mode 100644 index 0000000000..042a32c04d --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From deba0da45ec821209a7ed148a4521d562e6512cd Mon Sep 17 00:00:00 2001 | ||
2 | From: Carlos Rafael Giani <dv@pseudoterminal.org> | ||
3 | Date: Wed, 27 Aug 2014 14:47:25 +0200 | ||
4 | Subject: [PATCH] gl: do not check for GL/GLU/EGL/GLES2 libs if disabled in | ||
5 | configuration | ||
6 | |||
7 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=735522] | ||
8 | |||
9 | Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> | ||
10 | --- | ||
11 | configure.ac | 14 ++++++++++---- | ||
12 | 1 file changed, 10 insertions(+), 4 deletions(-) | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index 1a46afb..e85d4ba 100644 | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -661,10 +661,16 @@ case $host in | ||
19 | fi | ||
20 | ;; | ||
21 | *) | ||
22 | - AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h) | ||
23 | - AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h) | ||
24 | - AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h) | ||
25 | - AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h) | ||
26 | + if test "x$NEED_GL" != "xno"; then | ||
27 | + AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h) | ||
28 | + AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h) | ||
29 | + fi | ||
30 | + if test "x$NEED_GLES2" != "xno"; then | ||
31 | + AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h) | ||
32 | + fi | ||
33 | + if test "x$NEED_EGL" != "xno"; then | ||
34 | + AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h) | ||
35 | + fi | ||
36 | |||
37 | old_LIBS=$LIBS | ||
38 | old_CFLAGS=$CFLAGS | ||
39 | -- | ||
40 | 1.8.3.2 | ||
41 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.0.bb index e6edb26736..ff92f097f4 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.0.bb | |||
@@ -4,6 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \ | |||
4 | file://gst/tta/filters.h;beginline=12;endline=29;md5=8a08270656f2f8ad7bb3655b83138e5a \ | 4 | file://gst/tta/filters.h;beginline=12;endline=29;md5=8a08270656f2f8ad7bb3655b83138e5a \ |
5 | file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \ | 5 | file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \ |
6 | file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50" | 6 | file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50" |
7 | |||
8 | SRC_URI += "file://0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch" | ||
9 | |||
7 | SRC_URI[md5sum] = "3bc0fcfe8d16ad1295f0454c1fcb4ba3" | 10 | SRC_URI[md5sum] = "3bc0fcfe8d16ad1295f0454c1fcb4ba3" |
8 | SRC_URI[sha256sum] = "ff2cb754f7725b205aec66002b1406e440f3a03194b6cad2d126ef5cd00902f9" | 11 | SRC_URI[sha256sum] = "ff2cb754f7725b205aec66002b1406e440f3a03194b6cad2d126ef5cd00902f9" |
9 | S = "${WORKDIR}/gst-plugins-bad-${PV}" | 12 | S = "${WORKDIR}/gst-plugins-bad-${PV}" |