From 30de915efca9f55a65ee0b4e780332f5e28abadc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 9 May 2017 00:57:04 -0700 Subject: gupnp-dlna: Upgrade to 0.10.5 Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- .../gupnp/files/move_vapigen.patch | 102 +++++++++++++++++++++ .../gupnp/gupnp-dlna_0.10.5.bb | 19 ++++ .../recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb | 17 ---- 3 files changed, 121 insertions(+), 17 deletions(-) create mode 100644 meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.10.5.bb delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb (limited to 'meta-multimedia') diff --git a/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch b/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch new file mode 100644 index 0000000000..9bfc31b8eb --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch @@ -0,0 +1,102 @@ +OE-Core's vala class known one type of vapigen.m4 and deletes it since its +not cross compile friendly, but this is a different case here where its not +same vapigen.m4 just name is same and it tends to inherit vala bbclass so +save it + +Signed-off-by: Khem Raj +Index: gupnp-dlna-0.10.5/m4/vapigen-custom.m4 +=================================================================== +--- /dev/null ++++ gupnp-dlna-0.10.5/m4/vapigen-custom.m4 +@@ -0,0 +1,43 @@ ++ ++dnl vala.m4 ++dnl ++dnl Copyright 2010 Marc-Andre Lureau ++dnl Copyright 2011 Rodney Dawes ++dnl ++dnl This library is free software; you can redistribute it and/or ++dnl modify it under the terms of the GNU Lesser General Public ++dnl License as published by the Free Software Foundation; either ++dnl version 2.1 of the License, or (at your option) any later version. ++dnl ++dnl This library is distributed in the hope that it will be useful, ++dnl but WITHOUT ANY WARRANTY; without even the implied warranty of ++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++dnl Lesser General Public License for more details. ++dnl ++dnl You should have received a copy of the GNU Lesser General Public ++dnl License along with this library; if not, write to the Free Software ++dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ ++dnl dropped everything but VALA_PROG_VAPIGEN - Jens Georg ++ ++# Check whether the Vala API Generator exists in `PATH'. If it is found, ++# the variable VAPIGEN is set. Optionally a minimum release number of the ++# generator can be requested. ++# ++# VALA_PROG_VAPIGEN([MINIMUM-VERSION]) ++# ------------------------------------ ++AC_DEFUN([GUPNP_PROG_VAPIGEN], ++[AC_PATH_PROG([VAPIGEN], [vapigen], []) ++ AS_IF([test -z "$VAPIGEN"], ++ [AC_MSG_WARN([No Vala API Generator found. You will not be able to generate .vapi files.])], ++ [AS_IF([test -n "$1"], ++ [AC_MSG_CHECKING([$VAPIGEN is at least version $1]) ++ am__vapigen_version=`$VAPIGEN --version | sed 's/Vala API Generator *//'` ++ AS_VERSION_COMPARE([$1], ["$am__vapigen_version"], ++ [AC_MSG_RESULT([yes])], ++ [AC_MSG_RESULT([yes])], ++ [AC_MSG_RESULT([no]) ++ AC_MSG_WARN([Vala API Generator $1 not found.]) ++ VAPIGEN="" ++ ])])]) ++]) +Index: gupnp-dlna-0.10.5/m4/vapigen.m4 +=================================================================== +--- gupnp-dlna-0.10.5.orig/m4/vapigen.m4 ++++ /dev/null +@@ -1,43 +0,0 @@ +- +-dnl vala.m4 +-dnl +-dnl Copyright 2010 Marc-Andre Lureau +-dnl Copyright 2011 Rodney Dawes +-dnl +-dnl This library is free software; you can redistribute it and/or +-dnl modify it under the terms of the GNU Lesser General Public +-dnl License as published by the Free Software Foundation; either +-dnl version 2.1 of the License, or (at your option) any later version. +-dnl +-dnl This library is distributed in the hope that it will be useful, +-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-dnl Lesser General Public License for more details. +-dnl +-dnl You should have received a copy of the GNU Lesser General Public +-dnl License along with this library; if not, write to the Free Software +-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +- +-dnl dropped everything but VALA_PROG_VAPIGEN - Jens Georg +- +-# Check whether the Vala API Generator exists in `PATH'. If it is found, +-# the variable VAPIGEN is set. Optionally a minimum release number of the +-# generator can be requested. +-# +-# VALA_PROG_VAPIGEN([MINIMUM-VERSION]) +-# ------------------------------------ +-AC_DEFUN([GUPNP_PROG_VAPIGEN], +-[AC_PATH_PROG([VAPIGEN], [vapigen], []) +- AS_IF([test -z "$VAPIGEN"], +- [AC_MSG_WARN([No Vala API Generator found. You will not be able to generate .vapi files.])], +- [AS_IF([test -n "$1"], +- [AC_MSG_CHECKING([$VAPIGEN is at least version $1]) +- am__vapigen_version=`$VAPIGEN --version | sed 's/Vala API Generator *//'` +- AS_VERSION_COMPARE([$1], ["$am__vapigen_version"], +- [AC_MSG_RESULT([yes])], +- [AC_MSG_RESULT([yes])], +- [AC_MSG_RESULT([no]) +- AC_MSG_WARN([Vala API Generator $1 not found.]) +- VAPIGEN="" +- ])])]) +-]) diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.10.5.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.10.5.bb new file mode 100644 index 0000000000..3cafd69764 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.10.5.bb @@ -0,0 +1,19 @@ +SUMMARY = "Helpers for AV applications using DLNA" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://libgupnp-dlna/gupnp-dlna-profile.h;beginline=1;endline=22;md5=1b85459f65cb1e73a885ca137aab6274" + +DEPENDS = "libxml2 glib-2.0" + +SRC_URI = "http://download.gnome.org/sources/${BPN}/0.10/${BPN}-${PV}.tar.xz \ + file://move_vapigen.patch \ +" +SRC_URI[md5sum] = "2d0dc1e4189d0243ac3838ece1e8fea0" +SRC_URI[sha256sum] = "123e368227c11d5c17fc1aa76cbdaffa345355eb51d172cd39fc74a5b468ff6a" + +inherit autotools pkgconfig gobject-introspection vala + +PACKAGECONFIG ?= "gstreamer" +PACKAGECONFIG[gstreamer] = "--enable-gstreamer-metadata-backend,--disable-gstreamer-metadata-backend,gstreamer1.0 gstreamer1.0-plugins-base" + +FILES_${PN} += "${datadir}/gupnp-dlna-2.0/dlna-profiles" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb deleted file mode 100644 index 053604e120..0000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Helpers for AV applications using DLNA" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://libgupnp-dlna/gupnp-dlna-profile.h;beginline=1;endline=22;md5=1b85459f65cb1e73a885ca137aab6274" - -DEPENDS = "libxml2 glib-2.0" - -SRC_URI = "http://download.gnome.org/sources/${BPN}/0.9/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "f93665e535a512e4d515a86311435cb6" -SRC_URI[sha256sum] = "69969713f36c0e815fbbbcfdfb3ad9bd447cfd10d0fd86227d82dfd8edb6c807" - -inherit autotools pkgconfig gobject-introspection vala - -PACKAGECONFIG ?= "gstreamer" -PACKAGECONFIG[gstreamer] = "--enable-gstreamer-metadata-backend,--disable-gstreamer-metadata-backend,gstreamer1.0 gstreamer1.0-plugins-base" - -FILES_${PN} += "${datadir}/gupnp-dlna-2.0/dlna-profiles" -- cgit 1.2.3-korg