diff options
| author | Carlos Rafael Giani <dv@pseudoterminal.org> | 2014-08-27 16:47:03 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-28 15:12:43 +0100 |
| commit | 49ade79ec243bac49fea21667037ee29a8ccb82f (patch) | |
| tree | 94bd43404a5973483047a58d0d6011206dbac956 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad | |
| parent | f0f50a97839cb3b9a9c67280c119ea5c2ec336e0 (diff) | |
| download | poky-49ade79ec243bac49fea21667037ee29a8ccb82f.tar.gz | |
gstreamer1.0-plugins-bad: Fix GL/GLES configuration
* Replace --disable/enable-gl with the individual EGL, GLES, GL switches
(--disable-gl turns off GL support entirely)
* Put the default opengl packageconfig into its own variable to make it
easier for distros and BSP layers to define what to use (GL, GLES,
or neither)
* Add libglu as a dependency for desktop GL
* Patch configure.ac to ensure libraries are only searched and linked to
if the corresponding API isn't disabled (this prevents cases where
libgstgl is linked to GLU even though desktop GL is dis- and GLES
enabled)
(From OE-Core rev: 7bf062f2e2b92c2401fa2386b6281aae023b21a8)
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad')
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch | 41 |
1 files changed, 41 insertions, 0 deletions
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 | |||