diff options
| -rw-r--r-- | meta/conf/distro/include/maintainers.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch | 20 | ||||
| -rw-r--r-- | meta/recipes-graphics/mx/mx-1.0_1.4.7.bb | 16 | ||||
| -rw-r--r-- | meta/recipes-graphics/mx/mx.inc | 27 |
4 files changed, 0 insertions, 64 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index fa7eb9da0a..669863e679 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
| @@ -520,7 +520,6 @@ RECIPE_MAINTAINER_pn-mtools = "Anuj Mittal <anuj.mittal@intel.com>" | |||
| 520 | RECIPE_MAINTAINER_pn-musl = "Khem Raj <raj.khem@gmail.com>" | 520 | RECIPE_MAINTAINER_pn-musl = "Khem Raj <raj.khem@gmail.com>" |
| 521 | RECIPE_MAINTAINER_pn-musl-obstack = "Khem Raj <raj.khem@gmail.com>" | 521 | RECIPE_MAINTAINER_pn-musl-obstack = "Khem Raj <raj.khem@gmail.com>" |
| 522 | RECIPE_MAINTAINER_pn-musl-utils = "Khem Raj <raj.khem@gmail.com>" | 522 | RECIPE_MAINTAINER_pn-musl-utils = "Khem Raj <raj.khem@gmail.com>" |
| 523 | RECIPE_MAINTAINER_pn-mx-1.0 = "Anuj Mittal <anuj.mittal@intel.com>" | ||
| 524 | RECIPE_MAINTAINER_pn-nasm = "Richard Purdie <richard.purdie@linuxfoundation.org>" | 523 | RECIPE_MAINTAINER_pn-nasm = "Richard Purdie <richard.purdie@linuxfoundation.org>" |
| 525 | RECIPE_MAINTAINER_pn-nativesdk-buildtools-perl-dummy = "Richard Purdie <richard.purdie@linuxfoundation.org>" | 524 | RECIPE_MAINTAINER_pn-nativesdk-buildtools-perl-dummy = "Richard Purdie <richard.purdie@linuxfoundation.org>" |
| 526 | RECIPE_MAINTAINER_pn-nativesdk-icecc-toolchain = "Joshua Watt <JPEWhacker@gmail.com>" | 525 | RECIPE_MAINTAINER_pn-nativesdk-icecc-toolchain = "Joshua Watt <JPEWhacker@gmail.com>" |
diff --git a/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch b/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch deleted file mode 100644 index 82c93dd604..0000000000 --- a/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | Fix missing include directory when building tests | ||
| 2 | |||
| 3 | This patch is currently required for all versions of mx | ||
| 4 | Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/82 | ||
| 5 | Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> | ||
| 6 | -- | ||
| 7 | Index: 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.0_1.4.7.bb b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb deleted file mode 100644 index 58a6997ffe..0000000000 --- a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | require mx.inc | ||
| 2 | |||
| 3 | # The 1.4.7 tag does not build against cogl 1.14, pull in a revision with a fix | ||
| 4 | SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f" | ||
| 5 | PV = "1.4.7+git${SRCPV}" | ||
| 6 | |||
| 7 | # Exclude x.99.x versions from upstream checks | ||
| 8 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>^\d+(\.(?!99)\d+)+)" | ||
| 9 | |||
| 10 | SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \ | ||
| 11 | file://fix-test-includes.patch \ | ||
| 12 | " | ||
| 13 | S = "${WORKDIR}/git" | ||
| 14 | |||
| 15 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \ | ||
| 16 | file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879" | ||
diff --git a/meta/recipes-graphics/mx/mx.inc b/meta/recipes-graphics/mx/mx.inc deleted file mode 100644 index c977849c96..0000000000 --- a/meta/recipes-graphics/mx/mx.inc +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | SUMMARY = "Clutter based UI widget library" | ||
| 2 | DESCRIPTION = "Mx is a widget toolkit using Clutter that provides a set of standard interface \ | ||
| 3 | elements, including buttons, progress bars, scroll bars and others. It also \ | ||
| 4 | implements some standard managers. One other interesting feature is the \ | ||
| 5 | possibility setting style properties from a CSS format file." | ||
| 6 | HOMEPAGE = "https://github.com/clutter-project/mx" | ||
| 7 | BUGTRACKER = "https://github.com/clutter-project/mx/issues" | ||
| 8 | LICENSE = "LGPLv2.1" | ||
| 9 | |||
| 10 | inherit clutter autotools features_check gobject-introspection gtk-doc | ||
| 11 | # depends on clutter-1.0 which depends on cogl-1.0 | ||
| 12 | REQUIRED_DISTRO_FEATURES = "opengl" | ||
| 13 | |||
| 14 | DEPENDS = "intltool-native clutter-1.0 dbus-glib gdk-pixbuf" | ||
| 15 | |||
| 16 | SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz" | ||
| 17 | |||
| 18 | EXTRA_OECONF = "--disable-gtk-widgets \ | ||
| 19 | --with-dbus \ | ||
| 20 | --with-winsys=none \ | ||
| 21 | --without-clutter-imcontext \ | ||
| 22 | --without-clutter-gesture \ | ||
| 23 | --without-startup-notification \ | ||
| 24 | --without-glade \ | ||
| 25 | " | ||
| 26 | |||
| 27 | FILES_${PN} += "${datadir}" | ||
