diff options
Diffstat (limited to 'media-plugins/vdr-systeminfo')
| -rw-r--r-- | media-plugins/vdr-systeminfo/Manifest | 3 | ||||
| -rw-r--r-- | media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.4_gcc11.patch | 35 | ||||
| -rw-r--r-- | media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4-r1.ebuild (renamed from media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4.ebuild) | 9 |
3 files changed, 43 insertions, 4 deletions
diff --git a/media-plugins/vdr-systeminfo/Manifest b/media-plugins/vdr-systeminfo/Manifest index 9ee2676a8db7..d263c62d2f1e 100644 --- a/media-plugins/vdr-systeminfo/Manifest +++ b/media-plugins/vdr-systeminfo/Manifest @@ -1,6 +1,7 @@ AUX confd 353 BLAKE2B 30621287150e3fc85cc98c47c5a2dff052d3909154887f54e3cfa2095941b4ce124dd6199c5e764abf6af12b179fc8f4efcceea4464dd0929cb2bb7a2c08817e SHA512 aad713c22e114f8a2654b6219110c70843fbec4ce6328350d883241ae0c3c6defec380a70f48e5e5aedf6954f5a14237a45b4c9caeda0ea9f81ebac244041713 AUX rc-addon.sh 224 BLAKE2B 727d8ada762e74a0b4a93b7e1c73a56881afbe2898cf8f427b6acd69ec22ba88633bbc378c8bcf486315c707a7da0fc3c8d99cd4b6211e91481358c3619560d2 SHA512 818e032afe9e5dd6c9275bf2ec0dce38446af6c601f636b21ccd82a2b1f06b3545f548e525749bc365fdd6e4515a7ae2cf5d1394bee7a315c1bb0024dde60d32 AUX systeminfo.sh 3108 BLAKE2B 4155d559145b9f491e48460ac9d39ddc6992547effa3c5fa3ead365f99dfc99cebf73be54249193ac2a4dbe79dcb85c33fb17569257404af77dea8af34f72a10 SHA512 ae5dd5935a66cdb18c663fd19f51e60df29532da4f49abebda4f16f8c53bf65228f9b4fc79e3571bd5519526f6c1e74307aa49c8dc61392c7d92c9ddf5d77cf1 +AUX vdr-systeminfo-0.1.4_gcc11.patch 1656 BLAKE2B e45e3b8d78ded6313b04305684d2923e75a1acad183448fc0cb315341c9efc266cf0f3468482fe45ecbd0cbe679eb3ffc0a845c703f25b0a8d4ca87b02797cc4 SHA512 c98bd73a98e4bfcf480f1380db40818216bd0a559e8e0583f971b725d9b0a389883e79653c46d18650f0a9150889cf0b6e664f2a714f34b92784dc69cf8b2009 DIST vdr-systeminfo-0.1.4.tar.bz2 18064 BLAKE2B ab3e81d19882131dbed7fd96b876592395fa07d370158b4e1a9b5ea7a06a3d388bc0cbf099eebee992fcb1eaa6810943cb7577ee21f72b4c1b47896cc9f53f90 SHA512 16b53b0a9b4b4e101bbddf8b02546f04f7cdc27697cc66d0e1051fd8b57c9281e728f5aa552d8d900185e190f922f2e2ac2042ad0fe9c3b01800400bec3856ba -EBUILD vdr-systeminfo-0.1.4.ebuild 722 BLAKE2B 087c126e637a015723acbdcf068fb4c0cd733ad8cde83103a1b2015e44d6e849c5f5eb75b2830940ff06106335940b8cf06d4f10b812ffea8f626a5aa295727a SHA512 b6793a3333e544bdf66d4cc847dd93b7a8d9f6e129551b2bc6713958abadbe4f4314278173405570e4e3ad29a0ea6669f7eb77898ace48c73d5ac02ee5388ebb +EBUILD vdr-systeminfo-0.1.4-r1.ebuild 779 BLAKE2B 70556a7ee2d695e87f59af3c9b5f6b57352b8e6668be40e01cf9caafa4f0ff56096cdec516dccf75c9a0a8a91e8a1ed32e418439e48d3d5e33f7fc9bcc113291 SHA512 41014b45b5f8de49578cc9cc891e80157c1201fc52a411d4371121d200fe0bff986a40d482d9ff91bf01dbf79e3dd4c26697b40af6f5391293b0dbbacabd7852 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06 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 000000000000..76f70289e6df --- /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 index 83e1cc72dd81..9d09ab352892 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() { |