wayland: include drm_fourcc.h properly and fix build

diff --git a/configure.ac b/configure.ac
index 3678f331b69c51e7276ab7af6412a1feac26c4c3..5b78bb99bace5f6685becd249b8758ac5e3a5c88 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2219,6 +2219,7 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_WAYLAND, true)
 AC_PATH_PROG([wayland_scanner], [wayland-scanner])
 AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [
   PKG_CHECK_MODULES(WAYLAND, wayland-client >= 1.4.0, [
+    PKG_CHECK_MODULES([WAYLAND_DRM], [libdrm >= 2.4.55])
     PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, wayland-protocols >= 1.4, [
       if test "x$wayland_scanner" != "x"; then
         HAVE_WAYLAND="yes"

diff --git a/ext/wayland/Makefile.am b/ext/wayland/Makefile.am
index 8442dbde0ddd5740ee822e37cbfb1d79c7dce318..458b5a502d60e17f60c367234b02312576b8e8d7 100644 (file)
--- a/ext/wayland/Makefile.am
+++ b/ext/wayland/Makefile.am
@@ -23,13 +23,15 @@ libgstwaylandsink_la_CFLAGS = \
        $(GST_PLUGINS_BAD_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_CFLAGS) \
-       $(WAYLAND_CFLAGS)
+       $(WAYLAND_CFLAGS) \
+       $(WAYLAND_DRM_CFLAGS)
 libgstwaylandsink_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/wayland/libgstwayland-$(GST_API_VERSION).la \
        $(GST_PLUGINS_BASE_LIBS) \
        -lgstvideo-$(GST_API_VERSION) \
        -lgstallocators-$(GST_API_VERSION) \
-       $(WAYLAND_LIBS)
+       $(WAYLAND_LIBS) \
+       $(WAYLAND_DRM_LIBS)
 libgstwaylandsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstwaylandsink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 

diff --git a/ext/wayland/wlvideoformat.h b/ext/wayland/wlvideoformat.h
index a0a1537ed2eba76ab4c3901cd1cd1d189a9799e7..331f582b1bb0c5f30a809a579a8481fece2d70bd 100644 (file)
--- a/ext/wayland/wlvideoformat.h
+++ b/ext/wayland/wlvideoformat.h
@@ -26,7 +26,7 @@
 
 #include <wayland-client-protocol.h>
 #include <gst/video/video.h>
-#include <drm/drm_fourcc.h>
+#include <drm_fourcc.h>
 
 G_BEGIN_DECLS