1 |
commit: 77d98de5041dd7fbd5c2d26e698939c793f8dc88 |
2 |
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 25 19:52:59 2015 +0000 |
4 |
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 25 19:54:51 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d98de5 |
7 |
|
8 |
bump, compilefix vdr-2.3.1 |
9 |
|
10 |
Package-Manager: portage-2.2.23 |
11 |
|
12 |
media-plugins/vdr-systeminfo/Manifest | 1 + |
13 |
.../files/vdr-systeminfo-0.1.3_vdr-2.3.1.patch | 69 ++++++++++++++++++++++ |
14 |
.../vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild | 40 +++++++++++++ |
15 |
3 files changed, 110 insertions(+) |
16 |
|
17 |
diff --git a/media-plugins/vdr-systeminfo/Manifest b/media-plugins/vdr-systeminfo/Manifest |
18 |
index 1fe0ef9..730f7c2 100644 |
19 |
--- a/media-plugins/vdr-systeminfo/Manifest |
20 |
+++ b/media-plugins/vdr-systeminfo/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
DIST vdr-systeminfo-0.1.1.tar.bz2 16816 SHA256 2764e88c07a84e4d42ab318e0cd7ad186b549c9843c6fed8e6aa964658685cc1 SHA512 9f107ebbf79e5ded9ee6a991c5c00236dabbce42d7588eb21b814dbaaf249ee7e681f979d7570031fd6eb1bd286afe3943ae4463dc930b7814f739fef3623e54 WHIRLPOOL 46c0cf77236eab8d2d3e96dd12af2e8ce3806c94ada4813e9818faefdce302dd6b3218e040c60d6d2d7c90d2c30789d223a7443a4b1bde6e12a3f0bc563e5cb0 |
23 |
+DIST vdr-systeminfo-0.1.3.tar.bz2 17234 SHA256 70862fd641b819c1bbf063c4c48e7ac52f05ec7046ba174922ab7ccb4c3b08a0 SHA512 9dd2c32632558dd6061e1aa9b76757bf76e0e781405412791343dd7249348fdf0b65c71d8054f55f8f763a75aa17d39bed96a86e4b06a4475642eab4624954fd WHIRLPOOL b34e2c52e19bc38b08b716da61491d27110f98ab998e07d56987bf5df496fa0d4174f4ac67917426d745eb2c273a400f811ec4c79b0cdf4249d4e07e785cf67f |
24 |
|
25 |
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 |
26 |
new file mode 100644 |
27 |
index 0000000..4cadb0b |
28 |
--- /dev/null |
29 |
+++ b/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.3_vdr-2.3.1.patch |
30 |
@@ -0,0 +1,69 @@ |
31 |
+compilefix vdr-2.3.1 |
32 |
+http://www.vdr-portal.de/board1-news/board2-vdr-news/p1254237-announce-vdr-developer-version-2-3-1/#post1254237 |
33 |
+Signed-of-by: Joerg Bornkessel <hd_brummy@g.o> (25 Okt 2015) |
34 |
+ |
35 |
+--- displayinfo.c 2008-11-09 10:31:23.000000000 +0100 |
36 |
++++ displayinfo.c 2015-10-14 16:18:28.328868172 +0200 |
37 |
+@@ -224,7 +224,7 @@ |
38 |
+ void cInfoLines::Action() |
39 |
+ { |
40 |
+ int line = 0; |
41 |
+- Lock(); |
42 |
++ cThread::Lock(); |
43 |
+ Clear(); |
44 |
+ Unlock(); |
45 |
+ cString osdline = NULL; |
46 |
+@@ -236,7 +236,7 @@ |
47 |
+ |
48 |
+ osdline = PrepareInfoline(++line, &isStatic); |
49 |
+ if ((const char*)osdline) { |
50 |
+- Lock(); |
51 |
++ cThread::Lock(); |
52 |
+ Add(new cInfoLine(osdline, isStatic)); |
53 |
+ Unlock(); |
54 |
+ } |
55 |
+@@ -244,7 +244,7 @@ |
56 |
+ while (Running() && NULL != (const char*)osdline && line <= MAX_LINES); |
57 |
+ |
58 |
+ if (!First()) { |
59 |
+- Lock(); |
60 |
++ cThread::Lock(); |
61 |
+ osdline = tr("Error getting system information"); |
62 |
+ Add(new cInfoLine(osdline, true)); |
63 |
+ state++; |
64 |
+@@ -252,7 +252,7 @@ |
65 |
+ } |
66 |
+ else |
67 |
+ { |
68 |
+- Lock(); |
69 |
++ cThread::Lock(); |
70 |
+ state++; |
71 |
+ Unlock(); |
72 |
+ if (Running()) |
73 |
+@@ -260,7 +260,7 @@ |
74 |
+ |
75 |
+ while (Running()) { |
76 |
+ cInfoLine * currentline = NULL; |
77 |
+- Lock(); |
78 |
++ cThread::Lock(); |
79 |
+ if (OsdInitialized) |
80 |
+ firstDisplay = false; |
81 |
+ currentline = First(); |
82 |
+@@ -274,7 +274,7 @@ |
83 |
+ if (!currentline || !currentline->isStatic()) { |
84 |
+ osdline = PrepareInfoline(line, &isStatic); |
85 |
+ if ((const char*)osdline) { |
86 |
+- Lock(); |
87 |
++ cThread::Lock(); |
88 |
+ currentline->SetStr(osdline); |
89 |
+ Unlock(); |
90 |
+ } |
91 |
+@@ -283,7 +283,7 @@ |
92 |
+ } |
93 |
+ while (Running() && NULL != currentline && line <= MAX_LINES); |
94 |
+ |
95 |
+- Lock(); |
96 |
++ cThread::Lock(); |
97 |
+ state++; |
98 |
+ Unlock(); |
99 |
+ |
100 |
|
101 |
diff --git a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild |
102 |
new file mode 100644 |
103 |
index 0000000..0a48387 |
104 |
--- /dev/null |
105 |
+++ b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild |
106 |
@@ -0,0 +1,40 @@ |
107 |
+# Copyright 1999-2014 Gentoo Foundation |
108 |
+# Distributed under the terms of the GNU General Public License v2 |
109 |
+# $Id$ |
110 |
+ |
111 |
+EAPI=5 |
112 |
+ |
113 |
+inherit vdr-plugin-2 |
114 |
+ |
115 |
+DESCRIPTION="VDR Plugin: systeminfo" |
116 |
+HOMEPAGE="http://firefly.vdr-developer.org/systeminfo/" |
117 |
+SRC_URI="http://firefly.vdr-developer.org/systeminfo/${P}.tar.bz2" |
118 |
+ |
119 |
+LICENSE="GPL-2" |
120 |
+SLOT="0" |
121 |
+KEYWORDS="~amd64 ~x86" |
122 |
+IUSE="" |
123 |
+ |
124 |
+DEPEND=">=media-video/vdr-1.4.7" |
125 |
+ |
126 |
+RDEPEND="sys-apps/lm_sensors |
127 |
+ app-admin/hddtemp" |
128 |
+ |
129 |
+src_prepare() { |
130 |
+ vdr-plugin-2_src_prepare |
131 |
+ |
132 |
+ if has_version ">=media-video/vdr-2.3.1"; then |
133 |
+ epatch "${FILESDIR}/${P}_vdr-2.3.1.patch" |
134 |
+ fi |
135 |
+ |
136 |
+ # Makefile correction, .eclass fails in some Makefiles |
137 |
+ sed -e "s:(VDRINCDIR):(VDRDIR)/include:" -i Makefile |
138 |
+} |
139 |
+ |
140 |
+src_install() { |
141 |
+ vdr-plugin-2_src_install |
142 |
+ |
143 |
+ insinto /usr/share/vdr/systeminfo/ |
144 |
+ insopts -m0755 |
145 |
+ doins "${FILESDIR}"/systeminfo.sh |
146 |
+} |