summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTomas Frydrych <tomas@sleepfive.com>2013-05-20 16:05:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-21 09:30:17 +0100
commit37619d9ddac845bf4d0503aa81d5e26cb05343db (patch)
treea98d316fe518730f12d5aeffc25b8a12556d06b2 /meta
parent59cea9cdf511f49931d6fd8fa213525cf8d675cf (diff)
downloadpoky-37619d9ddac845bf4d0503aa81d5e26cb05343db.tar.gz
mx: Update to improved naming scheme
The package has been renamed to mx-1.0, keeping up with the upstream versioning policy. The 1.14.7 tag does not build with clutter 1.14, so git revision 9b1db6b8060bd00b121a692f942404a24ae2960f from the 1.14 branch is used instead. (From OE-Core rev: e49f3e23d7ae7d105d9c32a33bd28590f5c300cd) Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mx/mx-1.0_1.4.7.bb14
-rw-r--r--meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch46
-rw-r--r--meta/recipes-graphics/mx/mx.inc21
-rw-r--r--meta/recipes-graphics/mx/mx/fix-test-includes.patch20
-rw-r--r--meta/recipes-graphics/mx/mx_1.4.7.bb18
5 files changed, 101 insertions, 18 deletions
diff --git a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
new file mode 100644
index 0000000000..4c4c8eb775
--- /dev/null
+++ b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
@@ -0,0 +1,14 @@
1require mx.inc
2
3# The 1.4.7 tag does not build against cogl 1.14, pull in a revision with a fix
4SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f"
5PV = "1.4.7+git${SRCPV}"
6
7SRC_URI = "git://github.com/clutter-project/mx.git;protocol=git \
8 file://fix-build-dir.patch \
9 file://fix-test-includes.patch \
10 "
11S = "${WORKDIR}/git"
12
13LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
14 file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879"
diff --git a/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch
new file mode 100644
index 0000000000..e7481e9a4b
--- /dev/null
+++ b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch
@@ -0,0 +1,46 @@
1Fix build for S != B
2
3This patch is specific to version 1.4.x
4Upstream-status: Submitted @ https://github.com/clutter-project/mx/issues/81
5Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
6--
7Index: git/docs/reference/libmx-gtk/Makefile.am
8===================================================================
9--- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100
10+++ git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100
11@@ -1,3 +1,6 @@
12+EXTRA_DIST=
13+CLEANFILES=
14+
15 ## Process this file with automake to produce Makefile.in
16
17 # We require automake 1.6 at least.
18@@ -77,7 +80,7 @@
19 GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la
20
21 # This includes the standard gtk-doc make rules, copied by gtkdocize.
22-include $(top_srcdir)/gtk-doc.make
23+include $(top_builddir)/gtk-doc.make
24
25 # Other files to distribute
26 EXTRA_DIST += version.xml.in
27Index: git/docs/reference/libmx/Makefile.am
28===================================================================
29--- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100
30+++ git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100
31@@ -1,3 +1,6 @@
32+EXTRA_DIST=
33+CLEANFILES=
34+
35 ## Process this file with automake to produce Makefile.in
36
37 # We require automake 1.6 at least.
38@@ -106,7 +109,7 @@
39 GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la
40
41 # This includes the standard gtk-doc make rules, copied by gtkdocize.
42-include $(top_srcdir)/gtk-doc.make
43+include $(top_builddir)/gtk-doc.make
44
45 # Other files to distribute
46 EXTRA_DIST += version.xml.in
diff --git a/meta/recipes-graphics/mx/mx.inc b/meta/recipes-graphics/mx/mx.inc
new file mode 100644
index 0000000000..e3b4b15480
--- /dev/null
+++ b/meta/recipes-graphics/mx/mx.inc
@@ -0,0 +1,21 @@
1DESCRIPTION = "Clutter based widget library"
2LICENSE = "LGPLv2.1"
3
4inherit clutter
5
6DEPENDS = "clutter-1.0 dbus-glib gdk-pixbuf"
7
8SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz"
9
10EXTRA_OECONF = "--disable-introspection \
11 --disable-gtk-doc \
12 --disable-gtk-widgets \
13 --with-dbus \
14 --with-winsys=none \
15 --without-clutter-imcontext \
16 --without-clutter-gesture \
17 --without-startup-notification \
18 --without-glade \
19 "
20
21FILES_${PN} += "${datadir}"
diff --git a/meta/recipes-graphics/mx/mx/fix-test-includes.patch b/meta/recipes-graphics/mx/mx/fix-test-includes.patch
new file mode 100644
index 0000000000..c6496a97af
--- /dev/null
+++ b/meta/recipes-graphics/mx/mx/fix-test-includes.patch
@@ -0,0 +1,20 @@
1Fix missing include directory when building tests
2
3This patch is currently required for all versions of mx
4Upstream-status: Submitted @ https://github.com/clutter-project/mx/issues/82
5Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
6--
7Index: git/tests/Makefile.am
8===================================================================
9--- git.orig/tests/Makefile.am 2013-05-08 15:18:56.918596425 +0100
10+++ git/tests/Makefile.am 2013-05-08 15:23:26.864781401 +0100
11@@ -10,7 +10,8 @@
12
13 INCLUDES = \
14 -I$(top_srcdir) \
15- -I$(top_builddir)
16+ -I$(top_builddir)\
17+ -I$(top_builddir)/mx
18
19 noinst_PROGRAMS = \
20 test-deform-texture \
diff --git a/meta/recipes-graphics/mx/mx_1.4.7.bb b/meta/recipes-graphics/mx/mx_1.4.7.bb
deleted file mode 100644
index fd9189bcea..0000000000
--- a/meta/recipes-graphics/mx/mx_1.4.7.bb
+++ /dev/null
@@ -1,18 +0,0 @@
1DESCRIPTION = "Clutter based widget library"
2LICENSE = "LGPLv2.1"
3
4LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
5 file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879"
6
7PR = "r0"
8
9DEPENDS = "clutter-1.8 dbus-glib libxrandr gdk-pixbuf startup-notification"
10
11inherit autotools gettext
12
13SRC_URI = "https://github.com/downloads/clutter-project/${BPN}/${BP}.tar.xz"
14
15SRC_URI[md5sum] = "19b1e4918a5ae6d014fc0dab2bb3d0a1"
16SRC_URI[sha256sum] = "1d2930d196717cacbee0ee101cf21d289b8200b5e938823d852b3b4a2f4a0e9d"
17
18EXTRA_OECONF = "--disable-introspection --disable-gtk-widgets --with-dbus"