Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2013-12-29 17:03:24 +01:00
commit 8882a1666d
6 changed files with 23 additions and 4 deletions

View File

@ -1,3 +1,6 @@
4.1.1
- rebuild to fix curl/gnutls/ssl
4.1.0
- convert to systemd service
- rebuild for addon api bump

View File

@ -18,7 +18,7 @@
PKG_NAME="tvheadend"
PKG_VERSION="3.4.27"
PKG_REV="0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

View File

@ -1,3 +1,6 @@
4.1.1
- rebuild to fix curl/gnutls/ssl
4.1.0
- convert to systemd service
- rebuild for addon api bump

View File

@ -19,7 +19,7 @@
PKG_NAME="vdr-addon"
PKG_VERSION="4.1"
PKG_REV="0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.openelec.tv"

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="xbmc-pvr-addons"
PKG_VERSION="e2e6804"
PKG_VERSION="a32a0bd"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -102,7 +102,7 @@ index dcc5901..a70a68a 100644
AM_CPPFLAGS = -I$(abs_top_srcdir)/lib/cmyth/include
diff --git a/addons/pvr.nextpvr/Makefile.am b/addons/pvr.nextpvr/Makefile.am
index 08838f5..bb9f5d2 100644
index 8b96235..da82559 100644
--- a/addons/pvr.nextpvr/Makefile.am
+++ b/addons/pvr.nextpvr/Makefile.am
@@ -10,11 +10,11 @@ ADDONNAME = pvr.nextpvr
@ -145,6 +145,19 @@ index 7fda63e..08fcc9b 100644
include ../Makefile.include.am
diff --git a/addons/pvr.wmc/Makefile.am b/addons/pvr.wmc/Makefile.am
index cdcc73b..bda8e3a 100644
--- a/addons/pvr.wmc/Makefile.am
+++ b/addons/pvr.wmc/Makefile.am
@@ -10,7 +10,7 @@ ADDONNAME = pvr.wmc
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 --git a/lib/cmyth/libcmyth/Makefile.am b/lib/cmyth/libcmyth/Makefile.am
index de75de6..b15eb75 100644
--- a/lib/cmyth/libcmyth/Makefile.am