sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Tomas Frydrych 2013-05-20 16:05:24 +01:00 committed by Richard Purdie
parent 59cea9cdf5
commit 37619d9dda
5 changed files with 101 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meta/recipes-graphics/mx/mx-1.0_1.4.7.bb Normal file
View File

@ -0,0 +1,14 @@
require mx.inc
# The 1.4.7 tag does not build against cogl 1.14, pull in a revision with a fix
SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f"
PV = "1.4.7+git${SRCPV}"
SRC_URI = "git://github.com/clutter-project/mx.git;protocol=git \
file://fix-build-dir.patch \
file://fix-test-includes.patch \
"
S = "${WORKDIR}/git"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879"

46
meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch Normal file
View File

@ -0,0 +1,46 @@
Fix build for S != B
This patch is specific to version 1.4.x
Upstream-status: Submitted @ https://github.com/clutter-project/mx/issues/81
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
--
Index: git/docs/reference/libmx-gtk/Makefile.am
===================================================================
--- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100
+++ git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100
@@ -1,3 +1,6 @@
+EXTRA_DIST=
+CLEANFILES=
+
## Process this file with automake to produce Makefile.in
# We require automake 1.6 at least.
@@ -77,7 +80,7 @@
GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
+include $(top_builddir)/gtk-doc.make
# Other files to distribute
EXTRA_DIST += version.xml.in
Index: git/docs/reference/libmx/Makefile.am
===================================================================
--- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100
+++ git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100
@@ -1,3 +1,6 @@
+EXTRA_DIST=
+CLEANFILES=
+
## Process this file with automake to produce Makefile.in
# We require automake 1.6 at least.
@@ -106,7 +109,7 @@
GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
+include $(top_builddir)/gtk-doc.make
# Other files to distribute
EXTRA_DIST += version.xml.in

21
meta/recipes-graphics/mx/mx.inc Normal file
View File

@ -0,0 +1,21 @@
DESCRIPTION = "Clutter based widget library"
LICENSE = "LGPLv2.1"
inherit clutter
DEPENDS = "clutter-1.0 dbus-glib gdk-pixbuf"
SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz"
EXTRA_OECONF = "--disable-introspection \
--disable-gtk-doc \
--disable-gtk-widgets \
--with-dbus \
--with-winsys=none \
--without-clutter-imcontext \
--without-clutter-gesture \
--without-startup-notification \
--without-glade \
"
FILES_${PN} += "${datadir}"

20
meta/recipes-graphics/mx/mx/fix-test-includes.patch Normal file
View File

@ -0,0 +1,20 @@
Fix missing include directory when building tests
This patch is currently required for all versions of mx
Upstream-status: Submitted @ https://github.com/clutter-project/mx/issues/82
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
--
Index: git/tests/Makefile.am
===================================================================
--- git.orig/tests/Makefile.am 2013-05-08 15:18:56.918596425 +0100
+++ git/tests/Makefile.am 2013-05-08 15:23:26.864781401 +0100
@@ -10,7 +10,8 @@
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_builddir)
+ -I$(top_builddir)\
+ -I$(top_builddir)/mx
noinst_PROGRAMS = \
test-deform-texture \

18
meta/recipes-graphics/mx/mx_1.4.7.bb
View File

@ -1,18 +0,0 @@
DESCRIPTION = "Clutter based widget library"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879"
PR = "r0"
DEPENDS = "clutter-1.8 dbus-glib libxrandr gdk-pixbuf startup-notification"
inherit autotools gettext
SRC_URI = "https://github.com/downloads/clutter-project/${BPN}/${BP}.tar.xz"
SRC_URI[md5sum] = "19b1e4918a5ae6d014fc0dab2bb3d0a1"
SRC_URI[sha256sum] = "1d2930d196717cacbee0ee101cf21d289b8200b5e938823d852b3b4a2f4a0e9d"
EXTRA_OECONF = "--disable-introspection --disable-gtk-widgets --with-dbus"