mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 15:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

wayland: avoid prefix clash in combined pkg-config check

Browse source 
Adittionally, remove leftover WAYLAND_DRM_ include flags var

Fixes building of ext/wayland/* broken by dfd86de67a

Related to:

https://bugzilla.gnome.org/show_bug.cgi?id=773927
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2016-11-17 11:19:54 -08:00
parent 0f657cec07
commit 7c64ea4832
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -1549,7 +1549,7 @@ dnl Vulkan
PKG_CHECK_MODULES(XCB, xcb >= 1.10, GST_VULKAN_HAVE_WINDOW_XCB=1, GST_VULKAN_HAVE_WINDOW_XCB=0)
AM_CONDITIONAL(USE_XCB, test "x$GST_VULKAN_HAVE_WINDOW_XCB" = "x1")
PKG_CHECK_MODULES(WAYLAND, wayland-client >= 1.4, GST_VULKAN_HAVE_WINDOW_WAYLAND=1, GST_VULKAN_HAVE_WINDOW_WAYLAND=0)
PKG_CHECK_MODULES(VULKAN_WAYLAND, wayland-client >= 1.4, GST_VULKAN_HAVE_WINDOW_WAYLAND=1, GST_VULKAN_HAVE_WINDOW_WAYLAND=0)
AM_CONDITIONAL(USE_WAYLAND, test "x$GST_VULKAN_HAVE_WINDOW_WAYLAND" = "x1")
VULKAN_CONFIG_DEFINES="
#define GST_VULKAN_HAVE_WINDOW_XCB $GST_VULKAN_HAVE_WINDOW_XCB

4
ext/vulkan/wayland/Makefile.am
View file

@ -19,10 +19,10 @@ libgstvulkan_wayland_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \
$(WAYLAND_CFLAGS)
$(VULKAN_WAYLAND_CFLAGS)
libgstvulkan_wayland_la_LIBADD = \
$(WAYLAND_LIBS)
$(VULKAN_WAYLAND_LIBS)
libgstvulkan_wayland_la_LDFLAGS = \
$(GST_LIB_LDFLAGS) \

3
ext/wayland/Makefile.am
View file

@ -23,8 +23,7 @@ libgstwaylandsink_la_CFLAGS = \
$(GST_PLUGINS_BAD_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS) \
$(WAYLAND_CFLAGS) \
$(WAYLAND_DRM_CFLAGS)
$(WAYLAND_CFLAGS)
libgstwaylandsink_la_LIBADD = \
$(top_builddir)/gst-libs/gst/wayland/libgstwayland-$(GST_API_VERSION).la \
$(GST_PLUGINS_BASE_LIBS) \