diff options
author | Ross Burton <ross.burton@intel.com> | 2013-11-19 17:02:30 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-20 14:03:33 +0000 |
commit | 852ba6c72f2555def6896fd768e1a4dea37606aa (patch) | |
tree | 143574e43e6df660e225d9c80ecf19c4f909b3c1 /meta/recipes-gnome/librsvg/librsvg/vapigen.m4 | |
parent | b60666e3a9a248a23a154fe14ad6569ff0a654e8 (diff) | |
download | poky-852ba6c72f2555def6896fd768e1a4dea37606aa.tar.gz |
librsvg: upgrade to 2.40.0
Add local-m4.patch and install a local vapigen.m4 so that we can autoreconf
without needing Vala installed.
Refresh build dependencies removing stale recipes and adding libcroco as it's a mandatory dependency now.
Explicitly disable Vala, with a patch from upstream until 2.40.1.
The GTK+ 2 theme engine has been removed, delete all traces of it.
Add a patch to make GTK+ use deterministic, and a disabled PACKAGECONFIG for it.
Enable parallel make, as some testing shows that it works fine.
Drop librsvg-CVE-2011-3146, merged upstream. Drop doc_Makefile.patch, our
gtk-doc.mk isn't buggy and this isn't needed anymore.
Merge multiple -dev and -dbg packages into ${PN}-dev and -dbg, and remove the
loader module .a and .la files as they are pointless.
(From OE-Core rev: ee3e2e5ce15a3bf78c7e9d76d7bf68131f2d3ef7)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/librsvg/librsvg/vapigen.m4')
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg/vapigen.m4 | 96 |
1 files changed, 96 insertions, 0 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg/vapigen.m4 b/meta/recipes-gnome/librsvg/librsvg/vapigen.m4 new file mode 100644 index 0000000000..f2df12f23f --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg/vapigen.m4 | |||
@@ -0,0 +1,96 @@ | |||
1 | dnl vapigen.m4 | ||
2 | dnl | ||
3 | dnl Copyright 2012 Evan Nemerson | ||
4 | dnl | ||
5 | dnl This library is free software; you can redistribute it and/or | ||
6 | dnl modify it under the terms of the GNU Lesser General Public | ||
7 | dnl License as published by the Free Software Foundation; either | ||
8 | dnl version 2.1 of the License, or (at your option) any later version. | ||
9 | dnl | ||
10 | dnl This library is distributed in the hope that it will be useful, | ||
11 | dnl but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | dnl Lesser General Public License for more details. | ||
14 | dnl | ||
15 | dnl You should have received a copy of the GNU Lesser General Public | ||
16 | dnl License along with this library; if not, write to the Free Software | ||
17 | dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
18 | |||
19 | # VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND-INTROSPECTION], [DEFAULT]) | ||
20 | # -------------------------------------- | ||
21 | # Check vapigen existence and version | ||
22 | # | ||
23 | # See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation | ||
24 | AC_DEFUN([VAPIGEN_CHECK], | ||
25 | [ | ||
26 | AC_BEFORE([GOBJECT_INTROSPECTION_CHECK],[$0]) | ||
27 | AC_BEFORE([GOBJECT_INTROSPECTION_REQUIRE],[$0]) | ||
28 | |||
29 | AC_ARG_ENABLE([vala], | ||
30 | [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[ | ||
31 | AS_IF([test "x$4" = "x"], [ | ||
32 | enable_vala=auto | ||
33 | ], [ | ||
34 | enable_vala=$4 | ||
35 | ]) | ||
36 | ]) | ||
37 | |||
38 | AS_CASE([$enable_vala], [no], [enable_vala=no], | ||
39 | [yes], [ | ||
40 | AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ | ||
41 | AC_MSG_ERROR([Vala bindings require GObject Introspection]) | ||
42 | ]) | ||
43 | ], [auto], [ | ||
44 | AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ | ||
45 | enable_vala=no | ||
46 | ]) | ||
47 | ], [ | ||
48 | AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@]) | ||
49 | ]) | ||
50 | |||
51 | AS_IF([test "x$2" = "x"], [ | ||
52 | vapigen_pkg_name=vapigen | ||
53 | ], [ | ||
54 | vapigen_pkg_name=vapigen-$2 | ||
55 | ]) | ||
56 | AS_IF([test "x$1" = "x"], [ | ||
57 | vapigen_pkg="$vapigen_pkg_name" | ||
58 | ], [ | ||
59 | vapigen_pkg="$vapigen_pkg_name >= $1" | ||
60 | ]) | ||
61 | |||
62 | PKG_PROG_PKG_CONFIG | ||
63 | |||
64 | PKG_CHECK_EXISTS([$vapigen_pkg], [ | ||
65 | AS_IF([test "$enable_vala" = "auto"], [ | ||
66 | enable_vala=yes | ||
67 | ]) | ||
68 | ], [ | ||
69 | AS_CASE([$enable_vala], [yes], [ | ||
70 | AC_MSG_ERROR([$vapigen_pkg not found]) | ||
71 | ], [auto], [ | ||
72 | enable_vala=no | ||
73 | ]) | ||
74 | ]) | ||
75 | |||
76 | AC_MSG_CHECKING([for vala]) | ||
77 | |||
78 | AS_CASE([$enable_vala], | ||
79 | [yes], [ | ||
80 | VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen` | ||
81 | VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen | ||
82 | AS_IF([test "x$2" = "x"], [ | ||
83 | VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen` | ||
84 | ], [ | ||
85 | VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen` | ||
86 | ]) | ||
87 | ]) | ||
88 | |||
89 | AC_MSG_RESULT([$enable_vala]) | ||
90 | |||
91 | AC_SUBST([VAPIGEN]) | ||
92 | AC_SUBST([VAPIGEN_VAPIDIR]) | ||
93 | AC_SUBST([VAPIGEN_MAKEFILE]) | ||
94 | |||
95 | AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes") | ||
96 | ]) | ||