From 59fe9c91225425cda05f6d4b77efe8f29910ebda Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Sat, 9 Dec 2017 20:16:48 +0000
Subject: [PATCH] gl: remove GST_USE_UNSTABLE_API bits

---
 ext/gl/meson.build                          | 2 +-
 gst-libs/gst/gl/Makefile.am                 | 1 -
 gst-libs/gst/gl/gl.h                        | 5 -----
 gst-libs/gst/gl/meson.build                 | 5 ++---
 tests/examples/gl/gtk/3dvideo/mviewwidget.h | 2 --
 tests/examples/gl/sdl/meson.build           | 8 ++------
 6 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/ext/gl/meson.build b/ext/gl/meson.build
index a3b3279..e7775cb 100644
--- a/ext/gl/meson.build
+++ b/ext/gl/meson.build
@@ -47,7 +47,7 @@ opengl_sources = [
 
 if build_gstgl and gstgl_dep.found()
   optional_deps = []
-  opengl_defines = ['-DGST_USE_UNSTABLE_API']
+  opengl_defines = []
 
   if gl_dep.found() # have desktop GL
     opengl_sources += [
diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
index 269fdb6..325cde9 100644
--- a/gst-libs/gst/gl/Makefile.am
+++ b/gst-libs/gst/gl/Makefile.am
@@ -187,7 +187,6 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
 		--pkg gstreamer-video-@GST_API_VERSION@ \
 		--pkg-export gstreamer-gl-@GST_API_VERSION@ \
 		--add-init-section="$(INTROSPECTION_INIT)" \
-		-DGST_USE_UNSTABLE_API \
 		--output $@ \
 		$(gir_headers) \
 		$(gir_sources)
diff --git a/gst-libs/gst/gl/gl.h b/gst-libs/gst/gl/gl.h
index 33d1f35..ee4144b 100644
--- a/gst-libs/gst/gl/gl.h
+++ b/gst-libs/gst/gl/gl.h
@@ -21,11 +21,6 @@
 #ifndef __GST_GL_H__
 #define __GST_GL_H__
 
-#ifndef GST_USE_UNSTABLE_API
-#warning "The GL library from gst-plugins-bad is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
 #include <gst/gl/gstgl_fwd.h>
 #include <gst/gl/gstglapi.h>
 #include <gst/gl/gstglconfig.h>
diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build
index b8d3687..adb2236 100644
--- a/gst-libs/gst/gl/meson.build
+++ b/gst-libs/gst/gl/meson.build
@@ -144,7 +144,7 @@ gl_winsys_deps = []
 # other things we need.
 gl_misc_deps = []
 # Other preprocessor arguments
-gl_cpp_args = ['-DGST_USE_UNSTABLE_API', '-DGST_EXPORTS']
+gl_cpp_args = ['-DGST_EXPORTS']
 
 enabled_gl_apis = []
 enabled_gl_platforms = []
@@ -687,8 +687,7 @@ if build_gstgl
       export_packages : 'gstreamer-gl-1.0',
       includes : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'],
       install : true,
-      extra_args : gir_init_section + ['-DGST_USE_UNSTABLE_API',
-        '--c-include=gst/gl/gl.h'],
+      extra_args : gir_init_section + ['--c-include=gst/gl/gl.h'],
       dependencies : [gst_dep, gstbase_dep, gstvideo_dep]
     )
     gen_sources += gl_gir
diff --git a/tests/examples/gl/gtk/3dvideo/mviewwidget.h b/tests/examples/gl/gtk/3dvideo/mviewwidget.h
index b63d7a9..81e16a6 100644
--- a/tests/examples/gl/gtk/3dvideo/mviewwidget.h
+++ b/tests/examples/gl/gtk/3dvideo/mviewwidget.h
@@ -19,8 +19,6 @@
  */
 #include <string.h>
 
-#define GST_USE_UNSTABLE_API 1
-
 #include <gst/gst.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
diff --git a/tests/examples/gl/sdl/meson.build b/tests/examples/gl/sdl/meson.build
index 8285f87..49f8ea0 100644
--- a/tests/examples/gl/sdl/meson.build
+++ b/tests/examples/gl/sdl/meson.build
@@ -3,14 +3,10 @@ if sdl_dep.found() and build_gstgl
   executable('sdlshare',
     'sdlshare.c',
     install: false,
-    dependencies : [gstbase_dep, gstgl_dep, sdl_dep, gl_dep],
-    c_args : ['-DGST_USE_UNSTABLE_API', ],
-  )
+    dependencies : [gstbase_dep, gstgl_dep, sdl_dep, gl_dep])
 
   executable('sdlshare2',
     'sdlshare2.c',
     install: false,
-    dependencies : [gstbase_dep, gstgl_dep, sdl_dep, gl_dep],
-    c_args : ['-DGST_USE_UNSTABLE_API', ],
-)
+    dependencies : [gstbase_dep, gstgl_dep, sdl_dep, gl_dep])
 endif
-- 
2.7.4