projects
/
platform
/
upstream
/
gst-plugins-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
92048b8
)
gl/build/meson: fix gl_api variable names
author
Matthew Waters
<matthew@centricular.com>
Mon, 5 Feb 2018 03:56:07 +0000
(14:56 +1100)
committer
Matthew Waters
<matthew@centricular.com>
Mon, 5 Feb 2018 03:56:07 +0000
(14:56 +1100)
gst-libs/gst/gl/meson.build
patch
|
blob
|
history
diff --git
a/gst-libs/gst/gl/meson.build
b/gst-libs/gst/gl/meson.build
index
c6e9e03
..
18075c1
100644
(file)
--- a/
gst-libs/gst/gl/meson.build
+++ b/
gst-libs/gst/gl/meson.build
@@
-370,9
+370,9
@@
if gles2_dep.found() and gl_dep.found()
# https://github.com/mesonbuild/meson/issues/2364 is fixed
if not cc.compiles(gl_include_block + '\n' + 'void f (void) {}',dependencies : [gles2_dep, gl_dep])
message ('Cannot include both OpenGL and OpenGL ES headers')
- if need_gles2 != 'yes'
+ if need_
api_
gles2 != 'yes'
gles2_dep = unneeded_dep
- elif need_opengl != 'yes'
+ elif need_
api_
opengl != 'yes'
gl_dep = unneeded_dep
else
error('Both OpenGL and OpenGL ES were requested but cannot be included together')