diff options
author | Mei Lei <lei.mei@intel.com> | 2011-07-04 17:12:28 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-07 11:14:00 +0100 |
commit | 74daaf19cb124a24a45c04a6cac626b0037be75a (patch) | |
tree | 54dd8c22c891f4bbffec2d529fdcfcc372aed1ab /meta/recipes-connectivity/gupnp/gupnp-0.16.1 | |
parent | d8f13889e6b4926645764344a014d5b5d59271b0 (diff) | |
download | poky-74daaf19cb124a24a45c04a6cac626b0037be75a.tar.gz |
gupnp: Upgrade from 0.16.0 to 0.16.1
Add introspection.patch from gssdp due to more strict compiler checks in new version
(From OE-Core rev: 421ca72552b47923cb01e49288a4fa28b70c019a)
Signed-off-by: Mei Lei <lei.mei@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/gupnp/gupnp-0.16.1')
-rw-r--r-- | meta/recipes-connectivity/gupnp/gupnp-0.16.1/introspection.patch | 104 |
1 files changed, 104 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/gupnp/gupnp-0.16.1/introspection.patch b/meta/recipes-connectivity/gupnp/gupnp-0.16.1/introspection.patch new file mode 100644 index 0000000000..86d57a7424 --- /dev/null +++ b/meta/recipes-connectivity/gupnp/gupnp-0.16.1/introspection.patch | |||
@@ -0,0 +1,104 @@ | |||
1 | Copied from gobject-introspection/m4/introspection.m4 | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | |||
5 | Signed-off-By: Dongxiao Xu <dongxiao.xu@intel.com> | ||
6 | |||
7 | diff -ruN gupnp-0.16.1-orig/m4/introspection.m4 gupnp-0.16.1/m4/introspection.m4 | ||
8 | --- gupnp-0.16.1-orig/m4/introspection.m4 1970-01-01 08:00:00.000000000 +0800 | ||
9 | +++ gupnp-0.16.1/m4/introspection.m4 2010-12-06 11:08:16.000000000 +0800 | ||
10 | @@ -0,0 +1,94 @@ | ||
11 | +dnl -*- mode: autoconf -*- | ||
12 | +dnl Copyright 2009 Johan Dahlin | ||
13 | +dnl | ||
14 | +dnl This file is free software; the author(s) gives unlimited | ||
15 | +dnl permission to copy and/or distribute it, with or without | ||
16 | +dnl modifications, as long as this notice is preserved. | ||
17 | +dnl | ||
18 | + | ||
19 | +# serial 1 | ||
20 | + | ||
21 | +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], | ||
22 | +[ | ||
23 | + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first | ||
24 | + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first | ||
25 | + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first | ||
26 | + | ||
27 | + dnl enable/disable introspection | ||
28 | + m4_if([$2], [require], | ||
29 | + [dnl | ||
30 | + enable_introspection=yes | ||
31 | + ],[dnl | ||
32 | + AC_ARG_ENABLE(introspection, | ||
33 | + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], | ||
34 | + [Enable introspection for this build]),, | ||
35 | + [enable_introspection=auto]) | ||
36 | + ])dnl | ||
37 | + | ||
38 | + AC_MSG_CHECKING([for gobject-introspection]) | ||
39 | + | ||
40 | + dnl presence/version checking | ||
41 | + AS_CASE([$enable_introspection], | ||
42 | + [no], [dnl | ||
43 | + found_introspection="no (disabled, use --enable-introspection to enable)" | ||
44 | + ],dnl | ||
45 | + [yes],[dnl | ||
46 | + PKG_CHECK_EXISTS([gobject-introspection-1.0],, | ||
47 | + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) | ||
48 | + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], | ||
49 | + found_introspection=yes, | ||
50 | + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) | ||
51 | + ],dnl | ||
52 | + [auto],[dnl | ||
53 | + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) | ||
54 | + ],dnl | ||
55 | + [dnl | ||
56 | + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) | ||
57 | + ])dnl | ||
58 | + | ||
59 | + AC_MSG_RESULT([$found_introspection]) | ||
60 | + | ||
61 | + INTROSPECTION_SCANNER= | ||
62 | + INTROSPECTION_COMPILER= | ||
63 | + INTROSPECTION_GENERATE= | ||
64 | + INTROSPECTION_GIRDIR= | ||
65 | + INTROSPECTION_TYPELIBDIR= | ||
66 | + if test "x$found_introspection" = "xyes"; then | ||
67 | + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` | ||
68 | + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` | ||
69 | + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` | ||
70 | + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` | ||
71 | + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" | ||
72 | + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` | ||
73 | + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` | ||
74 | + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection | ||
75 | + fi | ||
76 | + AC_SUBST(INTROSPECTION_SCANNER) | ||
77 | + AC_SUBST(INTROSPECTION_COMPILER) | ||
78 | + AC_SUBST(INTROSPECTION_GENERATE) | ||
79 | + AC_SUBST(INTROSPECTION_GIRDIR) | ||
80 | + AC_SUBST(INTROSPECTION_TYPELIBDIR) | ||
81 | + AC_SUBST(INTROSPECTION_CFLAGS) | ||
82 | + AC_SUBST(INTROSPECTION_LIBS) | ||
83 | + AC_SUBST(INTROSPECTION_MAKEFILE) | ||
84 | + | ||
85 | + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") | ||
86 | +]) | ||
87 | + | ||
88 | + | ||
89 | +dnl Usage: | ||
90 | +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) | ||
91 | + | ||
92 | +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], | ||
93 | +[ | ||
94 | + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) | ||
95 | +]) | ||
96 | + | ||
97 | +dnl Usage: | ||
98 | +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) | ||
99 | + | ||
100 | + | ||
101 | +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], | ||
102 | +[ | ||
103 | + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) | ||
104 | +]) | ||