Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/1f46b5b33010c1039c3ca3df4ed8e779f2c04a13)

2 files changed, 11 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b1e5f8f2eb20..75fd6ba06f59 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by makepkg 5.0.1
+# Wed Aug 17 16:26:24 UTC 2016
 pkgbase = vdr-live
 	pkgdesc = Adds the possibility to control VDR and some of it's plugins by a web interface.
-	pkgver = 0.3.0_21_g6ea279a
+	pkgver = 0.3.0_22_g869ac69
 	pkgrel = 2
 	epoch = 1
 	url = http://projects.vdr-developer.org/projects/plg-live
@@ -18,13 +20,15 @@ pkgbase = vdr-live
 	optdepends = vdr-epgsearch: Manage searchtimers
 	optdepends = vdr-streamdev: Stream live TV
 	backup = etc/vdr/conf.avail/50-live.conf
-	source = git://projects.vdr-developer.org/vdr-plugin-live.git#commit=6ea279a74a84b13aa72237448c9ed848c8fdcad4
+	source = git://projects.vdr-developer.org/vdr-plugin-live.git#commit=869ac69c7b78c89c76cd59ba8a2438ad5bb99d89
 	source = live-folderstatecookie-v2.diff::http://www.vdr-portal.de/index.php?page=Attachment&attachmentID=34407
 	source = live-osd-patch_150221.diff::http://www.vdr-portal.de/index.php?page=Attachment&attachmentID=37780
+	source = live-gcc6-fixes.diff::http://www.vdr-portal.de/index.php?page=Attachment&attachmentID=40135
 	source = 50-live.conf
 	md5sums = SKIP
 	md5sums = 6abb3d1724057e765e98e1a9b5326fe3
 	md5sums = c045e5e6ec376eebee834e6dc178327c
+	md5sums = 21a39d584d4e4639d010b2489e640123
 	md5sums = 563961eb90d9f2b3d2a0a34472ef51ee
 
 pkgname = vdr-live
diff --git a/PKGBUILD b/PKGBUILD
index ddb1aa26fdae..d9850d6567b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=vdr-live
-pkgver=0.3.0_21_g6ea279a
+pkgver=0.3.0_22_g869ac69
 epoch=1
-_gitver=6ea279a74a84b13aa72237448c9ed848c8fdcad4
+_gitver=869ac69c7b78c89c76cd59ba8a2438ad5bb99d89
 _vdrapi=2.2.0
 pkgrel=2
 pkgdesc="Adds the possibility to control VDR and some of it's plugins by a web interface."
@@ -20,11 +20,13 @@ _plugname=${pkgname//vdr-/}
 source=("git://projects.vdr-developer.org/vdr-plugin-live.git#commit=$_gitver"
         'live-folderstatecookie-v2.diff::http://www.vdr-portal.de/index.php?page=Attachment&attachmentID=34407'
         'live-osd-patch_150221.diff::http://www.vdr-portal.de/index.php?page=Attachment&attachmentID=37780'
+        'live-gcc6-fixes.diff::http://www.vdr-portal.de/index.php?page=Attachment&attachmentID=40135'
         "50-$_plugname.conf")
 backup=("etc/vdr/conf.avail/50-$_plugname.conf")
 md5sums=('SKIP'
          '6abb3d1724057e765e98e1a9b5326fe3'
          'c045e5e6ec376eebee834e6dc178327c'
+         '21a39d584d4e4639d010b2489e640123'
          '563961eb90d9f2b3d2a0a34472ef51ee')
 pkgver() {
   cd "${srcdir}/vdr-plugin-${_plugname}"
@@ -40,6 +42,7 @@ prepare() {
 
   patch -p1 -i "$srcdir/live-folderstatecookie-v2.diff"
   patch -p1 -i "$srcdir/live-osd-patch_150221.diff"
+  patch -p1 -i "$srcdir/live-gcc6-fixes.diff"
 
   # Use the more modern ResourceDirectory in /usr/share instead of /var/lib
   sed -i 's/cPlugin::ConfigDirectory/cPlugin::ResourceDirectory/g' live.cpp