[Cogl] [PATCH 1/9] gst: Don't install cogl-gst-shader.h

Neil Roberts neil at linux.intel.com
Fri Mar 1 05:31:52 PST 2013


cogl-gst-shader.h shouldn't be installed because it only contains
private symbols. This renames it to cogl-gst-shader-private.h and puts
it in the private section.
---
 cogl-gst/Makefile.am               |  4 ++--
 cogl-gst/cogl-gst-shader-private.h | 48 ++++++++++++++++++++++++++++++++++++++
 cogl-gst/cogl-gst-shader.c         |  2 +-
 cogl-gst/cogl-gst-shader.h         | 48 --------------------------------------
 cogl-gst/cogl-gst-video-sink.c     |  2 +-
 5 files changed, 52 insertions(+), 52 deletions(-)
 create mode 100644 cogl-gst/cogl-gst-shader-private.h
 delete mode 100644 cogl-gst/cogl-gst-shader.h

diff --git a/cogl-gst/Makefile.am b/cogl-gst/Makefile.am
index d2afa93..aae90da 100644
--- a/cogl-gst/Makefile.am
+++ b/cogl-gst/Makefile.am
@@ -14,11 +14,11 @@ source_c = \
 
 source_h = \
 	cogl-gst.h \
-	cogl-gst-shader.h \
 	cogl-gst-video-sink.h \
 	$(NULL)
 
 source_h_priv = \
+	cogl-gst-shader-private.h \
 	$(NULL)
 
 lib_LTLIBRARIES = libcogl-gst.la
@@ -49,7 +49,7 @@ cogl_gstheaders_HEADERS = $(source_h)
 plugin_source_c = 				\
   $(srcdir)/cogl-gst.h \
   $(srcdir)/cogl-gst-shader.c \
-  $(srcdir)/cogl-gst-shader.h \
+  $(srcdir)/cogl-gst-shader-private.h \
 	$(srcdir)/cogl-gst-video-sink.c	\
 	$(srcdir)/cogl-gst-video-sink.h	\
 	$(NULL)
diff --git a/cogl-gst/cogl-gst-shader-private.h b/cogl-gst/cogl-gst-shader-private.h
new file mode 100644
index 0000000..bdf7164
--- /dev/null
+++ b/cogl-gst/cogl-gst-shader-private.h
@@ -0,0 +1,48 @@
+/*
+ * Cogl-GStreamer.
+ *
+ * GStreamer integration library for Cogl.
+ *
+ * cogl-gst-video-sink-private.h - Miscellaneous video sink functions
+ *
+ * Authored by Jonathan Matthew  <jonathan at kaolin.wh9.net>,
+ *             Chris Lord        <chris at openedhand.com>
+ *             Damien Lespiau    <damien.lespiau at intel.com>
+ *             Matthew Allum     <mallum at openedhand.com>
+ *             Plamena Manolova  <plamena.n.manolova at intel.com>
+ *
+ * Copyright (C) 2007, 2008 OpenedHand
+ * Copyright (C) 2009, 2010, 2013 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __COGL_GST_SHADER_PRIVATE_H__
+#define __COGL_GST_SHADER_PRIVATE_H__
+
+extern const char
+_cogl_gst_shader_rgba_to_rgba_decl[];
+
+extern const char
+_cogl_gst_shader_yv12_to_rgba_decl[];
+
+extern const char
+_cogl_gst_shader_ayuv_to_rgba_decl[];
+
+extern const char
+_cogl_gst_shader_default_sample[];
+
+#endif /* __COGL_GST_SHADER_PRIVATE_H__ */
diff --git a/cogl-gst/cogl-gst-shader.c b/cogl-gst/cogl-gst-shader.c
index 652b3a8..bd765bc 100644
--- a/cogl-gst/cogl-gst-shader.c
+++ b/cogl-gst/cogl-gst-shader.c
@@ -34,7 +34,7 @@
 #include "config.h"
 #endif
 
-#include "cogl-gst-shader.h"
+#include "cogl-gst-shader-private.h"
 
 const char
 _cogl_gst_shader_rgba_to_rgba_decl[] =
diff --git a/cogl-gst/cogl-gst-shader.h b/cogl-gst/cogl-gst-shader.h
deleted file mode 100644
index bdf7164..0000000
--- a/cogl-gst/cogl-gst-shader.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Cogl-GStreamer.
- *
- * GStreamer integration library for Cogl.
- *
- * cogl-gst-video-sink-private.h - Miscellaneous video sink functions
- *
- * Authored by Jonathan Matthew  <jonathan at kaolin.wh9.net>,
- *             Chris Lord        <chris at openedhand.com>
- *             Damien Lespiau    <damien.lespiau at intel.com>
- *             Matthew Allum     <mallum at openedhand.com>
- *             Plamena Manolova  <plamena.n.manolova at intel.com>
- *
- * Copyright (C) 2007, 2008 OpenedHand
- * Copyright (C) 2009, 2010, 2013 Intel Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __COGL_GST_SHADER_PRIVATE_H__
-#define __COGL_GST_SHADER_PRIVATE_H__
-
-extern const char
-_cogl_gst_shader_rgba_to_rgba_decl[];
-
-extern const char
-_cogl_gst_shader_yv12_to_rgba_decl[];
-
-extern const char
-_cogl_gst_shader_ayuv_to_rgba_decl[];
-
-extern const char
-_cogl_gst_shader_default_sample[];
-
-#endif /* __COGL_GST_SHADER_PRIVATE_H__ */
diff --git a/cogl-gst/cogl-gst-video-sink.c b/cogl-gst/cogl-gst-video-sink.c
index 52ce311..c929f3b 100644
--- a/cogl-gst/cogl-gst-video-sink.c
+++ b/cogl-gst/cogl-gst-video-sink.c
@@ -43,7 +43,7 @@
 #include <string.h>
 
 #include "cogl-gst-video-sink.h"
-#include "cogl-gst-shader.h"
+#include "cogl-gst-shader-private.h"
 
 #define COGL_GST_TEXTURE_FLAGS \
        (COGL_TEXTURE_NO_SLICING | COGL_TEXTURE_NO_ATLAS)
-- 
1.7.11.3.g3c3efa5



More information about the Cogl mailing list