From 1ddde50048c57ff7da9a89c6b8c4f0159d0d4a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Mon, 14 Aug 2017 09:33:38 +0100
Subject: [PATCH] gl: make some debug categories private

They weren't supposed to be public.

https://bugzilla.gnome.org/show_bug.cgi?id=786170
---
 gst-libs/gst/gl/Makefile.am                       | 2 ++
 gst-libs/gst/gl/egl/gstglcontext_egl.c            | 1 +
 gst-libs/gst/gl/gstglcontext.c                    | 1 +
 gst-libs/gst/gl/gstglcontext.h                    | 2 --
 gst-libs/gst/gl/gstgldebug.c                      | 1 +
 gst-libs/gst/gl/gstglsyncmeta.c                   | 2 +-
 gst-libs/gst/gl/gstglwindow.c                     | 1 +
 gst-libs/gst/gl/gstglwindow.h                     | 2 --
 gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c | 2 ++
 gst-libs/gst/gl/x11/gstglcontext_glx.c            | 1 +
 gst-libs/gst/gl/x11/gstglwindow_x11.c             | 3 +++
 11 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
index 2ae47731bb..5cf1d4e9fb 100644
--- a/gst-libs/gst/gl/Makefile.am
+++ b/gst-libs/gst/gl/Makefile.am
@@ -69,8 +69,10 @@ libgstgl_@GST_API_VERSION@include_HEADERS = \
 	gl.h
 
 noinst_HEADERS = \
+	gstglcontext_private.h \
 	gstglfeature_private.h \
 	gstglsl_private.h \
+	gstglwindow_private.h \
 	gstglutils_private.h \
 	utils/opengl_versions.h \
 	utils/gles_versions.h
diff --git a/gst-libs/gst/gl/egl/gstglcontext_egl.c b/gst-libs/gst/gl/egl/gstglcontext_egl.c
index eabc09c5e4..ddac4c4833 100644
--- a/gst-libs/gst/gl/egl/gstglcontext_egl.c
+++ b/gst-libs/gst/gl/egl/gstglcontext_egl.c
@@ -32,6 +32,7 @@
 #include <gst/gl/egl/gstegl.h>
 #include "../utils/opengl_versions.h"
 #include "../utils/gles_versions.h"
+#include "../gstglcontext_private.h"
 
 #if GST_GL_HAVE_WINDOW_X11
 #include "../x11/gstglwindow_x11.h"
diff --git a/gst-libs/gst/gl/gstglcontext.c b/gst-libs/gst/gl/gstglcontext.c
index 8c1b7b5972..01c03c11a2 100644
--- a/gst-libs/gst/gl/gstglcontext.c
+++ b/gst-libs/gst/gl/gstglcontext.c
@@ -46,6 +46,7 @@
 
 #include "gl.h"
 #include "gstglcontext.h"
+#include "gstglcontext_private.h"
 #include "gstglfeature_private.h"
 
 #ifndef GL_NUM_EXTENSIONS
diff --git a/gst-libs/gst/gl/gstglcontext.h b/gst-libs/gst/gl/gstglcontext.h
index 53ed34e755..7cdc95764a 100644
--- a/gst-libs/gst/gl/gstglcontext.h
+++ b/gst-libs/gst/gl/gstglcontext.h
@@ -216,8 +216,6 @@ GST_EXPORT
 void gst_gl_context_thread_add (GstGLContext * context,
     GstGLContextThreadFunc func, gpointer data);
 
-GST_DEBUG_CATEGORY_EXTERN (gst_gl_context_debug);
-
 G_END_DECLS
 
 #endif /* __GST_GL_CONTEXT_H__ */
diff --git a/gst-libs/gst/gl/gstgldebug.c b/gst-libs/gst/gl/gstgldebug.c
index 26f776041e..2b738cc3e7 100644
--- a/gst-libs/gst/gl/gstgldebug.c
+++ b/gst-libs/gst/gl/gstgldebug.c
@@ -24,6 +24,7 @@
 
 #include "gl.h"
 #include "gstgldebug.h"
+#include "gstglcontext_private.h"
 #include <glib/gprintf.h>
 #include <string.h>
 
diff --git a/gst-libs/gst/gl/gstglsyncmeta.c b/gst-libs/gst/gl/gstglsyncmeta.c
index f69e344d0f..bd9131d931 100644
--- a/gst-libs/gst/gl/gstglsyncmeta.c
+++ b/gst-libs/gst/gl/gstglsyncmeta.c
@@ -35,8 +35,8 @@
 #include "gl.h"
 #include "gstglsyncmeta.h"
 
+GST_DEBUG_CATEGORY_STATIC (gst_gl_sync_meta_debug);
 #define GST_CAT_DEFAULT gst_gl_sync_meta_debug
-GST_DEBUG_CATEGORY (GST_CAT_DEFAULT);
 
 #ifndef GL_SYNC_GPU_COMMANDS_COMPLETE
 #define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117
diff --git a/gst-libs/gst/gl/gstglwindow.c b/gst-libs/gst/gl/gstglwindow.c
index 4a5891a53e..3818ab16e2 100644
--- a/gst-libs/gst/gl/gstglwindow.c
+++ b/gst-libs/gst/gl/gstglwindow.c
@@ -37,6 +37,7 @@
 
 #include "gl.h"
 #include "gstglwindow.h"
+#include "gstglwindow_private.h"
 
 /* FIXME make this work with windowless contexts */
 
diff --git a/gst-libs/gst/gl/gstglwindow.h b/gst-libs/gst/gl/gstglwindow.h
index fccb0cff97..d943b795f7 100644
--- a/gst-libs/gst/gl/gstglwindow.h
+++ b/gst-libs/gst/gl/gstglwindow.h
@@ -264,8 +264,6 @@ GstGLContext * gst_gl_window_get_context    (GstGLWindow *window);
 GST_EXPORT
 guintptr       gst_gl_window_get_display    (GstGLWindow *window);
 
-GST_DEBUG_CATEGORY_EXTERN (gst_gl_window_debug);
-
 G_END_DECLS
 
 #endif /* __GST_GL_WINDOW_H__ */
diff --git a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c
index 45f93361ad..4c71bf51d9 100644
--- a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c
+++ b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c
@@ -35,6 +35,8 @@
 #include "gstgldisplay_wayland.h"
 #include "gstglwindow_wayland_egl.h"
 
+#include "../gstglwindow_private.h"
+
 const gchar *WlEGLErrorString ();
 
 #define GST_CAT_DEFAULT gst_gl_window_debug
diff --git a/gst-libs/gst/gl/x11/gstglcontext_glx.c b/gst-libs/gst/gl/x11/gstglcontext_glx.c
index 06b7b6c5c5..877e5c6d8c 100644
--- a/gst-libs/gst/gl/x11/gstglcontext_glx.c
+++ b/gst-libs/gst/gl/x11/gstglcontext_glx.c
@@ -37,6 +37,7 @@
 #include <gst/gl/gl.h>
 #include "gstglcontext_glx.h"
 #include "../utils/opengl_versions.h"
+#include "../gstglcontext_private.h"
 
 #define GST_CAT_DEFAULT gst_gl_context_debug
 
diff --git a/gst-libs/gst/gl/x11/gstglwindow_x11.c b/gst-libs/gst/gl/x11/gstglwindow_x11.c
index a98b2c3994..9898e0be71 100644
--- a/gst-libs/gst/gl/x11/gstglwindow_x11.c
+++ b/gst-libs/gst/gl/x11/gstglwindow_x11.c
@@ -30,6 +30,9 @@
 
 #include "gstglwindow_x11.h"
 #include "gstgldisplay_x11.h"
+
+#include "../gstglwindow_private.h"
+
 /* for XkbKeycodeToKeysym */
 #include <X11/XKBlib.h>