summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-libs/mx
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-libs/mx')
-rw-r--r--x11-libs/mx/Manifest1
-rw-r--r--x11-libs/mx/files/mx-1.4.2-gold.patch30
-rw-r--r--x11-libs/mx/files/mx-1.4.7-gl-types.patch53
-rw-r--r--x11-libs/mx/metadata.xml14
-rw-r--r--x11-libs/mx/mx-1.4.7-r1.ebuild60
-rw-r--r--x11-libs/mx/mx-1.4.7-r2.ebuild57
6 files changed, 215 insertions, 0 deletions
diff --git a/x11-libs/mx/Manifest b/x11-libs/mx/Manifest
new file mode 100644
index 00000000000..e81627fced4
--- /dev/null
+++ b/x11-libs/mx/Manifest
@@ -0,0 +1 @@
+DIST mx-1.4.7.tar.xz 939672 SHA256 1d2930d196717cacbee0ee101cf21d289b8200b5e938823d852b3b4a2f4a0e9d SHA512 6870898548c947d43947ea6ded7c06d01d18aa721c81927fabf3ee0cfe20f65739e927d32277acce5c2e13968502828e29e043f9a8cf31af8f2bc20ec1ad0349 WHIRLPOOL bab7df74f07569b06a7793a42980c8fe56c337fae0ee05d752b7382db6c31c086a1388dfedfe628e97902d9cb44514aad9ea1def199ddfe3e866dd63215ff4ea
diff --git a/x11-libs/mx/files/mx-1.4.2-gold.patch b/x11-libs/mx/files/mx-1.4.2-gold.patch
new file mode 100644
index 00000000000..0dc1a0f60af
--- /dev/null
+++ b/x11-libs/mx/files/mx-1.4.2-gold.patch
@@ -0,0 +1,30 @@
+ mx/Makefile.am | 2 +-
+ mx/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mx/Makefile.am b/mx/Makefile.am
+index 0e5a61e..4f2b4a4 100644
+--- a/mx/Makefile.am
++++ b/mx/Makefile.am
+@@ -268,7 +268,7 @@ libmx_@MX_API_VERSION@_la_SOURCES = \
+ $(top_srcdir)/mx/mx.h \
+ $(NULL)
+
+-libmx_@MX_API_VERSION@_la_LIBADD = $(MX_LIBS)
++libmx_@MX_API_VERSION@_la_LIBADD = $(MX_LIBS) -lm
+
+ if HAVE_INTROSPECTION
+ -include $(INTROSPECTION_MAKEFILE)
+diff --git a/mx/Makefile.in b/mx/Makefile.in
+index 2fbf938..adfc59d 100644
+--- a/mx/Makefile.in
++++ b/mx/Makefile.in
+@@ -717,7 +717,7 @@ libmx_@MX_API_VERSION@_la_SOURCES = \
+ $(top_srcdir)/mx/mx.h \
+ $(NULL)
+
+-libmx_@MX_API_VERSION@_la_LIBADD = $(MX_LIBS)
++libmx_@MX_API_VERSION@_la_LIBADD = $(MX_LIBS) -lm
+ @HAVE_INTROSPECTION_TRUE@INTROSPECTION_GIRS = Mx-@MX_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE@Mx_@MX_API_VERSION_AM@_gir_NAMESPACE = Mx
+ @HAVE_INTROSPECTION_TRUE@Mx_@MX_API_VERSION_AM@_gir_VERSION = @MX_API_VERSION@
diff --git a/x11-libs/mx/files/mx-1.4.7-gl-types.patch b/x11-libs/mx/files/mx-1.4.7-gl-types.patch
new file mode 100644
index 00000000000..85c691378d8
--- /dev/null
+++ b/x11-libs/mx/files/mx-1.4.7-gl-types.patch
@@ -0,0 +1,53 @@
+From 297b654133436c6ee5146fce31529da4e52dfe74 Mon Sep 17 00:00:00 2001
+From: Brian Pepple <bpepple@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.12
+
diff --git a/x11-libs/mx/metadata.xml b/x11-libs/mx/metadata.xml
new file mode 100644
index 00000000000..819f4766990
--- /dev/null
+++ b/x11-libs/mx/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+ for introspection</flag>
+ <flag name="glade">Build the <pkg>dev-util/glade</pkg> catalog
+ files</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">clutter-project/mx</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/mx/mx-1.4.7-r1.ebuild b/x11-libs/mx/mx-1.4.7-r1.ebuild
new file mode 100644
index 00000000000..a845ad77482
--- /dev/null
+++ b/x11-libs/mx/mx-1.4.7-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2 eutils
+
+DESCRIPTION="A widget toolkit using Clutter"
+HOMEPAGE="http://clutter-project.org/"
+SRC_URI="mirror://github/clutter-project/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="dbus debug glade +gtk +introspection startup-notification"
+
+RDEPEND="
+ >=dev-libs/glib-2.28.0:2
+ >=media-libs/clutter-1.7.91:1.0
+ media-libs/cogl:=
+ >=x11-apps/xrandr-1.2.0
+
+ x11-libs/gdk-pixbuf:2[introspection?]
+
+ dbus? ( >=dev-libs/dbus-glib-0.82 )
+ glade? (
+ >=dev-util/glade-3.4.5:3
+ <dev-util/glade-3.9.1:3 )
+ gtk? ( >=x11-libs/gtk+-2.20:2[introspection?] )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
+ startup-notification? ( >=x11-libs/startup-notification-0.9 )
+"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ >=dev-util/gtk-doc-am-1.14
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # Tests are interactive, no use for us
+ sed -e 's/^\(SUBDIRS .*\)tests\(.*\)/\1 \2/g' \
+ -i Makefile.am -i Makefile.in || die
+ # In 1.4.8
+ epatch "${FILESDIR}/${P}-gl-types.patch"
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --with-winsys=x11 \
+ $(use_enable gtk gtk-widgets) \
+ $(use_enable introspection) \
+ $(use_enable debug) \
+ $(use_with dbus) \
+ $(use_with glade) \
+ $(use_with startup-notification)
+}
diff --git a/x11-libs/mx/mx-1.4.7-r2.ebuild b/x11-libs/mx/mx-1.4.7-r2.ebuild
new file mode 100644
index 00000000000..215417b0a0f
--- /dev/null
+++ b/x11-libs/mx/mx-1.4.7-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="yes"
+
+inherit gnome2 eutils
+
+DESCRIPTION="A widget toolkit using Clutter"
+HOMEPAGE="http://clutter-project.org/"
+SRC_URI="mirror://github/clutter-project/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="dbus +gtk +introspection startup-notification"
+
+RDEPEND="
+ >=dev-libs/glib-2.28.0:2
+ >=media-libs/clutter-1.7.91:1.0
+ media-libs/cogl:=
+ >=x11-apps/xrandr-1.2.0
+
+ x11-libs/gdk-pixbuf:2[introspection?]
+
+ dbus? ( >=dev-libs/dbus-glib-0.82 )
+ gtk? ( >=x11-libs/gtk+-2.20:2[introspection?] )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+ startup-notification? ( >=x11-libs/startup-notification-0.9 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.14
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # Tests are interactive, no use for us
+ sed -e 's/^\(SUBDIRS .*\)tests\(.*\)/\1 \2/g' \
+ -i Makefile.am -i Makefile.in || die
+ # In 1.4.8
+ epatch "${FILESDIR}/${P}-gl-types.patch"
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --with-winsys=x11 \
+ --without-glade \
+ $(use_enable gtk gtk-widgets) \
+ $(use_enable introspection) \
+ $(use_with dbus) \
+ $(use_with startup-notification)
+}