diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2010-12-07 16:55:01 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2010-12-08 15:02:09 -0800 |
commit | 2628ea70661b6a36ee351018967bbe3b7e5d16c1 (patch) | |
tree | 216086a1d219b0af4442928e35540dccdbde9420 /meta | |
parent | b45b75bdc0105678cb995ab2d52dc610144d3cf2 (diff) | |
download | openembedded-core-2628ea70661b6a36ee351018967bbe3b7e5d16c1.tar.gz openembedded-core-2628ea70661b6a36ee351018967bbe3b7e5d16c1.tar.bz2 openembedded-core-2628ea70661b6a36ee351018967bbe3b7e5d16c1.zip |
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')
-rw-r--r-- | meta/recipes-connectivity/gupnp/files/introspection.patch | 101 | ||||
-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 0000000000..15de41f2b2 --- /dev/null +++ b/meta/recipes-connectivity/gupnp/files/introspection.patch @@ -0,0 +1,101 @@ +Copied from gobject-introspection/m4/introspection.m4 +By Dongxiao Xu <dongxiao.xu@intel.com> + +diff -ruN gssdp-0.9.0-orig/m4/introspection.m4 gssdp-0.9.0/m4/introspection.m4 +--- gssdp-0.9.0-orig/m4/introspection.m4 1970-01-01 08:00:00.000000000 +0800 ++++ gssdp-0.9.0/m4/introspection.m4 2010-12-06 11:08:16.000000000 +0800 +@@ -0,0 +1,94 @@ ++dnl -*- mode: autoconf -*- ++dnl Copyright 2009 Johan Dahlin ++dnl ++dnl This file is free software; the author(s) gives unlimited ++dnl permission to copy and/or distribute it, with or without ++dnl modifications, as long as this notice is preserved. ++dnl ++ ++# serial 1 ++ ++m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], ++[ ++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first ++ ++ dnl enable/disable introspection ++ m4_if([$2], [require], ++ [dnl ++ enable_introspection=yes ++ ],[dnl ++ AC_ARG_ENABLE(introspection, ++ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], ++ [Enable introspection for this build]),, ++ [enable_introspection=auto]) ++ ])dnl ++ ++ AC_MSG_CHECKING([for gobject-introspection]) ++ ++ dnl presence/version checking ++ AS_CASE([$enable_introspection], ++ [no], [dnl ++ found_introspection="no (disabled, use --enable-introspection to enable)" ++ ],dnl ++ [yes],[dnl ++ PKG_CHECK_EXISTS([gobject-introspection-1.0],, ++ AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) ++ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], ++ found_introspection=yes, ++ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) ++ ],dnl ++ [auto],[dnl ++ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) ++ ],dnl ++ [dnl ++ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) ++ ])dnl ++ ++ AC_MSG_RESULT([$found_introspection]) ++ ++ INTROSPECTION_SCANNER= ++ INTROSPECTION_COMPILER= ++ INTROSPECTION_GENERATE= ++ INTROSPECTION_GIRDIR= ++ INTROSPECTION_TYPELIBDIR= ++ if test "x$found_introspection" = "xyes"; then ++ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` ++ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` ++ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` ++ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` ++ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" ++ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` ++ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` ++ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection ++ fi ++ AC_SUBST(INTROSPECTION_SCANNER) ++ AC_SUBST(INTROSPECTION_COMPILER) ++ AC_SUBST(INTROSPECTION_GENERATE) ++ AC_SUBST(INTROSPECTION_GIRDIR) ++ AC_SUBST(INTROSPECTION_TYPELIBDIR) ++ AC_SUBST(INTROSPECTION_CFLAGS) ++ AC_SUBST(INTROSPECTION_LIBS) ++ AC_SUBST(INTROSPECTION_MAKEFILE) ++ ++ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") ++]) ++ ++ ++dnl Usage: ++dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) ++ ++AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], ++[ ++ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) ++]) ++ ++dnl Usage: ++dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) ++ ++ ++AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], ++[ ++ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) ++]) diff --git a/meta/recipes-connectivity/gupnp/gssdp_0.7.1.bb b/meta/recipes-connectivity/gupnp/gssdp_0.9.0.bb index 2143984b11..09bcc384ba 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" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" DEPENDS = "glib-2.0 libsoup-2.4 libglade" -SRC_URI = "http://gupnp.org/sites/all/files/sources/${PN}-${PV}.tar.gz" +SRC_URI = "http://gupnp.org/sites/all/files/sources/${PN}-${PV}.tar.gz \ + file://introspection.patch" inherit autotools pkgconfig PACKAGES =+ "gssdp-tools" FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade" + +EXTRA_OECONF = "--disable-introspection" + +PR = "r0" + +SRC_URI[md5sum] = "8605138eac1e7fb8ec8cf502a928ea81" +SRC_URI[sha256sum] = "6e4de2ecc90d2ac8b3694af1954984d04de25fb01dd2f2748d7221add8ead9e0" + + |