[gentoo-commits] gentoo-x86 commit in media-libs/clutter-gst/files: clutter-gst-1.6.0-gluint.patch clutter-gst-1.6.0-GL_TEXTURE_2D.patch

[gentoo-commits] gentoo-x86 commit in media-libs/clutter-gst/files: clutter-gst-1.6.0-gluint.patch clutter-gst-1.6.0-GL_TEXTURE_2D.patch

[Alexandre Rostovtsev (tetromino)]

tetromino    12/12/06 00:08:02

  Added:                clutter-gst-1.6.0-gluint.patch
                        clutter-gst-1.6.0-GL_TEXTURE_2D.patch
  Log:
  Add version 1.9.92 for gstreamer-1.0 support. Fix build failure with cogl-1.12 (bug #445982, thanks to Rick Harris). Drop useless doc USE flag. Update to EAPI5.
  
  (Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

Revision  Changes    Path
1.1                  media-libs/clutter-gst/files/clutter-gst-1.6.0-gluint.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter-gst/files/clutter-gst-1.6.0-gluint.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter-gst/files/clutter-gst-1.6.0-gluint.patch?rev=1.1&content-type=text/plain

Index: clutter-gst-1.6.0-gluint.patch
===================================================================
From b33739b1442f3486e6aef85c5fb1fec312b32f2b Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward.hervey@collabora.co.uk>
Date: Wed, 22 Aug 2012 15:23:51 +0200
Subject: [PATCH] video-sink: Don't use GL* values

And only check for target type if using full GL
---
 clutter-gst/clutter-gst-video-sink.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
index 9b4b53c..8160d14 100644
--- a/clutter-gst/clutter-gst-video-sink.c
+++ b/clutter-gst/clutter-gst-video-sink.c
@@ -1097,13 +1097,16 @@ clutter_gst_hw_upload (ClutterGstVideoSink *sink,
 
   if (G_UNLIKELY (priv->converter == NULL)) {
     CoglHandle tex;
-    GLuint gl_texture;
-    GLenum gl_target;
+    unsigned int gl_texture;
+    unsigned int gl_target;
     GValue value = {0};
 
     tex = clutter_texture_get_cogl_texture (priv->texture);
     cogl_texture_get_gl_texture (tex, &gl_texture, &gl_target);
+    /* GL_TEXTURE_2D is always used in GLES2 */
+#ifndef COGL_HAS_GLES2
     g_return_if_fail (gl_target == GL_TEXTURE_2D);
+#endif
 
     g_value_init (&value, G_TYPE_UINT);
     g_value_set_uint (&value, gl_texture);
-- 
1.8.0




1.1                  media-libs/clutter-gst/files/clutter-gst-1.6.0-GL_TEXTURE_2D.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter-gst/files/clutter-gst-1.6.0-GL_TEXTURE_2D.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter-gst/files/clutter-gst-1.6.0-GL_TEXTURE_2D.patch?rev=1.1&content-type=text/plain

Index: clutter-gst-1.6.0-GL_TEXTURE_2D.patch
===================================================================
From deec4709404c0c26f8fe57bcd8bf5c04f7b6ed0b Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward.hervey@collabora.co.uk>
Date: Wed, 19 Sep 2012 11:01:18 +0200
Subject: [PATCH] video-sink: Remove usage of GL_TEXTURE_2D

GL header files are no longer exposed, and the Clutter Texture we use
are always 2D textures.
---
 clutter-gst/clutter-gst-video-sink.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
index f8d3954..b6e4ad0 100644
--- a/clutter-gst/clutter-gst-video-sink.c
+++ b/clutter-gst/clutter-gst-video-sink.c
@@ -1090,10 +1090,6 @@ clutter_gst_hw_upload (ClutterGstVideoSink * sink, GstBuffer * buffer)
 
     tex = clutter_texture_get_cogl_texture (priv->texture);
     cogl_texture_get_gl_texture (tex, &gl_texture, &gl_target);
-    /* GL_TEXTURE_2D is always used in GLES2 */
-#ifndef COGL_HAS_GLES2
-    g_return_if_fail (gl_target == GL_TEXTURE_2D);
-#endif
 
     g_value_init (&value, G_TYPE_UINT);
     g_value_set_uint (&value, gl_texture);
-- 
1.8.0