From patchwork Sat May 17 15:57:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 349939 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 7837D1401F0 for ; Sun, 18 May 2014 02:01:18 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BEC0F8C07A; Sat, 17 May 2014 16:01:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Sl7lLxvf4n+y; Sat, 17 May 2014 16:01:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id ED2818C280; Sat, 17 May 2014 15:59:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 488251BFA57 for ; Sat, 17 May 2014 15:58:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 461738931A for ; Sat, 17 May 2014 15:58:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RqQKt8x0m0zN for ; Sat, 17 May 2014 15:58:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout05.t-online.de (mailout05.t-online.de [194.25.134.82]) by hemlock.osuosl.org (Postfix) with ESMTPS id 8316089C8D for ; Sat, 17 May 2014 15:58:40 +0000 (UTC) Received: from fwd16.aul.t-online.de (fwd16.aul.t-online.de [172.20.26.243]) by mailout05.t-online.de (Postfix) with SMTP id A475419E844 for ; Sat, 17 May 2014 17:58:33 +0200 (CEST) Received: from fli4l.lan.fli4l (Gh7MOwZAYh1UnLMhjVnKg2SdsGqy5YYpxzwzQRHU+SgvKvOe4-sGhhRz520kMW0gFD@[87.146.210.206]) by fwd16.t-online.de with esmtp id 1Wlh0I-24ZSm80; Sat, 17 May 2014 17:58:30 +0200 Received: from fli4lbuild64.lan.fli4l ([192.168.1.51]:53189) by fli4l.lan.fli4l with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.80.1) (envelope-from ) id 1Wlh02-0000kD-1m; Sat, 17 May 2014 17:58:14 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 17 May 2014 17:57:45 +0200 Message-Id: <1400342276-10303-18-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1400342276-10303-1-git-send-email-bernd.kuhls@t-online.de> References: <1400342276-10303-1-git-send-email-bernd.kuhls@t-online.de> X-ID: Gh7MOwZAYh1UnLMhjVnKg2SdsGqy5YYpxzwzQRHU+SgvKvOe4-sGhhRz520kMW0gFD X-TOI-MSGID: 467ed993-ce23-4eb7-8bec-95c1c5aca6b3 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH v8 17/28] xbmc-pvr-addons: Version bump to xbmc Gotham-compatible addon X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Bernd Kuhls --- .../xbmc-pvr-addons-0001-buildfix.patch | 229 ++++++++++++++++++++ package/xbmc-pvr-addons/xbmc-pvr-addons.mk | 7 +- 2 files changed, 233 insertions(+), 3 deletions(-) create mode 100644 package/xbmc-pvr-addons/xbmc-pvr-addons-0001-buildfix.patch diff --git a/package/xbmc-pvr-addons/xbmc-pvr-addons-0001-buildfix.patch b/package/xbmc-pvr-addons/xbmc-pvr-addons-0001-buildfix.patch new file mode 100644 index 0000000..aa1fb08 --- /dev/null +++ b/package/xbmc-pvr-addons/xbmc-pvr-addons-0001-buildfix.patch @@ -0,0 +1,229 @@ +Add support to build in a seperate builddir + +source: https://github.com/opdenkamp/xbmc-pvr-addons/pull/224 + +patch taken from OpenElec +https://github.com/OpenELEC/OpenELEC.tv/blob/5d7777390abcb59cdc8f99c4253f89da94a8055c/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-buildfix.patch + +Signed-off-by: Bernd Kuhls + +diff -Naur xbmc-pvr-addons-f38b2eb/addons/Makefile.include.am xbmc-pvr-addons-f38b2eb.patch/addons/Makefile.include.am +--- xbmc-pvr-addons-f38b2eb/addons/Makefile.include.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/addons/Makefile.include.am 2014-05-04 14:35:47.618601552 +0200 +@@ -36,7 +36,9 @@ + mkdir -m 755 -p $(DESTDIR)@LIBDIR@/$(ADDONNAME) + mkdir -m 755 -p $(DESTDIR)@DATADIR@/$(ADDONNAME) + cp -f @BINPREFIX@$(ADDONBINNAME)@BIN_EXT@ $(DESTDIR)@LIBDIR@/$(ADDONNAME) ; chmod 655 $(DESTDIR)@LIBDIR@/$(ADDONNAME)/@BINPREFIX@$(ADDONBINNAME)@BIN_EXT@ +- cp -r -f @abs_top_srcdir@/addons/$(ADDONNAME)/addon/* $(DESTDIR)@DATADIR@/$(ADDONNAME) ; chmod -R o+rx $(DESTDIR)@DATADIR@/$(ADDONNAME) ++ cp -r -f @abs_top_srcdir@/addons/$(ADDONNAME)/addon/* $(DESTDIR)@DATADIR@/$(ADDONNAME) ++ cp -r -f @abs_top_builddir@/addons/$(ADDONNAME)/addon/* $(DESTDIR)@DATADIR@/$(ADDONNAME) ++ chmod -R o+rx $(DESTDIR)@DATADIR@/$(ADDONNAME) + endif + + all: @BUILD_TYPE@ +diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.argustv/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.argustv/Makefile.am +--- xbmc-pvr-addons-f38b2eb/addons/pvr.argustv/Makefile.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.argustv/Makefile.am 2014-05-04 14:35:47.618601552 +0200 +@@ -10,11 +10,11 @@ + LIBNAME = libargustv-addon + lib_LTLIBRARIES = libargustv-addon.la + +-LIBS = @abs_top_srcdir@/lib/jsoncpp/libjsoncpp.la ++LIBS = @abs_top_builddir@/lib/jsoncpp/libjsoncpp.la + + include ../Makefile.include.am + +-INCLUDES+=-Isrc -Isrc/lib/filesystem -I@abs_top_srcdir@/lib/jsoncpp/include ++INCLUDES+=-I$(srcdir)/src -I$(srcdir)/src/lib/filesystem -I@abs_top_srcdir@/lib/jsoncpp/include + + libargustv_addon_la_SOURCES = src/activerecording.cpp \ + src/channel.cpp \ +diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.demo/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.demo/Makefile.am +--- xbmc-pvr-addons-f38b2eb/addons/pvr.demo/Makefile.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.demo/Makefile.am 2014-05-04 14:35:47.618601552 +0200 +@@ -10,7 +10,7 @@ + LIBNAME = libpvrdemo-addon + lib_LTLIBRARIES = libpvrdemo-addon.la + +-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la ++LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la + + include ../Makefile.include.am + +diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.dvblink/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.dvblink/Makefile.am +--- xbmc-pvr-addons-f38b2eb/addons/pvr.dvblink/Makefile.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.dvblink/Makefile.am 2014-05-04 14:38:41.761644652 +0200 +@@ -10,11 +10,11 @@ + LIBNAME = libdvblink-addon + lib_LTLIBRARIES = libdvblink-addon.la + +-LIBS = @abs_top_srcdir@/lib/libdvblinkremote/libdvblinkremote.la ++LIBS = @abs_top_builddir@/lib/libdvblinkremote/libdvblinkremote.la + + include ../Makefile.include.am + +-INCLUDES+=-Isrc ++INCLUDES+=-I$(srcdir)/src + + libdvblink_addon_la_SOURCES = src/client.cpp \ + src/base64.cpp \ +diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.dvbviewer/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.dvbviewer/Makefile.am +--- xbmc-pvr-addons-f38b2eb/addons/pvr.dvbviewer/Makefile.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.dvbviewer/Makefile.am 2014-05-04 14:36:53.759689719 +0200 +@@ -10,7 +10,7 @@ + LIBNAME = libdvbviewer-addon + lib_LTLIBRARIES = libdvbviewer-addon.la + +-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la ++LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la + + include ../Makefile.include.am + +diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.hts/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.hts/Makefile.am +--- xbmc-pvr-addons-f38b2eb/addons/pvr.hts/Makefile.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.hts/Makefile.am 2014-05-04 14:35:47.618601552 +0200 +@@ -10,7 +10,7 @@ + LIBNAME = libtvheadend-addon + lib_LTLIBRARIES = libtvheadend-addon.la + +-LIBS = @abs_top_srcdir@/lib/libhts/libhts.la -ldl ++LIBS = @abs_top_builddir@/lib/libhts/libhts.la -ldl + + include ../Makefile.include.am + +diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.mediaportal.tvserver/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.mediaportal.tvserver/Makefile.am +--- xbmc-pvr-addons-f38b2eb/addons/pvr.mediaportal.tvserver/Makefile.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.mediaportal.tvserver/Makefile.am 2014-05-04 14:35:47.618601552 +0200 +@@ -10,11 +10,11 @@ + LIBNAME = libmediaportal-addon + lib_LTLIBRARIES = libmediaportal-addon.la + +-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la ++LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la + + include ../Makefile.include.am + +-INCLUDES+=-Isrc ++INCLUDES+=-I$(srcdir)/src + + libmediaportal_addon_la_SOURCES = src/Cards.cpp \ + src/channels.cpp \ +diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.mythtv.cmyth/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.mythtv.cmyth/Makefile.am +--- xbmc-pvr-addons-f38b2eb/addons/pvr.mythtv.cmyth/Makefile.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.mythtv.cmyth/Makefile.am 2014-05-04 14:35:47.618601552 +0200 +@@ -10,7 +10,7 @@ + LIBNAME = libmythtvcmyth-addon + lib_LTLIBRARIES = libmythtvcmyth-addon.la + +-LIBS = @abs_top_srcdir@/lib/cmyth/libcmyth.la ++LIBS = @abs_top_builddir@/lib/cmyth/libcmyth.la + + AM_CPPFLAGS = -I$(abs_top_srcdir)/lib/cmyth/include + +diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.nextpvr/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.nextpvr/Makefile.am +--- xbmc-pvr-addons-f38b2eb/addons/pvr.nextpvr/Makefile.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.nextpvr/Makefile.am 2014-05-04 14:35:47.618601552 +0200 +@@ -10,11 +10,11 @@ + LIBNAME = libnextpvr-addon + lib_LTLIBRARIES = libnextpvr-addon.la + +-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la ++LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la + + include ../Makefile.include.am + +-INCLUDES+=-Isrc ++INCLUDES+=-I$(srcdir)/src + + libnextpvr_addon_la_SOURCES = src/client.cpp \ + src/pvrclient-nextpvr.cpp \ +diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.njoy/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.njoy/Makefile.am +--- xbmc-pvr-addons-f38b2eb/addons/pvr.njoy/Makefile.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.njoy/Makefile.am 2014-05-04 14:35:47.618601552 +0200 +@@ -10,7 +10,7 @@ + LIBNAME = libpvrnjoy-addon + lib_LTLIBRARIES = libpvrnjoy-addon.la + +-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la ++LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la + + include ../Makefile.include.am + +diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.vuplus/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.vuplus/Makefile.am +--- xbmc-pvr-addons-f38b2eb/addons/pvr.vuplus/Makefile.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.vuplus/Makefile.am 2014-05-04 14:35:47.619601641 +0200 +@@ -10,7 +10,7 @@ + LIBNAME = libvuplus-addon + lib_LTLIBRARIES = libvuplus-addon.la + +-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la ++LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la + + include ../Makefile.include.am + +diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.wmc/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.wmc/Makefile.am +--- xbmc-pvr-addons-f38b2eb/addons/pvr.wmc/Makefile.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.wmc/Makefile.am 2014-05-04 14:35:47.619601641 +0200 +@@ -10,7 +10,7 @@ + LIBNAME = libpvrwmc-addon + lib_LTLIBRARIES = libpvrwmc-addon.la + +-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la ++LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la + + include ../Makefile.include.am + +diff -Naur xbmc-pvr-addons-f38b2eb/lib/cmyth/libcmyth/Makefile.am xbmc-pvr-addons-f38b2eb.patch/lib/cmyth/libcmyth/Makefile.am +--- xbmc-pvr-addons-f38b2eb/lib/cmyth/libcmyth/Makefile.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/lib/cmyth/libcmyth/Makefile.am 2014-05-04 14:35:47.619601641 +0200 +@@ -26,7 +26,7 @@ + storagegroup.c \ + epginfo.c + +-INCLUDES=-I../include/ $(MYSQL_INCLUDES) ++INCLUDES=-I$(srcdir)/../include/ $(MYSQL_INCLUDES) + + $(LIB): libcmyth.la + cp -f .libs/libcmyth.a . +diff -Naur xbmc-pvr-addons-f38b2eb/lib/cmyth/librefmem/Makefile.am xbmc-pvr-addons-f38b2eb.patch/lib/cmyth/librefmem/Makefile.am +--- xbmc-pvr-addons-f38b2eb/lib/cmyth/librefmem/Makefile.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/lib/cmyth/librefmem/Makefile.am 2014-05-04 14:35:47.619601641 +0200 +@@ -3,7 +3,7 @@ + librefmem_la_SOURCES = alloc.c \ + debug_refmem.c + +-INCLUDES=-I../include/ -I../libcmyth/ ++INCLUDES=-I$(srcdir)/../include/ -I$(srcdir)/../libcmyth/ + + $(LIB): librefmem.la + cp -f .libs/librefmem.a . +diff -Naur xbmc-pvr-addons-f38b2eb/lib/jsoncpp/Makefile.am xbmc-pvr-addons-f38b2eb.patch/lib/jsoncpp/Makefile.am +--- xbmc-pvr-addons-f38b2eb/lib/jsoncpp/Makefile.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/lib/jsoncpp/Makefile.am 2014-05-04 14:35:47.619601641 +0200 +@@ -4,7 +4,7 @@ + src/lib_json/json_value.cpp \ + src/lib_json/json_writer.cpp + +-INCLUDES=-Iinclude/ ++INCLUDES=-I$(srcdir)/include/ + + $(LIB): libjsoncpp.la + cp -f .libs/libjsoncpp.a . +diff -Naur xbmc-pvr-addons-f38b2eb/lib/libdvblinkremote/Makefile.am xbmc-pvr-addons-f38b2eb.patch/lib/libdvblinkremote/Makefile.am +--- xbmc-pvr-addons-f38b2eb/lib/libdvblinkremote/Makefile.am 2014-05-04 14:27:57.000000000 +0200 ++++ xbmc-pvr-addons-f38b2eb.patch/lib/libdvblinkremote/Makefile.am 2014-05-04 14:35:47.619601641 +0200 +@@ -26,10 +26,10 @@ + util.cpp \ + xml_object_serializer_factory.cpp + +-LIBS= @abs_top_srcdir@/lib/tinyxml2/libtinyxml2.la ++LIBS= @abs_top_builddir@/lib/tinyxml2/libtinyxml2.la + +-INCLUDES=-I.. ++INCLUDES=-I$(srcdir)/.. + + $(LIB): libdvblinkremote.la + cp -f .libs/libdvblinkremote.a . +- cp -f .libs/libdvblinkremote.la $(LIB) +\ Kein Zeilenumbruch am Dateiende. ++ cp -f .libs/libdvblinkremote.la $(LIB) diff --git a/package/xbmc-pvr-addons/xbmc-pvr-addons.mk b/package/xbmc-pvr-addons/xbmc-pvr-addons.mk index b6d061b..97628e2 100644 --- a/package/xbmc-pvr-addons/xbmc-pvr-addons.mk +++ b/package/xbmc-pvr-addons/xbmc-pvr-addons.mk @@ -4,9 +4,10 @@ # ################################################################################ -# This cset is on the branch 'frodo' -# When XBMC is updated, then this should be updated to the corresponding branch -XBMC_PVR_ADDONS_VERSION = 319351af7f3b546a5a56cdf6492f6ba1aec1cd2f +# This cset in 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_PVR_ADDONS_VERSION = f38b2ebdc6f96244d5e4bc584315f4a2c24bc787 XBMC_PVR_ADDONS_SITE = $(call github,opdenkamp,xbmc-pvr-addons,$(XBMC_PVR_ADDONS_VERSION)) XBMC_PVR_ADDONS_LICENSE = GPLv3+ XBMC_PVR_ADDONS_LICENSE_FILES = COPYING