From 0a3e152339d3e51f939e520cce702ffadbd20d81 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Thu, 31 Jan 2008 20:21:26 +0000
Subject: [PATCH] [056/906] * configure.ac: Readd pre-pkgconfig OpenGL
 detection, since pkgconfig requires Mesa from git master. *
 gst/gl/glimagesink.c: * gst/gl/gstopengl.c: Move debug category
 initialization to element. * gst-libs/gst/gl/Makefile.am: *
 gst-libs/gst/gl/gstglfilter.c: * gst-libs/gst/gl/gstglfilter.h: *
 gst/gl/gstglfilter.c: * gst/gl/gstglfilter.h: Move glfilter to library. *
 pkgconfig/gstreamer-plugins-gl.pc.in: Add gstreamer-base-0.10 as a
 requirement. * po/en.po: Update.

---
 gst-libs/gst/gl/Makefile.am            | 6 ++++--
 {gst => gst-libs/gst}/gl/gstglfilter.c | 0
 {gst => gst-libs/gst}/gl/gstglfilter.h | 0
 gst/gl/glimagesink.c                   | 8 +++++++-
 gst/gl/gstopengl.c                     | 7 ++-----
 5 files changed, 13 insertions(+), 8 deletions(-)
 rename {gst => gst-libs/gst}/gl/gstglfilter.c (100%)
 rename {gst => gst-libs/gst}/gl/gstglfilter.h (100%)

diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
index e762c199b6..375f15476f 100644
--- a/gst-libs/gst/gl/Makefile.am
+++ b/gst-libs/gst/gl/Makefile.am
@@ -4,13 +4,15 @@ lib_LTLIBRARIES = libgstgl-@GST_MAJORMINOR@.la
 libgstgl_@GST_MAJORMINOR@_la_SOURCES = \
 	glextensions.c \
 	gstglbuffer.c \
-	gstgldisplay.c
+	gstgldisplay.c \
+	gstglfilter.c
 
 libgstgl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gl
 libgstgl_@GST_MAJORMINOR@include_HEADERS = \
 	glextensions.h \
 	gstglbuffer.h \
-	gstgldisplay.h
+	gstgldisplay.h \
+	gstglfilter.h
 
 libgstgl_@GST_MAJORMINOR@_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \
diff --git a/gst/gl/gstglfilter.c b/gst-libs/gst/gl/gstglfilter.c
similarity index 100%
rename from gst/gl/gstglfilter.c
rename to gst-libs/gst/gl/gstglfilter.c
diff --git a/gst/gl/gstglfilter.h b/gst-libs/gst/gl/gstglfilter.h
similarity index 100%
rename from gst/gl/gstglfilter.h
rename to gst-libs/gst/gl/gstglfilter.h
diff --git a/gst/gl/glimagesink.c b/gst/gl/glimagesink.c
index 250a4efc76..9f0912a028 100644
--- a/gst/gl/glimagesink.c
+++ b/gst/gl/glimagesink.c
@@ -98,8 +98,14 @@ enum
   ARG_DISPLAY
 };
 
+#define DEBUG_INIT(bla) do { \
+  GST_DEBUG_CATEGORY_INIT (gst_debug_glimage_sink, "glimagesink", 0, "glimagesink element"); \
+  gst_glimage_sink_init_interfaces(bla); \
+}while(0);
+
+
 GST_BOILERPLATE_FULL (GstGLImageSink, gst_glimage_sink, GstVideoSink,
-    GST_TYPE_VIDEO_SINK, gst_glimage_sink_init_interfaces);
+    GST_TYPE_VIDEO_SINK, DEBUG_INIT);
 
 static void
 gst_glimage_sink_init_interfaces (GType type)
diff --git a/gst/gl/gstopengl.c b/gst/gl/gstopengl.c
index 6c73f4f4c9..97d0e7c377 100644
--- a/gst/gl/gstopengl.c
+++ b/gst/gl/gstopengl.c
@@ -42,9 +42,6 @@ GType gst_gl_test_src_get_type (void);
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  GST_DEBUG_CATEGORY_INIT (gst_debug_glimage_sink, "glimagesink", 0,
-      "glimagesink element");
-
   if (!gst_element_register (plugin, "glimagesink",
           GST_RANK_SECONDARY, GST_TYPE_GLIMAGE_SINK)) {
     return FALSE;
@@ -75,6 +72,6 @@ plugin_init (GstPlugin * plugin)
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    "glimagesink",
-    "OpenGL video output plugin",
+    "opengl",
+    "plugin for elements using OpenGL",
     plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)