From 385752703114bd0a2b4e3e3a3bf6bf8684f1fb28 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 17 Feb 2020 22:08:41 -0800 Subject: gupnp-dlna: Rename patchdir to PN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes is specific to gupnp-dlna alone since thats only recipe using the patches inside files Signed-off-by: Khem Raj Cc: Andreas Müller --- .../gupnp/files/move_vapigen.patch | 102 --------------------- .../gupnp/gupnp-dlna/move_vapigen.patch | 102 +++++++++++++++++++++ 2 files changed, 102 insertions(+), 102 deletions(-) delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/move_vapigen.patch (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 deleted file mode 100644 index 9bfc31b8eb..0000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/files/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 -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/move_vapigen.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/move_vapigen.patch new file mode 100644 index 0000000000..9bfc31b8eb --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/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="" +- ])])]) +-]) -- cgit 1.2.3-korg