From 74daaf19cb124a24a45c04a6cac626b0037be75a Mon Sep 17 00:00:00 2001 From: Mei Lei Date: Mon, 4 Jul 2011 17:12:28 +0800 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- .../gupnp/gupnp-0.16.1/introspection.patch | 104 ++++++++++++++++++ .../{gupnp_0.16.0.bb => gupnp_0.16.1.bb} | 7 +- 2 files changed, 108 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-connectivity/gupnp/gupnp-0.16.1/introspection.patch rename meta/recipes-connectivity/gupnp/{gupnp_0.16.0.bb => gupnp_0.16.1.bb} (85%) 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 @@ +Copied from gobject-introspection/m4/introspection.m4 + +Upstream-Status: Inappropriate [configuration] + +Signed-off-By: Dongxiao Xu + +diff -ruN gupnp-0.16.1-orig/m4/introspection.m4 gupnp-0.16.1/m4/introspection.m4 +--- gupnp-0.16.1-orig/m4/introspection.m4 1970-01-01 08:00:00.000000000 +0800 ++++ gupnp-0.16.1/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/gupnp_0.16.0.bb b/meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb similarity index 85% rename from meta/recipes-connectivity/gupnp/gupnp_0.16.0.bb rename to meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb index 07b6b90e7c..fd2eb3886c 100644 --- a/meta/recipes-connectivity/gupnp/gupnp_0.16.0.bb +++ b/meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb @@ -5,10 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://libgupnp/gupnp.h;beginline=1;endline=20;md5=28c49b17d623afc3335efc2e511879e1" DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2 gnome-icon-theme" -SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz" +SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz \ + file://introspection.patch" -SRC_URI[md5sum] = "61b240c1a9fdf8ca82c5c3adde0d6757" -SRC_URI[sha256sum] = "1b77201866b7632fb68bc2a3bdea22ef8ead34ba850b3ee367797432cfc0f04a" +SRC_URI[md5sum] = "021bb237741532af4bca50157ff326e4" +SRC_URI[sha256sum] = "f01a1f4fd36ce161a3df29fa83e1a0a2fb40d3c9f30f6b403e7791688ad24cfe" PR = "r0"