Fix build without X11 (again).

Don't try to build libgstvaapi-x11.so.* if X11 was disabled. Also shuffle
files list wrt. x11, glx and wayland backends.

diff --git a/configure.ac b/configure.ac
index ebcf69b..0f696dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -282,7 +282,7 @@ if test "$enable_x11" = "yes"; then
     PKG_CHECK_MODULES(X11, [x11], [USE_X11=1], [USE_X11=0])
     if test $USE_X11 -eq 1; then
         saved_CPPFLAGS="$CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $WAYLAND_CFLAGS"
+        CPPFLAGS="$CPPFLAGS $X11_CFLAGS"
         AC_CHECK_HEADERS([X11/Xlib.h X11/Xutil.h X11/Xatom.h], [:], [USE_X11=0])
         CPPFLAGS="$saved_CPPFLAGS"
     fi

diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index fc84e49..b9fc07d 100644 (file)
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -1,16 +1,17 @@
-lib_LTLIBRARIES =                              \
-       libgstvaapi-@GST_MAJORMINOR@.la         \
-       libgstvaapi-x11-@GST_MAJORMINOR@.la     \
-       $(NULL)
+lib_LTLIBRARIES = libgstvaapi-@GST_MAJORMINOR@.la
 
-if USE_WAYLAND
-lib_LTLIBRARIES += libgstvaapi-wayland-@GST_MAJORMINOR@.la
+if USE_X11
+lib_LTLIBRARIES += libgstvaapi-x11-@GST_MAJORMINOR@.la
 endif
 
 if USE_GLX
 lib_LTLIBRARIES += libgstvaapi-glx-@GST_MAJORMINOR@.la
 endif
 
+if USE_WAYLAND
+lib_LTLIBRARIES += libgstvaapi-wayland-@GST_MAJORMINOR@.la
+endif
+
 libgstvaapi_includedir =                       \
        $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/vaapi
 
@@ -109,6 +110,11 @@ libgstvaapi_source_priv_h =                        \
        sysdeps.h                               \
        $(NULL)
 
+if USE_JPEG_DECODER
+libgstvaapi_source_c += gstvaapidecoder_jpeg.c
+libgstvaapi_source_h += gstvaapidecoder_jpeg.h
+endif
+
 libgstvaapi_x11_source_c =                     \
        gstvaapidisplay_x11.c                   \
        gstvaapiutils.c                         \
@@ -128,23 +134,6 @@ libgstvaapi_x11_source_priv_h =                    \
        gstvaapiutils_x11.h                     \
        $(NULL)
 
-libgstvaapi_wayland_source_c =                 \
-       gstvaapidisplay_wayland.c               \
-       gstvaapiutils.c                         \
-       gstvaapiwindow_wayland.c                \
-       $(NULL)
-
-libgstvaapi_wayland_source_h =                 \
-       gstvaapidisplay_wayland.h               \
-       gstvaapiwindow_wayland.h                \
-       $(NULL)
-
-libgstvaapi_wayland_source_priv_h =            \
-       gstvaapicompat.h                        \
-       gstvaapidisplay_wayland_priv.h          \
-       gstvaapiutils.h                         \
-       $(NULL)
-
 libgstvaapi_glx_source_c =                     \
        gstvaapidisplay_glx.c                   \
        gstvaapitexture.c                       \
@@ -172,10 +161,22 @@ libgstvaapi_glx_source_priv_h =                   \
        gstvaapiutils_x11.h                     \
        $(NULL)
 
-if USE_JPEG_DECODER
-libgstvaapi_source_c   += gstvaapidecoder_jpeg.c
-libgstvaapi_source_h   += gstvaapidecoder_jpeg.h
-endif
+libgstvaapi_wayland_source_c =                 \
+       gstvaapidisplay_wayland.c               \
+       gstvaapiutils.c                         \
+       gstvaapiwindow_wayland.c                \
+       $(NULL)
+
+libgstvaapi_wayland_source_h =                 \
+       gstvaapidisplay_wayland.h               \
+       gstvaapiwindow_wayland.h                \
+       $(NULL)
+
+libgstvaapi_wayland_source_priv_h =            \
+       gstvaapicompat.h                        \
+       gstvaapidisplay_wayland_priv.h          \
+       gstvaapiutils.h                         \
+       $(NULL)
 
 if USE_LOCAL_CODEC_PARSERS
 libgstvaapi_libs += \
@@ -238,67 +239,67 @@ libgstvaapi_x11_@GST_MAJORMINOR@_la_LDFLAGS =     \
        $(GST_ALL_LDFLAGS)                      \
        $(NULL)
 
-libgstvaapi_wayland_@GST_MAJORMINOR@_la_SOURCES = \
-       $(libgstvaapi_wayland_source_c)         \
-       $(libgstvaapi_wayland_source_priv_h)    \
+libgstvaapi_glx_@GST_MAJORMINOR@_la_SOURCES =  \
+       $(libgstvaapi_glx_source_c)             \
+       $(libgstvaapi_glx_source_priv_h)        \
        $(NULL)
 
-libgstvaapi_wayland_@GST_MAJORMINOR@include_HEADERS = \
-       $(libgstvaapi_wayland_source_h)         \
+libgstvaapi_glx_@GST_MAJORMINOR@include_HEADERS = \
+       $(libgstvaapi_glx_source_h)             \
        $(NULL)
 
-libgstvaapi_wayland_@GST_MAJORMINOR@includedir = \
+libgstvaapi_glx_@GST_MAJORMINOR@includedir =   \
        $(libgstvaapi_includedir)
 
-libgstvaapi_wayland_@GST_MAJORMINOR@_la_CFLAGS = \
+libgstvaapi_glx_@GST_MAJORMINOR@_la_CFLAGS =   \
        -DGST_USE_UNSTABLE_API                  \
        -I$(top_srcdir)/gst-libs                \
        $(GLIB_CFLAGS)                          \
        $(GST_BASE_CFLAGS)                      \
-       $(WAYLAND_CFLAGS)                       \
-       $(LIBVA_WAYLAND_CFLAGS)                 \
+       $(GL_CFLAGS)                            \
+       $(LIBVA_GLX_CFLAGS)                     \
        $(NULL)
 
-libgstvaapi_wayland_@GST_MAJORMINOR@_la_LIBADD = \
+libgstvaapi_glx_@GST_MAJORMINOR@_la_LIBADD =   \
        $(GLIB_LIBS)                            \
-       $(WAYLAND_LIBS)                         \
-       $(LIBVA_WAYLAND_LIBS)                   \
-       libgstvaapi-@GST_MAJORMINOR@.la         \
+       $(GL_LIBS)                              \
+       $(LIBVA_GLX_LIBS)                       \
+       libgstvaapi-x11-@GST_MAJORMINOR@.la     \
        $(NULL)
 
-libgstvaapi_wayland_@GST_MAJORMINOR@_la_LDFLAGS = \
+libgstvaapi_glx_@GST_MAJORMINOR@_la_LDFLAGS =  \
        $(GST_ALL_LDFLAGS)                      \
        $(NULL)
 
-libgstvaapi_glx_@GST_MAJORMINOR@_la_SOURCES =  \
-       $(libgstvaapi_glx_source_c)             \
-       $(libgstvaapi_glx_source_priv_h)        \
+libgstvaapi_wayland_@GST_MAJORMINOR@_la_SOURCES = \
+       $(libgstvaapi_wayland_source_c)         \
+       $(libgstvaapi_wayland_source_priv_h)    \
        $(NULL)
 
-libgstvaapi_glx_@GST_MAJORMINOR@include_HEADERS = \
-       $(libgstvaapi_glx_source_h)             \
+libgstvaapi_wayland_@GST_MAJORMINOR@include_HEADERS = \
+       $(libgstvaapi_wayland_source_h)         \
        $(NULL)
 
-libgstvaapi_glx_@GST_MAJORMINOR@includedir =   \
+libgstvaapi_wayland_@GST_MAJORMINOR@includedir = \
        $(libgstvaapi_includedir)
 
-libgstvaapi_glx_@GST_MAJORMINOR@_la_CFLAGS =   \
+libgstvaapi_wayland_@GST_MAJORMINOR@_la_CFLAGS = \
        -DGST_USE_UNSTABLE_API                  \
        -I$(top_srcdir)/gst-libs                \
        $(GLIB_CFLAGS)                          \
        $(GST_BASE_CFLAGS)                      \
-       $(GL_CFLAGS)                            \
-       $(LIBVA_GLX_CFLAGS)                     \
+       $(WAYLAND_CFLAGS)                       \
+       $(LIBVA_WAYLAND_CFLAGS)                 \
        $(NULL)
 
-libgstvaapi_glx_@GST_MAJORMINOR@_la_LIBADD =   \
+libgstvaapi_wayland_@GST_MAJORMINOR@_la_LIBADD = \
        $(GLIB_LIBS)                            \
-       $(GL_LIBS)                              \
-       $(LIBVA_GLX_LIBS)                       \
-       libgstvaapi-x11-@GST_MAJORMINOR@.la     \
+       $(WAYLAND_LIBS)                         \
+       $(LIBVA_WAYLAND_LIBS)                   \
+       libgstvaapi-@GST_MAJORMINOR@.la         \
        $(NULL)
 
-libgstvaapi_glx_@GST_MAJORMINOR@_la_LDFLAGS =  \
+libgstvaapi_wayland_@GST_MAJORMINOR@_la_LDFLAGS = \
        $(GST_ALL_LDFLAGS)                      \
        $(NULL)