bump, compilefix vdr-2.3.1

Package-Manager: portage-2.2.23

3 files changed, 110 insertions, 0 deletions

diff --git a/media-plugins/vdr-systeminfo/Manifest b/media-plugins/vdr-systeminfo/Manifest
index 1fe0ef92a43c..730f7c2e18e7 100644
--- a/media-plugins/vdr-systeminfo/Manifest
+++ b/media-plugins/vdr-systeminfo/Manifest
@@ -1 +1,2 @@
 DIST vdr-systeminfo-0.1.1.tar.bz2 16816 SHA256 2764e88c07a84e4d42ab318e0cd7ad186b549c9843c6fed8e6aa964658685cc1 SHA512 9f107ebbf79e5ded9ee6a991c5c00236dabbce42d7588eb21b814dbaaf249ee7e681f979d7570031fd6eb1bd286afe3943ae4463dc930b7814f739fef3623e54 WHIRLPOOL 46c0cf77236eab8d2d3e96dd12af2e8ce3806c94ada4813e9818faefdce302dd6b3218e040c60d6d2d7c90d2c30789d223a7443a4b1bde6e12a3f0bc563e5cb0
+DIST vdr-systeminfo-0.1.3.tar.bz2 17234 SHA256 70862fd641b819c1bbf063c4c48e7ac52f05ec7046ba174922ab7ccb4c3b08a0 SHA512 9dd2c32632558dd6061e1aa9b76757bf76e0e781405412791343dd7249348fdf0b65c71d8054f55f8f763a75aa17d39bed96a86e4b06a4475642eab4624954fd WHIRLPOOL b34e2c52e19bc38b08b716da61491d27110f98ab998e07d56987bf5df496fa0d4174f4ac67917426d745eb2c273a400f811ec4c79b0cdf4249d4e07e785cf67f
diff --git a/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.3_vdr-2.3.1.patch b/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.3_vdr-2.3.1.patch
new file mode 100644
index 000000000000..4cadb0bc285b
--- /dev/null
+++ b/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.3_vdr-2.3.1.patch
@@ -0,0 +1,69 @@
+compilefix vdr-2.3.1
+http://www.vdr-portal.de/board1-news/board2-vdr-news/p1254237-announce-vdr-developer-version-2-3-1/#post1254237
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (25 Okt 2015)
+
+--- displayinfo.c	2008-11-09 10:31:23.000000000 +0100
++++ displayinfo.c	2015-10-14 16:18:28.328868172 +0200
+@@ -224,7 +224,7 @@
+ void cInfoLines::Action()
+ {
+    int line = 0;
+-   Lock();
++   cThread::Lock();
+    Clear();
+    Unlock();
+    cString osdline = NULL;
+@@ -236,7 +236,7 @@
+ 
+       osdline = PrepareInfoline(++line, &isStatic);
+       if ((const char*)osdline) {
+-         Lock();
++         cThread::Lock();
+          Add(new cInfoLine(osdline, isStatic));
+          Unlock();
+       }
+@@ -244,7 +244,7 @@
+    while (Running() && NULL != (const char*)osdline && line <= MAX_LINES);
+ 
+    if (!First()) {
+-      Lock();
++      cThread::Lock();
+       osdline = tr("Error getting system information");
+       Add(new cInfoLine(osdline, true));
+       state++;
+@@ -252,7 +252,7 @@
+    }
+       else
+    {
+-      Lock();
++      cThread::Lock();
+       state++;
+       Unlock();
+       if (Running())
+@@ -260,7 +260,7 @@
+ 
+       while (Running()) {
+          cInfoLine * currentline = NULL;
+-         Lock();
++         cThread::Lock();
+          if (OsdInitialized)
+             firstDisplay = false;
+          currentline = First();
+@@ -274,7 +274,7 @@
+             if (!currentline || !currentline->isStatic()) {
+                osdline = PrepareInfoline(line, &isStatic);
+                if ((const char*)osdline) {
+-                  Lock();
++                  cThread::Lock();
+                   currentline->SetStr(osdline);
+                   Unlock();
+                }
+@@ -283,7 +283,7 @@
+          }
+          while (Running() && NULL != currentline && line <= MAX_LINES);
+ 
+-         Lock();
++         cThread::Lock();
+          state++;
+          Unlock();
+ 
diff --git a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild
new file mode 100644
index 000000000000..0a48387a201f
--- /dev/null
+++ b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: systeminfo"
+HOMEPAGE="http://firefly.vdr-developer.org/systeminfo/"
+SRC_URI="http://firefly.vdr-developer.org/systeminfo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.4.7"
+
+RDEPEND="sys-apps/lm_sensors
+		app-admin/hddtemp"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	if has_version ">=media-video/vdr-2.3.1"; then
+		epatch "${FILESDIR}/${P}_vdr-2.3.1.patch"
+	fi
+
+	# Makefile correction, .eclass fails in some Makefiles
+	sed -e "s:(VDRINCDIR):(VDRDIR)/include:" -i Makefile
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /usr/share/vdr/systeminfo/
+	insopts -m0755
+	doins "${FILESDIR}"/systeminfo.sh
+}