vaapi: prefix USE_FOO defines to fix build with mesa 22.3.0
authorTim-Philipp Müller <tim@centricular.com>
Sat, 10 Dec 2022 13:11:08 +0000 (13:11 +0000)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Sun, 11 Dec 2022 08:58:23 +0000 (08:58 +0000)
commit4d70b9f87c9f0f7a9a91018ea844b5bfd1e9b03b
treea7d6525c61be7abbe7b22616e56cc9fb7cf3d96e
parent4aeb3def20a528436cbeb9906d537738bc098abf
vaapi: prefix USE_FOO defines to fix build with mesa 22.3.0

Apparently mesa 22.3.0 has updated the egl headers, and eglplatform.h now
contains commit
https://github.com/KhronosGroup/EGL-Registry/pull/130/commits/3670d645f4a26a0a9e87e7f3a8608e7cc1d53b5b
after which xlib headers don't get included by default anymore but are
dependent upon whether USE_X11 was defined.

This breaks headless builds of gstreamer-vaapi because we always define
an internal define USE_X11 as either 1 or 0.

Change these defines to GST_VAAPI_USE_XYZ instead to avoid this.

Fixes #1634

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3555>
19 files changed:
subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/gstvaapicontext.c
subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/gstvaapidisplay.c
subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/gstvaapidisplay_egl.c
subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/gstvaapisurface_egl.c
subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/video-format.c
subprojects/gstreamer-vaapi/gst/vaapi/gstvaapi.c
subprojects/gstreamer-vaapi/gst/vaapi/gstvaapidecode.c
subprojects/gstreamer-vaapi/gst/vaapi/gstvaapidecodebin.c
subprojects/gstreamer-vaapi/gst/vaapi/gstvaapipluginbase.c
subprojects/gstreamer-vaapi/gst/vaapi/gstvaapipluginutil.c
subprojects/gstreamer-vaapi/gst/vaapi/gstvaapipostproc.c
subprojects/gstreamer-vaapi/gst/vaapi/gstvaapisink.c
subprojects/gstreamer-vaapi/gst/vaapi/gstvaapivideobufferpool.c
subprojects/gstreamer-vaapi/gst/vaapi/gstvaapivideocontext.c
subprojects/gstreamer-vaapi/gst/vaapi/gstvaapivideometa_texture.c
subprojects/gstreamer-vaapi/meson.build
subprojects/gstreamer-vaapi/tests/internal/output.c
subprojects/gstreamer-vaapi/tests/internal/test-display.c
subprojects/gstreamer-vaapi/tests/internal/test-windows.c