mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl/build: use the brcm GL libraries on the rpi

Browse source 
Upstream RPi has moved to a completely separate GL library names now due
to conflicts.

See https://github.com/RPi-Distro/repo/issues/134

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/898>
This commit is contained in:
Matthew Waters 2020-10-28 23:26:27 +11:00 committed by GStreamer Merge Bot
parent e2a1aa44df
commit 1516275413
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gst-libs/gst/gl/meson.build
View file

@ -371,6 +371,17 @@ if need_api_opengl != 'no' or need_platform_glx != 'no'
endif endif
endif endif
bcm_host_dep = unneeded_dep
if need_win_dispmanx != 'no'
# Try pkg-config for bcm_host then fallback to find_library to also
# support older distribution
bcm_host_dep = dependency('bcm_host', required : false)
if not bcm_host_dep.found()
bcm_host_dep = cc.find_library('bcm_host', required : false)
endif
endif
# GLES2 checks # GLES2 checks
gles2_dep = unneeded_dep gles2_dep = unneeded_dep
gles3_h = false gles3_h = false
@ -379,7 +390,12 @@ if need_api_gles2 != 'no'
if host_system == 'ios' if host_system == 'ios'
gles2_dep = dependency('appleframeworks', modules : ['OpenGLES'], required : false) gles2_dep = dependency('appleframeworks', modules : ['OpenGLES'], required : false)
else else
gles2_dep = dependency('glesv2', required : false) if bcm_host_dep.found()
gles2_dep = dependency('brcmglesv2', required : false)
endif
if not gles2_dep.found()
gles2_dep = dependency('glesv2', required : false)
endif
endif endif
if not gles2_dep.found() if not gles2_dep.found()
@ -475,7 +491,12 @@ endif
# EGL checks # EGL checks
egl_dep = unneeded_dep egl_dep = unneeded_dep
if need_platform_egl != 'no' if need_platform_egl != 'no'
egl_dep = dependency('egl', required : false) if bcm_host_dep.found()
egl_dep = dependency('brcmegl', required : false)
endif
if not egl_dep.found()
egl_dep = dependency('egl', required : false)
endif
if not egl_dep.found() if not egl_dep.found()
egl_dep = cc.find_library('EGL', required : false) egl_dep = cc.find_library('EGL', required : false)
endif endif
@ -644,16 +665,7 @@ if need_win_x11 != 'no'
endif endif
endif endif
bcm_host_dep = unneeded_dep
if need_win_dispmanx != 'no' if need_win_dispmanx != 'no'
# Try pkg-config for bcm_host then fallback to find_library to also
# support older distribution
bcm_host_dep = dependency('bcm_host', required : false)
if not bcm_host_dep.found()
bcm_host_dep = cc.find_library('bcm_host', required : false)
endif
if bcm_host_dep.found() if bcm_host_dep.found()
if not egl_dep.found() if not egl_dep.found()
error('dispmanx requires the use of egl') error('dispmanx requires the use of egl')