* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-systeminfo/files/, media-plugins/vdr-systeminfo/
@ 2015-10-25 19:55 Joerg Bornkessel
0 siblings, 0 replies; 2+ messages in thread
From: Joerg Bornkessel @ 2015-10-25 19:55 UTC (permalink / raw
To: gentoo-commits
commit: 77d98de5041dd7fbd5c2d26e698939c793f8dc88
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 25 19:52:59 2015 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun Oct 25 19:54:51 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d98de5
bump, compilefix vdr-2.3.1
Package-Manager: portage-2.2.23
media-plugins/vdr-systeminfo/Manifest | 1 +
.../files/vdr-systeminfo-0.1.3_vdr-2.3.1.patch | 69 ++++++++++++++++++++++
.../vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild | 40 +++++++++++++
3 files changed, 110 insertions(+)
diff --git a/media-plugins/vdr-systeminfo/Manifest b/media-plugins/vdr-systeminfo/Manifest
index 1fe0ef9..730f7c2 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 0000000..4cadb0b
--- /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 0000000..0a48387
--- /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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-systeminfo/files/, media-plugins/vdr-systeminfo/
@ 2021-05-02 17:54 Jörg Bornkessel
0 siblings, 0 replies; 2+ messages in thread
From: Jörg Bornkessel @ 2021-05-02 17:54 UTC (permalink / raw
To: gentoo-commits
commit: d4a283d7069c7204e6b6b1bbc608c663deb8ec02
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun May 2 17:53:06 2021 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun May 2 17:53:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4a283d7
media-plugins/vdr-systeminfo: gcc-11 reladet fix
Closes: https://bugs.gentoo.org/787707
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
.../files/vdr-systeminfo-0.1.4_gcc11.patch | 35 ++++++++++++++++++++++
...0.1.4.ebuild => vdr-systeminfo-0.1.4-r1.ebuild} | 9 ++++--
2 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.4_gcc11.patch b/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.4_gcc11.patch
new file mode 100644
index 00000000000..76f70289e6d
--- /dev/null
+++ b/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.4_gcc11.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/787707
+
+fix declaring of max/min
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (02 Mar 2021)
+diff -Naur systeminfo-0.1.4.orig/displayinfo.c systeminfo-0.1.4/displayinfo.c
+--- systeminfo-0.1.4.orig/displayinfo.c 2021-05-02 17:41:51.702653108 +0200
++++ systeminfo-0.1.4/displayinfo.c 2021-05-02 17:43:41.404653108 +0200
+@@ -173,7 +173,7 @@
+ if (fval1 == 0.0)
+ osdline = cString::sprintf("%s:\t%.1f GB / %.1f GB", pname, fval1, fval2);
+ else {
+- int frac = min(BARLEN,max(0, int((fval1-fval2)*BARLEN/fval1)));
++ int frac = std::min(BARLEN,std::max(0, int((fval1-fval2)*BARLEN/fval1)));
+ memset(progressbar + 1,'|',frac);
+ memset(progressbar + 1 + frac ,' ', BARLEN - frac);
+
+@@ -188,7 +188,7 @@
+ if (fval1 == 0.0)
+ osdline = cString::sprintf("%s:\t%.1f kB / %.1f kB", pname, fval1, fval2);
+ else {
+- int frac = min(BARLEN,max(0, int((fval1-fval2)*BARLEN/fval1)));
++ int frac = std::min(BARLEN,std::max(0, int((fval1-fval2)*BARLEN/fval1)));
+ memset(progressbar + 1,'|',frac);
+ memset(progressbar + 1 + frac ,' ', BARLEN - frac);
+
+@@ -209,7 +209,7 @@
+ // check for CPU%
+ else if (1 == sscanf(systeminfo, "%a[a-zA-Z,/0-9 ]: CPU%%", &pname) && NULL != strstr(systeminfo, "CPU%")) {
+ fval2 = GetCpuPct();
+- int frac = min(BARLEN,max(0, int(fval2*BARLEN/100.0)));
++ int frac = std::min(BARLEN,std::max(0, int(fval2*BARLEN/100.0)));
+ memset(progressbar + 1,'|',frac);
+ memset(progressbar + 1 + frac ,' ', BARLEN - frac);
+
diff --git a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4.ebuild b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4-r1.ebuild
similarity index 80%
rename from media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4.ebuild
rename to media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4-r1.ebuild
index 83e1cc72dd8..9d09ab35289 100644
--- a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4.ebuild
+++ b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit vdr-plugin-2
@@ -23,7 +23,10 @@ src_prepare() {
vdr-plugin-2_src_prepare
# Makefile correction, .eclass fails in some Makefiles
- sed -e "s:(VDRINCDIR):(VDRDIR)/include:" -i Makefile
+ sed -e "s:(VDRINCDIR):(VDRDIR)/include:" -i Makefile || die
+
+ # 787707
+ eapply "${FILESDIR}/${P}_gcc11.patch"
}
src_install() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-02 17:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-25 19:55 [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-systeminfo/files/, media-plugins/vdr-systeminfo/ Joerg Bornkessel
-- strict thread matches above, loose matches on Subject: below --
2021-05-02 17:54 Jörg Bornkessel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox