mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

wayland: include drm_fourcc.h properly and fix build

Browse source
This commit is contained in:
Tim-Philipp Müller 2016-11-04 00:52:41 +00:00
parent dc6862bf70
commit 9229e34a6b
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -2219,6 +2219,7 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_WAYLAND, true)
AC_PATH_PROG([wayland_scanner], [wayland-scanner]) AC_PATH_PROG([wayland_scanner], [wayland-scanner])
AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [ AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [
PKG_CHECK_MODULES(WAYLAND, wayland-client >= 1.4.0, [ 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, [ PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, wayland-protocols >= 1.4, [
if test "x$wayland_scanner" != "x"; then if test "x$wayland_scanner" != "x"; then
HAVE_WAYLAND="yes" HAVE_WAYLAND="yes"

6
ext/wayland/Makefile.am
View file

@ -23,13 +23,15 @@ libgstwaylandsink_la_CFLAGS = \
$(GST_PLUGINS_BAD_CFLAGS) \ $(GST_PLUGINS_BAD_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS) \ $(GST_CFLAGS) \
$(WAYLAND_CFLAGS) $(WAYLAND_CFLAGS) \
$(WAYLAND_DRM_CFLAGS)
libgstwaylandsink_la_LIBADD = \ libgstwaylandsink_la_LIBADD = \
$(top_builddir)/gst-libs/gst/wayland/libgstwayland-$(GST_API_VERSION).la \ $(top_builddir)/gst-libs/gst/wayland/libgstwayland-$(GST_API_VERSION).la \
$(GST_PLUGINS_BASE_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \
-lgstvideo-$(GST_API_VERSION) \ -lgstvideo-$(GST_API_VERSION) \
-lgstallocators-$(GST_API_VERSION) \ -lgstallocators-$(GST_API_VERSION) \
$(WAYLAND_LIBS) $(WAYLAND_LIBS) \
$(WAYLAND_DRM_LIBS)
libgstwaylandsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstwaylandsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstwaylandsink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) libgstwaylandsink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)

2
ext/wayland/wlvideoformat.h
View file

@ -26,7 +26,7 @@
#include <wayland-client-protocol.h> #include <wayland-client-protocol.h>
#include <gst/video/video.h> #include <gst/video/video.h>
#include <drm/drm_fourcc.h> #include <drm_fourcc.h>
G_BEGIN_DECLS G_BEGIN_DECLS