Signed-off-by: Andreas Müller <[email protected]> --- .../gupnp/gupnp-dlna/move_vapigen.patch | 102 ------------------ ...np-dlna_0.10.5.bb => gupnp-dlna_0.12.0.bb} | 11 +- 2 files changed, 4 insertions(+), 109 deletions(-) delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/move_vapigen.patch rename meta-multimedia/recipes-connectivity/gupnp/{gupnp-dlna_0.10.5.bb => gupnp-dlna_0.12.0.bb} (45%)
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/move_vapigen.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/move_vapigen.patch deleted file mode 100644 index 9bfc31b8e..000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/move_vapigen.patch +++ /dev/null @@ -1,102 +0,0 @@ -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 <[email protected]> -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 <[email protected]> -+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 <[email protected]> -+ -+# 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 <[email protected]> --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 <[email protected]> -- --# 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.12.0.bb similarity index 45% rename from meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.10.5.bb rename to meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.12.0.bb index 7cb9ff91e..e1758c19b 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.10.5.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.12.0.bb @@ -5,15 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ 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" +SRC_URI = "http://download.gnome.org/sources/${BPN}/0.12/${BPN}-${PV}.tar.xz"; +SRC_URI[sha256sum] = "3d53b96f85bc5628d33e367ec9bf2adb38ef2b34d7ad0434a6ba0cf4ad9048e6" -inherit autotools pkgconfig gobject-introspection vala +inherit meson pkgconfig gobject-introspection vala PACKAGECONFIG ?= "gstreamer" -PACKAGECONFIG[gstreamer] = "--enable-gstreamer-metadata-backend,--disable-gstreamer-metadata-backend,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[gstreamer] = "-Dgstreamer_backend=enabled,-Dgstreamer_backend=disabled,gstreamer1.0 gstreamer1.0-plugins-base" FILES:${PN} += "${datadir}/gupnp-dlna-2.0/dlna-profiles" -- 2.31.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#94596): https://lists.openembedded.org/g/openembedded-devel/message/94596 Mute This Topic: https://lists.openembedded.org/mt/88058498/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
