summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/gupnp
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2010-12-07 08:55:01 (GMT)
committerSaul Wold <sgw@linux.intel.com>2010-12-08 23:02:09 (GMT)
commit2628ea70661b6a36ee351018967bbe3b7e5d16c1 (patch)
tree216086a1d219b0af4442928e35540dccdbde9420 /meta/recipes-connectivity/gupnp
parentb45b75bdc0105678cb995ab2d52dc610144d3cf2 (diff)
downloadpoky-2628ea70661b6a36ee351018967bbe3b7e5d16c1.tar.gz
gssdp: upgrade to version 0.9.0
Derive introspection.m4 from gobject-introspection package to solve the autoreconf issue. Add option "--disable-introspection" since gobject-introspection breaks cross compile. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/gupnp')
-rw-r--r--meta/recipes-connectivity/gupnp/files/introspection.patch101
-rw-r--r--meta/recipes-connectivity/gupnp/gssdp_0.9.0.bb (renamed from meta/recipes-connectivity/gupnp/gssdp_0.7.1.bb)12
2 files changed, 112 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/gupnp/files/introspection.patch b/meta/recipes-connectivity/gupnp/files/introspection.patch
new file mode 100644
index 0000000..15de41f
--- /dev/null
+++ b/meta/recipes-connectivity/gupnp/files/introspection.patch
@@ -0,0 +1,101 @@
1Copied from gobject-introspection/m4/introspection.m4
2By Dongxiao Xu <dongxiao.xu@intel.com>
3
4diff -ruN gssdp-0.9.0-orig/m4/introspection.m4 gssdp-0.9.0/m4/introspection.m4
5--- gssdp-0.9.0-orig/m4/introspection.m4 1970-01-01 08:00:00.000000000 +0800
6+++ gssdp-0.9.0/m4/introspection.m4 2010-12-06 11:08:16.000000000 +0800
7@@ -0,0 +1,94 @@
8+dnl -*- mode: autoconf -*-
9+dnl Copyright 2009 Johan Dahlin
10+dnl
11+dnl This file is free software; the author(s) gives unlimited
12+dnl permission to copy and/or distribute it, with or without
13+dnl modifications, as long as this notice is preserved.
14+dnl
15+
16+# serial 1
17+
18+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
19+[
20+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
21+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
22+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
23+
24+ dnl enable/disable introspection
25+ m4_if([$2], [require],
26+ [dnl
27+ enable_introspection=yes
28+ ],[dnl
29+ AC_ARG_ENABLE(introspection,
30+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
31+ [Enable introspection for this build]),,
32+ [enable_introspection=auto])
33+ ])dnl
34+
35+ AC_MSG_CHECKING([for gobject-introspection])
36+
37+ dnl presence/version checking
38+ AS_CASE([$enable_introspection],
39+ [no], [dnl
40+ found_introspection="no (disabled, use --enable-introspection to enable)"
41+ ],dnl
42+ [yes],[dnl
43+ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
44+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
45+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
46+ found_introspection=yes,
47+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
48+ ],dnl
49+ [auto],[dnl
50+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
51+ ],dnl
52+ [dnl
53+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
54+ ])dnl
55+
56+ AC_MSG_RESULT([$found_introspection])
57+
58+ INTROSPECTION_SCANNER=
59+ INTROSPECTION_COMPILER=
60+ INTROSPECTION_GENERATE=
61+ INTROSPECTION_GIRDIR=
62+ INTROSPECTION_TYPELIBDIR=
63+ if test "x$found_introspection" = "xyes"; then
64+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
65+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
66+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
67+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
68+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
69+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
70+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
71+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
72+ fi
73+ AC_SUBST(INTROSPECTION_SCANNER)
74+ AC_SUBST(INTROSPECTION_COMPILER)
75+ AC_SUBST(INTROSPECTION_GENERATE)
76+ AC_SUBST(INTROSPECTION_GIRDIR)
77+ AC_SUBST(INTROSPECTION_TYPELIBDIR)
78+ AC_SUBST(INTROSPECTION_CFLAGS)
79+ AC_SUBST(INTROSPECTION_LIBS)
80+ AC_SUBST(INTROSPECTION_MAKEFILE)
81+
82+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
83+])
84+
85+
86+dnl Usage:
87+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
88+
89+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
90+[
91+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
92+])
93+
94+dnl Usage:
95+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
96+
97+
98+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
99+[
100+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
101+])
diff --git a/meta/recipes-connectivity/gupnp/gssdp_0.7.1.bb b/meta/recipes-connectivity/gupnp/gssdp_0.9.0.bb
index 2143984..09bcc38 100644
--- a/meta/recipes-connectivity/gupnp/gssdp_0.7.1.bb
+++ b/meta/recipes-connectivity/gupnp/gssdp_0.9.0.bb
@@ -4,10 +4,20 @@ LICENSE = "LGPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" 4LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
5DEPENDS = "glib-2.0 libsoup-2.4 libglade" 5DEPENDS = "glib-2.0 libsoup-2.4 libglade"
6 6
7SRC_URI = "http://gupnp.org/sites/all/files/sources/${PN}-${PV}.tar.gz" 7SRC_URI = "http://gupnp.org/sites/all/files/sources/${PN}-${PV}.tar.gz \
8 file://introspection.patch"
8 9
9inherit autotools pkgconfig 10inherit autotools pkgconfig
10 11
11PACKAGES =+ "gssdp-tools" 12PACKAGES =+ "gssdp-tools"
12 13
13FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade" 14FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade"
15
16EXTRA_OECONF = "--disable-introspection"
17
18PR = "r0"
19
20SRC_URI[md5sum] = "8605138eac1e7fb8ec8cf502a928ea81"
21SRC_URI[sha256sum] = "6e4de2ecc90d2ac8b3694af1954984d04de25fb01dd2f2748d7221add8ead9e0"
22
23