summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-06-23 12:09:39 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-28 16:26:41 +0100
commitea88444b4024d79f389017f441a166f906a7000b (patch)
tree22b99a127aeb2e4f7875f0dad0e7fdef64bd19df
parentbcc04b2880b44140176e1d2dcc955a3d3942c392 (diff)
downloadpoky-ea88444b4024d79f389017f441a166f906a7000b.tar.gz
mx: Upgrade to 1.4.6
Remove patch as introspection.m4 is now included with the upstream (From OE-Core rev: 6c33d56f0f6b472e8ba695d1f2636bc829e56696) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mx/files/introspection-m4.patch106
-rw-r--r--meta/recipes-graphics/mx/mx_1.4.6.bb (renamed from meta/recipes-graphics/mx/mx_1.4.2.bb)9
2 files changed, 4 insertions, 111 deletions
diff --git a/meta/recipes-graphics/mx/files/introspection-m4.patch b/meta/recipes-graphics/mx/files/introspection-m4.patch
deleted file mode 100644
index 2dcb62abe7..0000000000
--- a/meta/recipes-graphics/mx/files/introspection-m4.patch
+++ /dev/null
@@ -1,106 +0,0 @@
1A copy of introspection.m4 from upstream gobject-introspection so that
2we can use the GOBJECT_INTROSPECTION_CHECK([0.6.4]) and --disable-introspection
3
4Signed-off-by: Joshua Lock <josh@linux.intel.com>
5
6Upstream-Status: Inappropriate (build system specific).
7
8Index: mx-1.4.2/m4/introspection.m4
9===================================================================
10--- /dev/null
11+++ mx-1.4.2/m4/introspection.m4
12@@ -0,0 +1,94 @@
13+dnl -*- mode: autoconf -*-
14+dnl Copyright 2009 Johan Dahlin
15+dnl
16+dnl This file is free software; the author(s) gives unlimited
17+dnl permission to copy and/or distribute it, with or without
18+dnl modifications, as long as this notice is preserved.
19+dnl
20+
21+# serial 1
22+
23+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
24+[
25+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
26+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
27+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
28+
29+ dnl enable/disable introspection
30+ m4_if([$2], [require],
31+ [dnl
32+ enable_introspection=yes
33+ ],[dnl
34+ AC_ARG_ENABLE(introspection,
35+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
36+ [Enable introspection for this build]),,
37+ [enable_introspection=auto])
38+ ])dnl
39+
40+ AC_MSG_CHECKING([for gobject-introspection])
41+
42+ dnl presence/version checking
43+ AS_CASE([$enable_introspection],
44+ [no], [dnl
45+ found_introspection="no (disabled, use --enable-introspection to enable)"
46+ ],dnl
47+ [yes],[dnl
48+ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
49+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
50+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
51+ found_introspection=yes,
52+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
53+ ],dnl
54+ [auto],[dnl
55+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
56+ ],dnl
57+ [dnl
58+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
59+ ])dnl
60+
61+ AC_MSG_RESULT([$found_introspection])
62+
63+ INTROSPECTION_SCANNER=
64+ INTROSPECTION_COMPILER=
65+ INTROSPECTION_GENERATE=
66+ INTROSPECTION_GIRDIR=
67+ INTROSPECTION_TYPELIBDIR=
68+ if test "x$found_introspection" = "xyes"; then
69+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
70+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
71+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
72+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
73+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
74+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
75+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
76+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
77+ fi
78+ AC_SUBST(INTROSPECTION_SCANNER)
79+ AC_SUBST(INTROSPECTION_COMPILER)
80+ AC_SUBST(INTROSPECTION_GENERATE)
81+ AC_SUBST(INTROSPECTION_GIRDIR)
82+ AC_SUBST(INTROSPECTION_TYPELIBDIR)
83+ AC_SUBST(INTROSPECTION_CFLAGS)
84+ AC_SUBST(INTROSPECTION_LIBS)
85+ AC_SUBST(INTROSPECTION_MAKEFILE)
86+
87+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
88+])
89+
90+
91+dnl Usage:
92+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
93+
94+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
95+[
96+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
97+])
98+
99+dnl Usage:
100+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
101+
102+
103+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
104+[
105+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
106+])
diff --git a/meta/recipes-graphics/mx/mx_1.4.2.bb b/meta/recipes-graphics/mx/mx_1.4.6.bb
index bee65f6e4e..81bc5b9e54 100644
--- a/meta/recipes-graphics/mx/mx_1.4.2.bb
+++ b/meta/recipes-graphics/mx/mx_1.4.6.bb
@@ -1,17 +1,16 @@
1DESCRIPTION = "Clutter based widget library" 1DESCRIPTION = "Clutter based widget library"
2LICENSE = "LGPLv2.1" 2LICENSE = "LGPLv2.1"
3 3
4PR = "r1" 4PR = "r0"
5 5
6DEPENDS = "clutter-1.8 dbus-glib libxrandr gdk-pixbuf startup-notification" 6DEPENDS = "clutter-1.8 dbus-glib libxrandr gdk-pixbuf startup-notification"
7 7
8inherit autotools gettext 8inherit autotools gettext
9 9
10SRC_URI = "http://source.clutter-project.org/sources/mx/1.4/mx-${PV}.tar.bz2 \ 10SRC_URI = "http://source.clutter-project.org/sources/mx/1.4/mx-${PV}.tar.bz2"
11 file://introspection-m4.patch"
12 11
13SRC_URI[md5sum] = "faf8d97ad9995f54cc91f90bc90c8f9d" 12SRC_URI[md5sum] = "c7192ca7c43bb1a39adc2fafdc012f49"
14SRC_URI[sha256sum] = "9d40dd48a8e3d098cc75c05163f77305ffb83439783dc91be50681c9502660ce" 13SRC_URI[sha256sum] = "a3c7ffaf29b282144c982757b450d145cd85867183dfafef4750a00a0d406672"
15 14
16LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \ 15LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
17 file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879" 16 file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879"