xbmc-pvr-addons: update to xbmc-pvr-addons-accba45

This commit is contained in:
Stefan Saraev 2013-11-11 22:28:38 +02:00
parent 6c38427f31
commit 29830e30d3
2 changed files with 95 additions and 51 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-pvr-addons"
PKG_VERSION="cd5023b"
PKG_VERSION="accba45"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -1,7 +1,8 @@
diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/Makefile.include.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/Makefile.include.am
--- xbmc-pvr-addons-frodo-910d7e7/addons/Makefile.include.am 2013-09-09 01:56:00.000000000 +0200
+++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/Makefile.include.am 2013-09-09 18:54:06.000000000 +0200
@@ -36,7 +36,9 @@
diff --git a/addons/Makefile.include.am b/addons/Makefile.include.am
index 81c55a5..5324046 100644
--- a/addons/Makefile.include.am
+++ b/addons/Makefile.include.am
@@ -36,7 +36,9 @@ else
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@
@ -12,10 +13,11 @@ diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/Makefile.include.am xbmc-pvr-add
endif
all: @BUILD_TYPE@
diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.argustv/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.argustv/Makefile.am
--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.argustv/Makefile.am 2013-09-09 01:56:00.000000000 +0200
+++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.argustv/Makefile.am 2013-09-09 03:48:49.756563520 +0200
@@ -10,11 +10,11 @@
diff --git a/addons/pvr.argustv/Makefile.am b/addons/pvr.argustv/Makefile.am
index c8d334b..87344be 100644
--- a/addons/pvr.argustv/Makefile.am
+++ b/addons/pvr.argustv/Makefile.am
@@ -10,11 +10,11 @@ ADDONNAME = pvr.argustv
LIBNAME = libargustv-addon
lib_LTLIBRARIES = libargustv-addon.la
@ -29,10 +31,11 @@ diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.argustv/Makefile.am xbmc-pvr
libargustv_addon_la_SOURCES = src/activerecording.cpp \
src/channel.cpp \
diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.demo/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.demo/Makefile.am
--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.demo/Makefile.am 2013-09-09 01:56:00.000000000 +0200
+++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.demo/Makefile.am 2013-09-09 03:34:14.482815303 +0200
@@ -10,7 +10,7 @@
diff --git a/addons/pvr.demo/Makefile.am b/addons/pvr.demo/Makefile.am
index 88081b5..c9b53b7 100644
--- a/addons/pvr.demo/Makefile.am
+++ b/addons/pvr.demo/Makefile.am
@@ -10,7 +10,7 @@ ADDONNAME = pvr.demo
LIBNAME = libpvrdemo-addon
lib_LTLIBRARIES = libpvrdemo-addon.la
@ -41,10 +44,24 @@ diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.demo/Makefile.am xbmc-pvr-ad
include ../Makefile.include.am
diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.hts/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.hts/Makefile.am
--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.hts/Makefile.am 2013-09-09 01:56:00.000000000 +0200
+++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.hts/Makefile.am 2013-09-09 03:39:48.924418632 +0200
@@ -10,7 +10,7 @@
diff --git a/addons/pvr.dvblink/Makefile.am b/addons/pvr.dvblink/Makefile.am
index 422aa7e..17f0c0f 100644
--- a/addons/pvr.dvblink/Makefile.am
+++ b/addons/pvr.dvblink/Makefile.am
@@ -10,7 +10,7 @@ ADDONNAME = pvr.dvblink
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
diff --git a/addons/pvr.hts/Makefile.am b/addons/pvr.hts/Makefile.am
index 9a04a49..e732e0c 100644
--- a/addons/pvr.hts/Makefile.am
+++ b/addons/pvr.hts/Makefile.am
@@ -10,7 +10,7 @@ ADDONNAME = pvr.hts
LIBNAME = libtvheadend-addon
lib_LTLIBRARIES = libtvheadend-addon.la
@ -53,10 +70,11 @@ diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.hts/Makefile.am xbmc-pvr-add
include ../Makefile.include.am
diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.mediaportal.tvserver/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.mediaportal.tvserver/Makefile.am
--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.mediaportal.tvserver/Makefile.am 2013-09-09 01:56:00.000000000 +0200
+++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.mediaportal.tvserver/Makefile.am 2013-09-09 03:45:22.546295558 +0200
@@ -10,11 +10,11 @@
diff --git a/addons/pvr.mediaportal.tvserver/Makefile.am b/addons/pvr.mediaportal.tvserver/Makefile.am
index eae58bb..cc7c696 100644
--- a/addons/pvr.mediaportal.tvserver/Makefile.am
+++ b/addons/pvr.mediaportal.tvserver/Makefile.am
@@ -10,11 +10,11 @@ ADDONNAME = pvr.mediaportal.tvserver
LIBNAME = libmediaportal-addon
lib_LTLIBRARIES = libmediaportal-addon.la
@ -70,10 +88,11 @@ diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.mediaportal.tvserver/Makefil
libmediaportal_addon_la_SOURCES = src/Cards.cpp \
src/channels.cpp \
diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.mythtv.cmyth/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.mythtv.cmyth/Makefile.am
--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.mythtv.cmyth/Makefile.am 2013-09-09 01:56:00.000000000 +0200
+++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.mythtv.cmyth/Makefile.am 2013-09-09 03:41:06.664969675 +0200
@@ -10,7 +10,7 @@
diff --git a/addons/pvr.mythtv.cmyth/Makefile.am b/addons/pvr.mythtv.cmyth/Makefile.am
index dcc5901..a70a68a 100644
--- a/addons/pvr.mythtv.cmyth/Makefile.am
+++ b/addons/pvr.mythtv.cmyth/Makefile.am
@@ -10,7 +10,7 @@ ADDONNAME = pvr.mythtv.cmyth
LIBNAME = libmythtvcmyth-addon
lib_LTLIBRARIES = libmythtvcmyth-addon.la
@ -82,10 +101,11 @@ diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.mythtv.cmyth/Makefile.am xbm
AM_CPPFLAGS = -I$(abs_top_srcdir)/lib/cmyth/include
diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.nextpvr/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.nextpvr/Makefile.am
--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.nextpvr/Makefile.am 2013-09-09 01:56:00.000000000 +0200
+++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.nextpvr/Makefile.am 2013-09-09 03:49:09.311590467 +0200
@@ -10,11 +10,11 @@
diff --git a/addons/pvr.nextpvr/Makefile.am b/addons/pvr.nextpvr/Makefile.am
index 08838f5..bb9f5d2 100644
--- a/addons/pvr.nextpvr/Makefile.am
+++ b/addons/pvr.nextpvr/Makefile.am
@@ -10,11 +10,11 @@ ADDONNAME = pvr.nextpvr
LIBNAME = libnextpvr-addon
lib_LTLIBRARIES = libnextpvr-addon.la
@ -99,10 +119,11 @@ diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.nextpvr/Makefile.am xbmc-pvr
libnextpvr_addon_la_SOURCES = src/client.cpp \
src/pvrclient-nextpvr.cpp \
diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.njoy/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.njoy/Makefile.am
--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.njoy/Makefile.am 2013-09-09 01:56:00.000000000 +0200
+++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.njoy/Makefile.am 2013-09-09 03:36:15.792970520 +0200
@@ -10,7 +10,7 @@
diff --git a/addons/pvr.njoy/Makefile.am b/addons/pvr.njoy/Makefile.am
index 6395f44..b64575d 100644
--- a/addons/pvr.njoy/Makefile.am
+++ b/addons/pvr.njoy/Makefile.am
@@ -10,7 +10,7 @@ ADDONNAME = pvr.njoy
LIBNAME = libpvrnjoy-addon
lib_LTLIBRARIES = libpvrnjoy-addon.la
@ -111,10 +132,11 @@ diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.njoy/Makefile.am xbmc-pvr-ad
include ../Makefile.include.am
diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.vuplus/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.vuplus/Makefile.am
--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.vuplus/Makefile.am 2013-09-09 01:56:00.000000000 +0200
+++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.vuplus/Makefile.am 2013-09-09 03:35:22.527902278 +0200
@@ -10,7 +10,7 @@
diff --git a/addons/pvr.vuplus/Makefile.am b/addons/pvr.vuplus/Makefile.am
index 7fda63e..08fcc9b 100644
--- a/addons/pvr.vuplus/Makefile.am
+++ b/addons/pvr.vuplus/Makefile.am
@@ -10,7 +10,7 @@ ADDONNAME = pvr.vuplus
LIBNAME = libvuplus-addon
lib_LTLIBRARIES = libvuplus-addon.la
@ -123,22 +145,24 @@ diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.vuplus/Makefile.am xbmc-pvr-
include ../Makefile.include.am
diff -Naur xbmc-pvr-addons-frodo-910d7e7/lib/cmyth/libcmyth/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/lib/cmyth/libcmyth/Makefile.am
--- xbmc-pvr-addons-frodo-910d7e7/lib/cmyth/libcmyth/Makefile.am 2013-09-09 01:56:00.000000000 +0200
+++ xbmc-pvr-addons-frodo-910d7e7.patch/lib/cmyth/libcmyth/Makefile.am 2013-09-09 03:02:37.362378511 +0200
@@ -25,7 +25,7 @@
channel.c \
storagegroup.c
diff --git a/lib/cmyth/libcmyth/Makefile.am b/lib/cmyth/libcmyth/Makefile.am
index de75de6..b15eb75 100644
--- a/lib/cmyth/libcmyth/Makefile.am
+++ b/lib/cmyth/libcmyth/Makefile.am
@@ -26,7 +26,7 @@ libcmyth_la_SOURCES = bookmark.c \
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-frodo-910d7e7/lib/cmyth/librefmem/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/lib/cmyth/librefmem/Makefile.am
--- xbmc-pvr-addons-frodo-910d7e7/lib/cmyth/librefmem/Makefile.am 2013-09-09 01:56:00.000000000 +0200
+++ xbmc-pvr-addons-frodo-910d7e7.patch/lib/cmyth/librefmem/Makefile.am 2013-09-09 02:58:20.664045817 +0200
@@ -3,7 +3,7 @@
diff --git a/lib/cmyth/librefmem/Makefile.am b/lib/cmyth/librefmem/Makefile.am
index 1bdfb35..68d21be 100644
--- a/lib/cmyth/librefmem/Makefile.am
+++ b/lib/cmyth/librefmem/Makefile.am
@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = librefmem.la
librefmem_la_SOURCES = alloc.c \
debug_refmem.c
@ -147,10 +171,11 @@ diff -Naur xbmc-pvr-addons-frodo-910d7e7/lib/cmyth/librefmem/Makefile.am xbmc-pv
$(LIB): librefmem.la
cp -f .libs/librefmem.a .
diff -Naur xbmc-pvr-addons-frodo-910d7e7/lib/jsoncpp/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/lib/jsoncpp/Makefile.am
--- xbmc-pvr-addons-frodo-910d7e7/lib/jsoncpp/Makefile.am 2013-09-09 01:56:00.000000000 +0200
+++ xbmc-pvr-addons-frodo-910d7e7.patch/lib/jsoncpp/Makefile.am 2013-09-09 02:53:57.575708599 +0200
@@ -4,7 +4,7 @@
diff --git a/lib/jsoncpp/Makefile.am b/lib/jsoncpp/Makefile.am
index 659b91c..3e4739c 100644
--- a/lib/jsoncpp/Makefile.am
+++ b/lib/jsoncpp/Makefile.am
@@ -4,7 +4,7 @@ libjsoncpp_la_SOURCES = src/lib_json/json_reader.cpp \
src/lib_json/json_value.cpp \
src/lib_json/json_writer.cpp
@ -159,3 +184,22 @@ diff -Naur xbmc-pvr-addons-frodo-910d7e7/lib/jsoncpp/Makefile.am xbmc-pvr-addons
$(LIB): libjsoncpp.la
cp -f .libs/libjsoncpp.a .
diff --git a/lib/libdvblinkremote/Makefile.am b/lib/libdvblinkremote/Makefile.am
index f8fbbbd..eee4c2a 100644
--- a/lib/libdvblinkremote/Makefile.am
+++ b/lib/libdvblinkremote/Makefile.am
@@ -26,10 +26,10 @@ libdvblinkremote_la_SOURCES = channel.cpp \
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)
\ No newline at end of file
+ cp -f .libs/libdvblinkremote.la $(LIB)