[libmx] Use upstream patch to use glib data types instead of using GL definitions.
Brian Pepple
bpepple at fedoraproject.org
Wed Aug 29 13:31:16 UTC 2012
commit c0ab053976990198444ac798bde8f9ca81980932
Author: Brian Pepple <bpepple at fedoraproject.org>
Date: Wed Aug 29 09:30:43 2012 -0400
Use upstream patch to use glib data types instead of using GL definitions.
...-GL-data-types-with-equivalent-glib-types.patch | 53 ++++++++++++++++++++
libmx.spec | 7 ++-
missing-includes.patch | 23 ---------
3 files changed, 58 insertions(+), 25 deletions(-)
---
diff --git a/0001-Replace-GL-data-types-with-equivalent-glib-types.patch b/0001-Replace-GL-data-types-with-equivalent-glib-types.patch
new file mode 100644
index 0000000..3d16c54
--- /dev/null
+++ b/0001-Replace-GL-data-types-with-equivalent-glib-types.patch
@@ -0,0 +1,53 @@
+From 297b654133436c6ee5146fce31529da4e52dfe74 Mon Sep 17 00:00:00 2001
+From: Brian Pepple <bpepple at fedoraproject.org>
+Date: Sat, 25 Aug 2012 17:41:59 -0400
+Subject: [PATCH] Replace GL data types with equivalent glib types.
+
+---
+ mx/mx-deform-texture.c | 8 ++++----
+ mx/mx-texture-frame.c | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/mx/mx-deform-texture.c b/mx/mx-deform-texture.c
+index 93c54d7..466cc9f 100644
+--- a/mx/mx-deform-texture.c
++++ b/mx/mx-deform-texture.c
+@@ -493,9 +493,9 @@ mx_deform_texture_class_init (MxDeformTextureClass *klass)
+ static void
+ mx_deform_texture_init_arrays (MxDeformTexture *self)
+ {
+- GLushort *idx, *bf_idx;
++ gushort *idx, *bf_idx;
+ gint x, y, direction;
+- GLushort *static_indices, *static_bf_indices;
++ gushort *static_indices, *static_bf_indices;
+ MxDeformTexturePrivate *priv = self->priv;
+
+ mx_deform_texture_free_arrays (self);
+@@ -503,8 +503,8 @@ mx_deform_texture_init_arrays (MxDeformTexture *self)
+ priv->n_indices = (2 + 2 * priv->tiles_x) *
+ priv->tiles_y +
+ (priv->tiles_y - 1);
+- static_indices = g_new (GLushort, priv->n_indices);
+- static_bf_indices = g_new (GLushort, priv->n_indices);
++ static_indices = g_new (gushort, priv->n_indices);
++ static_bf_indices = g_new (gushort, priv->n_indices);
+
+ #define MESH_INDEX(X, Y) (Y) * (priv->tiles_x + 1) + (X)
+
+diff --git a/mx/mx-texture-frame.c b/mx/mx-texture-frame.c
+index bde57ff..a88985f 100644
+--- a/mx/mx-texture-frame.c
++++ b/mx/mx-texture-frame.c
+@@ -200,7 +200,7 @@ mx_texture_frame_paint (ClutterActor *self)
+
+
+ {
+- GLfloat rectangles[] =
++ gfloat rectangles[] =
+ {
+ /* top left corner */
+ 0, 0,
+--
+1.7.11.4
+
diff --git a/libmx.spec b/libmx.spec
index b362fe3..ce32e68 100644
--- a/libmx.spec
+++ b/libmx.spec
@@ -1,13 +1,13 @@
Name: libmx
Version: 1.4.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A clutter widget toolkit
Group: System Environment/Libraries
License: LGPLv2
URL: http://www.clutter-project.org
Source0: https://github.com/downloads/clutter-project/mx/mx-%{version}.tar.xz
-Patch0: missing-includes.patch
+Patch0: 0001-Replace-GL-data-types-with-equivalent-glib-types.patch
BuildRequires: clutter-devel
BuildRequires: dbus-glib-devel
@@ -89,6 +89,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_datadir}/gtk-doc/html/mx-gtk
%changelog
+* Wed Aug 29 2012 Brian Pepple <bpepple at fedoraproject.org> - 1.4.7-4
+- Use upstream patch to use glib data types instead of using GL definitions.
+
* Tue Aug 21 2012 Brian Pepple <bpepple at fedoraproject.org> - 1.4.7-3
- Rebuild for new libcogl.
- Add patch to fix missing includes in src files.
More information about the scm-commits
mailing list