gl: update plugins to use GstGL from -base

4 files changed, 20 insertions, 24 deletions

diff --git a/ext/gl/Makefile.am b/ext/gl/Makefile.am
index 1931af7c5..6246797d8 100644
--- a/ext/gl/Makefile.am
+++ b/ext/gl/Makefile.am
@@ -32,7 +32,7 @@ endif
 # (like in AM_CFLAGS)?
 libgstopenglmixers_la_CFLAGS = \
 	$(GST_PLUGINS_BAD_CFLAGS) \
-	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_GL_CFLAGS) \
 	$(GST_BASE_CFLAGS) \
 	$(GST_CONTROLLER_CFLAGS) \
 	$(GST_CFLAGS) \
@@ -40,8 +40,7 @@ libgstopenglmixers_la_CFLAGS = \
 
 libgstopenglmixers_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/video/libgstbadvideo-@GST_API_VERSION@.la \
-	$(GST_PLUGINS_BASE_LIBS) \
-	-lgstgl-@GST_API_VERSION@
+	$(GST_GL_LIBS) \
 	$(GST_BASE_LIBS) \
 	$(GST_CONTROLLER_LIBS) \
 	$(GST_LIBS) \
diff --git a/ext/gtk/Makefile.am b/ext/gtk/Makefile.am
index 34906257f..057ff3f18 100644
--- a/ext/gtk/Makefile.am
+++ b/ext/gtk/Makefile.am
@@ -22,18 +22,16 @@ sources = \
 	$(NULL)
 
 libgstgtk_la_CFLAGS = \
-	-I$(top_srcdir)/gst-libs \
-	-I$(top_builddir)/gst-libs \
-	$(GTK3_CFLAGS) \
-	$(GST_CFLAGS) \
-	$(GST_BASE_CFLAGS) \
+	$(GST_PLUGINS_BAD_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
-	$(GL_CFLAGS)
+	$(GST_GL_CFLAGS) \
+	$(GST_CFLAGS) \
+	$(GTK3_CFLAGS)
 libgstgtk_la_LIBADD = \
-	$(GTK3_LIBS) \
-	$(GST_BASE_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) \
-	-lgstvideo-$(GST_API_VERSION)
+	-lgstvideo-$(GST_API_VERSION) \
+	$(GST_BASE_LIBS) \
+	$(GTK3_LIBS)
 
 libgstgtk_la_SOURCES = $(sources)
 libgstgtk_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
@@ -41,8 +39,7 @@ libgstgtk_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 if USE_GTK3_GL
 if USE_GL
 libgstgtk_la_SOURCES += gstgtkglsink.c gstgtkglsink.h gtkgstglwidget.c gtkgstglwidget.h
-libgstgtk_la_LIBADD += \
-	$(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la
+libgstgtk_la_LIBADD += $(GST_GL_LIBS)
 endif
 endif
 
diff --git a/ext/gtk/meson.build b/ext/gtk/meson.build
index d041fbd21..324bfba89 100644
--- a/ext/gtk/meson.build
+++ b/ext/gtk/meson.build
@@ -15,7 +15,7 @@ if gtk_dep.found()
   if build_gstgl and gstgl_dep.found() and gtk_dep.version().version_compare('>=3.15.0')
     have_gtk3_gl_windowing = false
 
-    if x11_dep.found() and gl_dep.found()
+    if gst_gl_have_window_x11 and gst_gl_have_platform_glx
       gtk_x11_dep = dependency('gtk+-x11-3.0', required : false)
       if gtk_x11_dep.found()
         optional_deps += gtk_x11_dep
@@ -23,7 +23,7 @@ if gtk_dep.found()
       endif
     endif
 
-    if wayland_egl_dep.found() and egl_dep.found()
+    if gst_gl_have_window_wayland and gst_gl_have_platform_egl
       gtk_wayland_dep = dependency('gtk+-wayland-3.0', required : false)
       if gtk_wayland_dep.found()
         optional_deps += gtk_wayland_dep
diff --git a/ext/qt/Makefile.am b/ext/qt/Makefile.am
index 257644a08..cf2f761c3 100644
--- a/ext/qt/Makefile.am
+++ b/ext/qt/Makefile.am
@@ -32,20 +32,20 @@ libgstqmlgl_la_SOURCES = \
 	gstplugin.cc
 
 libgstqmlgl_la_CXXFLAGS = \
-	-I$(top_srcdir)/gst-libs \
-	-I$(top_builddir)/gst-libs \
-	$(GST_CXXFLAGS) \
-	$(GST_BASE_CFLAGS) \
+	$(GST_PLUGINS_BAD_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_GL_CFLAGS) \
+	$(GST_BASE_CFLAGS) \
+	$(GST_CXXFLAGS) \
 	$(QT_CFLAGS) \
 	$(GL_CFLAGS) -std=c++11
 
 libgstqmlgl_la_LIBADD = \
-	$(GST_BASE_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) \
-	$(QT_LIBS) \
-	$(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \
-	-lgstvideo-$(GST_API_VERSION)
+	$(GST_GL_LIBS) \
+	-lgstvideo-$(GST_API_VERSION) \
+	$(GST_BASE_LIBS) \
+	$(QT_LIBS)
 
 libgstqmlgl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)