From a0d0abc16024153f0e1e18166e71a58b4eae08cb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 7 Jun 2014 14:31:09 +0200 Subject: [PATCH] xbmc-addon-xvdr: bump to a version compatible with XBMC Gotham Removed patch applied upstream. [Thomas: fix typo noticed by Yann.] Signed-off-by: Bernd Kuhls Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- ...bmc-addon-xvdr-0001-foreign-automake.patch | 28 ------------------- package/xbmc-addon-xvdr/xbmc-addon-xvdr.mk | 7 +++-- 2 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 package/xbmc-addon-xvdr/xbmc-addon-xvdr-0001-foreign-automake.patch diff --git a/package/xbmc-addon-xvdr/xbmc-addon-xvdr-0001-foreign-automake.patch b/package/xbmc-addon-xvdr/xbmc-addon-xvdr-0001-foreign-automake.patch deleted file mode 100644 index 0f49dcf3e4..0000000000 --- a/package/xbmc-addon-xvdr/xbmc-addon-xvdr-0001-foreign-automake.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 846b0b5a8b559f94dffadf5b2f95ca845b6ba9f1 -Author: Yann E. MORIN -Date: Wed Mar 26 07:45:58 2014 +0100 - - configure: set the foreign flag - - This is required since we do not bundle the necessary files (NEWS, - INSTALL et al.) Setting it in configure.in is needed to be able - to run autoreconf (in lieu of the weird autogen.sh) - - Signed-off-by: "Yann E. MORIN" - -Patch accepted upstream in master: - https://github.com/pipelka/xbmc-addon-xvdr/commit/84e5860f488e67a3a3386c779f9a56adeb3dc220 - -diff --git a/configure.in b/configure.in -index 6e692e1..7be0d18 100755 ---- a/configure.in -+++ b/configure.in -@@ -12,7 +12,7 @@ AC_CANONICAL_HOST - AC_CANONICAL_TARGET - - dnl Setup for automake --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - - dnl Check for tools - diff --git a/package/xbmc-addon-xvdr/xbmc-addon-xvdr.mk b/package/xbmc-addon-xvdr/xbmc-addon-xvdr.mk index 28c90f7ce9..a4d96247d6 100644 --- a/package/xbmc-addon-xvdr/xbmc-addon-xvdr.mk +++ b/package/xbmc-addon-xvdr/xbmc-addon-xvdr.mk @@ -4,9 +4,10 @@ # ################################################################################ -# This cset is on the branch 'xbmc-frodo' -# When XBMC is updated, then this should be updated to the corresponding branch -XBMC_ADDON_XVDR_VERSION = acd4e145fc3220cf708aaf40d895904732dce2c7 +# This cset is on master. When a Gotham branch is made, we should +# follow it, as incompatible changes in the plugins API can happen +# on the master branch. +XBMC_ADDON_XVDR_VERSION = 82b5093ad33847f97a978cb620c9a87d2dbcf7eb XBMC_ADDON_XVDR_SITE = $(call github,pipelka,xbmc-addon-xvdr,$(XBMC_ADDON_XVDR_VERSION)) XBMC_ADDON_XVDR_LICENSE = GPLv2+ XBMC_ADDON_XVDR_LICENSE_FILES = COPYING -- 2.30.2