From 2886fa0b8a75146922536c782eb03d122fcb2ac9 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 26 Mar 2015 19:31:52 +0200 Subject: [PATCH] kodi-pvr-addons: update to kodi-pvr-addons-4854fbe myth was updated upstream. should fix RPi2 crashes mysql is no more. --- .../mediacenter/kodi-pvr-addons/package.mk | 15 +- .../patches/kodi-pvr-addons-buildfix.patch | 244 ------------------ 2 files changed, 7 insertions(+), 252 deletions(-) delete mode 100644 packages/mediacenter/kodi-pvr-addons/patches/kodi-pvr-addons-buildfix.patch diff --git a/packages/mediacenter/kodi-pvr-addons/package.mk b/packages/mediacenter/kodi-pvr-addons/package.mk index fa8d7c7032..2b6cfa0707 100644 --- a/packages/mediacenter/kodi-pvr-addons/package.mk +++ b/packages/mediacenter/kodi-pvr-addons/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kodi-pvr-addons" -PKG_VERSION="da4c212" +PKG_VERSION="4854fbe" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -31,15 +31,14 @@ PKG_LONGDESC="This addons allows Kodi PVR to connect to various TV/PVR backends PKG_IS_ADDON="no" PKG_AUTORECONF="yes" -if [ "$KODI_MYSQL_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mysql" - PVRADDONS_MYSQL="--enable-mysql" -else - PVRADDONS_MYSQL="--disable-mysql" -fi - PKG_CONFIGURE_OPTS_TARGET="--enable-addons-with-dependencies $PVRADDONS_MYSQL" +pre_configure_target() { + # kodi-pvr-addons fails to build in subdirs + cd $ROOT/$PKG_BUILD + rm -rf .$TARGET_NAME +} + post_makeinstall_target() { if [ "$DEBUG" != yes ]; then $STRIP $INSTALL/usr/lib/kodi/addons/pvr.*/*.pvr diff --git a/packages/mediacenter/kodi-pvr-addons/patches/kodi-pvr-addons-buildfix.patch b/packages/mediacenter/kodi-pvr-addons/patches/kodi-pvr-addons-buildfix.patch deleted file mode 100644 index dbcd35cf4d..0000000000 --- a/packages/mediacenter/kodi-pvr-addons/patches/kodi-pvr-addons-buildfix.patch +++ /dev/null @@ -1,244 +0,0 @@ -diff -Naur xbmc-pvr-addons-259d150/addons/Makefile.include.am xbmc-pvr-addons-259d150.patch/addons/Makefile.include.am ---- xbmc-pvr-addons-259d150/addons/Makefile.include.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/addons/Makefile.include.am 2014-10-06 04:15:06.328573254 +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@; find $(DESTDIR)@DATADIR@/$(ADDONNAME) -type f -exec chmod 0644 {} \; -- 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) - rm -f $(DESTDIR)@DATADIR@/$(ADDONNAME)/addon.xml.in - endif - -diff -Naur xbmc-pvr-addons-259d150/addons/pvr.argustv/Makefile.am xbmc-pvr-addons-259d150.patch/addons/pvr.argustv/Makefile.am ---- xbmc-pvr-addons-259d150/addons/pvr.argustv/Makefile.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/addons/pvr.argustv/Makefile.am 2014-10-06 04:15:06.329573255 +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-259d150/addons/pvr.demo/Makefile.am xbmc-pvr-addons-259d150.patch/addons/pvr.demo/Makefile.am ---- xbmc-pvr-addons-259d150/addons/pvr.demo/Makefile.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/addons/pvr.demo/Makefile.am 2014-10-06 04:15:06.329573255 +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-259d150/addons/pvr.dvblink/Makefile.am xbmc-pvr-addons-259d150.patch/addons/pvr.dvblink/Makefile.am ---- xbmc-pvr-addons-259d150/addons/pvr.dvblink/Makefile.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/addons/pvr.dvblink/Makefile.am 2014-10-06 04:15:06.329573255 +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-259d150/addons/pvr.dvbviewer/Makefile.am xbmc-pvr-addons-259d150.patch/addons/pvr.dvbviewer/Makefile.am ---- xbmc-pvr-addons-259d150/addons/pvr.dvbviewer/Makefile.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/addons/pvr.dvbviewer/Makefile.am 2014-10-06 04:15:06.329573255 +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-259d150/addons/pvr.filmon/Makefile.am xbmc-pvr-addons-259d150.patch/addons/pvr.filmon/Makefile.am ---- xbmc-pvr-addons-259d150/addons/pvr.filmon/Makefile.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/addons/pvr.filmon/Makefile.am 2014-10-06 04:17:19.151812688 +0200 -@@ -12,6 +12,8 @@ - - include ../Makefile.include.am - -+INCLUDES+=-I$(srcdir)/src -I@abs_top_srcdir@/lib/jsoncpp/include -+ - libpvrfilmon_addon_la_SOURCES = src/client.cpp \ - src/PVRFilmonData.cpp \ - src/FilmonAPI.cpp -diff -Naur xbmc-pvr-addons-259d150/addons/pvr.filmon/src/FilmonAPI.cpp xbmc-pvr-addons-259d150.patch/addons/pvr.filmon/src/FilmonAPI.cpp ---- xbmc-pvr-addons-259d150/addons/pvr.filmon/src/FilmonAPI.cpp 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/addons/pvr.filmon/src/FilmonAPI.cpp 2014-10-06 04:17:33.320829688 +0200 -@@ -26,7 +26,7 @@ - #include - - #include --#include -+#include - #include - #include - -diff -Naur xbmc-pvr-addons-259d150/addons/pvr.hts/Makefile.am xbmc-pvr-addons-259d150.patch/addons/pvr.hts/Makefile.am ---- xbmc-pvr-addons-259d150/addons/pvr.hts/Makefile.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/addons/pvr.hts/Makefile.am 2014-10-06 04:15:06.330573257 +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-259d150/addons/pvr.mediaportal.tvserver/Makefile.am xbmc-pvr-addons-259d150.patch/addons/pvr.mediaportal.tvserver/Makefile.am ---- xbmc-pvr-addons-259d150/addons/pvr.mediaportal.tvserver/Makefile.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/addons/pvr.mediaportal.tvserver/Makefile.am 2014-10-06 04:15:06.330573257 +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-259d150/addons/pvr.mythtv/Makefile.am xbmc-pvr-addons-259d150.patch/addons/pvr.mythtv/Makefile.am ---- xbmc-pvr-addons-259d150/addons/pvr.mythtv/Makefile.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/addons/pvr.mythtv/Makefile.am 2014-10-06 04:15:06.330573257 +0200 -@@ -10,15 +10,15 @@ - LIBNAME = libmythtv-addon - lib_LTLIBRARIES = libmythtv-addon.la - --LIBS = @abs_top_srcdir@/lib/cppmyth/cppmyth/libcppmyth.la \ -- @abs_top_srcdir@/lib/cppmyth/jansson/src/libjansson.la -+LIBS = @abs_top_builddir@/lib/cppmyth/cppmyth/libcppmyth.la \ -+ @abs_top_builddir@/lib/cppmyth/jansson/src/libjansson.la - - AM_CPPFLAGS = -I@abs_top_srcdir@/lib/cppmyth/cppmyth/src - - include ../Makefile.include.am - - if HAVE_VERSION_SCRIPT --libmythtv_addon_la_LDFLAGS = -Wl,--version-script=src/addon.map \ -+libmythtv_addon_la_LDFLAGS = -Wl,--version-script=@abs_top_srcdir@/addons/pvr.mythtv/src/addon.map \ - @TARGET_LDFLAGS@ - else - libmythtv_addon_la_LDFLAGS = @TARGET_LDFLAGS@ -diff -Naur xbmc-pvr-addons-259d150/addons/pvr.nextpvr/Makefile.am xbmc-pvr-addons-259d150.patch/addons/pvr.nextpvr/Makefile.am ---- xbmc-pvr-addons-259d150/addons/pvr.nextpvr/Makefile.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/addons/pvr.nextpvr/Makefile.am 2014-10-06 04:15:06.331573258 +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-259d150/addons/pvr.njoy/Makefile.am xbmc-pvr-addons-259d150.patch/addons/pvr.njoy/Makefile.am ---- xbmc-pvr-addons-259d150/addons/pvr.njoy/Makefile.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/addons/pvr.njoy/Makefile.am 2014-10-06 04:15:06.331573258 +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-259d150/addons/pvr.vuplus/Makefile.am xbmc-pvr-addons-259d150.patch/addons/pvr.vuplus/Makefile.am ---- xbmc-pvr-addons-259d150/addons/pvr.vuplus/Makefile.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/addons/pvr.vuplus/Makefile.am 2014-10-06 04:15:06.331573258 +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-259d150/addons/pvr.wmc/Makefile.am xbmc-pvr-addons-259d150.patch/addons/pvr.wmc/Makefile.am ---- xbmc-pvr-addons-259d150/addons/pvr.wmc/Makefile.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/addons/pvr.wmc/Makefile.am 2014-10-06 04:15:06.331573258 +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-259d150/lib/cppmyth/cppmyth/Makefile.am xbmc-pvr-addons-259d150.patch/lib/cppmyth/cppmyth/Makefile.am ---- xbmc-pvr-addons-259d150/lib/cppmyth/cppmyth/Makefile.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/lib/cppmyth/cppmyth/Makefile.am 2014-10-06 04:15:06.332573260 +0200 -@@ -3,7 +3,9 @@ - - AM_CPPFLAGS = -fPIC -Wall -Wextra \ - -I@abs_srcdir@/src \ -- -I@abs_top_srcdir@/jansson/src -+ -I@abs_top_srcdir@/jansson/src \ -+ -I@abs_top_builddir@/cppmyth/src \ -+ -I@abs_top_builddir@/jansson/src - - libcppmyth_la_SOURCES = \ - src/private/mythdto/mythdto.cpp \ -diff -Naur xbmc-pvr-addons-259d150/lib/jsoncpp/Makefile.am xbmc-pvr-addons-259d150.patch/lib/jsoncpp/Makefile.am ---- xbmc-pvr-addons-259d150/lib/jsoncpp/Makefile.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/lib/jsoncpp/Makefile.am 2014-10-06 04:15:06.332573260 +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-259d150/lib/libdvblinkremote/Makefile.am xbmc-pvr-addons-259d150.patch/lib/libdvblinkremote/Makefile.am ---- xbmc-pvr-addons-259d150/lib/libdvblinkremote/Makefile.am 2014-10-06 03:49:06.000000000 +0200 -+++ xbmc-pvr-addons-259d150.patch/lib/libdvblinkremote/Makefile.am 2014-10-06 04:15:06.332573260 +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)