[packages/mx] Updated to 1.4.7. Added upstream patch to fix build
megabajt
megabajt at pld-linux.org
Sat Sep 29 13:12:40 CEST 2012
commit bb7a47b228cb534cd4a7f62a6eed51bde8c58ab3
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date: Sat Sep 29 13:11:58 2012 +0200
Updated to 1.4.7. Added upstream patch to fix build
...-GL-data-types-with-equivalent-glib-types.patch | 53 ++++++++++++++++++++++
mx.spec | 10 ++--
2 files changed, 59 insertions(+), 4 deletions(-)
---
diff --git a/mx.spec b/mx.spec
index a0fef31..40049bd 100644
--- a/mx.spec
+++ b/mx.spec
@@ -6,13 +6,14 @@
Summary: Mx Toolkit
Summary(pl.UTF-8): Toolkit widgetów Mx
Name: mx
-Version: 1.4.6
-Release: 2
+Version: 1.4.7
+Release: 1
License: LGPL v2.1
Group: X11/Libraries
-Source0: http://source.clutter-project.org/sources/mx/1.4/%{name}-%{version}.tar.xz
-# Source0-md5: 92ec1bb29cc878932857de737b111827
+Source0: https://github.com/downloads/clutter-project/mx/%{name}-%{version}.tar.xz
+# Source0-md5: 19b1e4918a5ae6d014fc0dab2bb3d0a1
Patch0: gdk-pixbuf.patch
+Patch1: 0001-Replace-GL-data-types-with-equivalent-glib-types.patch
URL: http://www.clutter-project.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake >= 1:1.11
@@ -89,6 +90,7 @@ Dokumentacja API bibliotek mx.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mx.git/commitdiff/bb7a47b228cb534cd4a7f62a6eed51bde8c58ab3
More information about the pld-cvs-commit
mailing list