diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-gnome/librsvg/librsvg | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-gnome/librsvg/librsvg')
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg/gtk-option.patch | 62 | ||||
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg/vapigen.m4 | 96 |
2 files changed, 158 insertions, 0 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch new file mode 100644 index 0000000000..d44bdd3209 --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=712693] | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Tue, 19 Nov 2013 16:00:29 +0000 | ||
7 | Subject: [PATCH] configure: add option to enable/disable use of GTK+ | ||
8 | |||
9 | Distro packagers like predictability and automatically detected optional | ||
10 | dependencies are not predicable. Add a --with-gtk3 option (default to "auto") | ||
11 | for forcibly controlling whether GTK+ will be used or not. | ||
12 | |||
13 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
14 | |||
15 | https://bugzilla.gnome.org/show_bug.cgi?id=712693 | ||
16 | --- | ||
17 | configure.in | 17 +++++++++++------ | ||
18 | 1 file changed, 11 insertions(+), 6 deletions(-) | ||
19 | |||
20 | diff --git a/configure.in b/configure.in | ||
21 | index f7a89dc..1498f72 100644 | ||
22 | --- a/configure.in | ||
23 | +++ b/configure.in | ||
24 | @@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r) | ||
25 | # GTK | ||
26 | # =========================================================================== | ||
27 | |||
28 | -PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no]) | ||
29 | - | ||
30 | GTK3_BINARY_VERSION= | ||
31 | |||
32 | -if test "$have_gtk_3" = "yes"; then | ||
33 | - GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`" | ||
34 | +AC_MSG_CHECKING([whether to use GTK+ 3]) | ||
35 | +AC_ARG_WITH([gtk3], | ||
36 | + [AS_HELP_STRING([--without-gtk3],[Don't build GTK+3 tools (default=auto)])], | ||
37 | + [],[PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK3_REQUIRED],[with_gtk3=yes],[with_gtk3=no])]) | ||
38 | +AC_MSG_RESULT([$with_gtk3]) | ||
39 | + | ||
40 | +if test "$with_gtk3" = "yes"; then | ||
41 | + PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED]) | ||
42 | + GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`" | ||
43 | fi | ||
44 | |||
45 | AC_SUBST([GTK3_BINARY_VERSION]) | ||
46 | |||
47 | -AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"]) | ||
48 | +AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk3" = "yes"]) | ||
49 | |||
50 | dnl =========================================================================== | ||
51 | dnl GDK-Pixbuf SVG loader | ||
52 | @@ -305,6 +310,6 @@ librsvg-$VERSION | ||
53 | Build introspectable bindings: ${found_introspection} | ||
54 | Build Vala bindings: ${enable_vala} | ||
55 | Build GdkPixbuf loader: ${enable_pixbuf_loader} | ||
56 | - GTK 3.0: ${have_gtk_3} | ||
57 | + GTK 3.0: ${with_gtk3} | ||
58 | Build miscellaenous tools: ${build_misc_tools} | ||
59 | " | ||
60 | -- | ||
61 | 1.7.10.4 | ||
62 | |||
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 | ]) | ||