diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
| commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
| tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /media-plugins/vdr-lcdproc | |
| parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) | |
gentoo resync : 15.01.2020
Diffstat (limited to 'media-plugins/vdr-lcdproc')
4 files changed, 77 insertions, 5 deletions
diff --git a/media-plugins/vdr-lcdproc/Manifest b/media-plugins/vdr-lcdproc/Manifest index f8b55cfdaf5f..0d8d63e76ded 100644 --- a/media-plugins/vdr-lcdproc/Manifest +++ b/media-plugins/vdr-lcdproc/Manifest @@ -1,3 +1,5 @@ +AUX vdr-2.4_lcdproc-0.0.10.9.patch 1823 BLAKE2B cde7165abd6caafaaecb575246a16c00e556eb1f6c4b947b2474b4e3bd42bb99076e5fa946bc805e102b5e092ca3887ab69e7bfef45118cf6215d2b772e2fcd9 SHA512 17d6325aad342065f7af15154a8ff1ffbb121e728dfb6e91e98d9ae05dd159408e80e57b73a6d41d0d21732876a2a3f02d678d28160a7bdb60bb12c81be13883 DIST vdr-lcdproc-0.0.10.9.tgz 40465 BLAKE2B c812c9efe57f5015450ebc7c91ba6ff107486b566fd46ccf60fe3251eac483d119d8c1caa41868536a6051d5f094a7b89f985609f60c13bb4fcbb31bdc8d631c SHA512 237726e6c7a3436e416596e2b85411edb5945a3feef809d2e86c3952673b2531077ab70f9bddbfc1bc12fa0b2f416f153bf1a12f91288ecbdee23553474e044a -EBUILD vdr-lcdproc-0.0.10.9.ebuild 609 BLAKE2B 5adff9076ce955334d084f9f5b538f5fa14cbab87e499ae6262ded70027e4c29fdf1f90d3e49301eeef09de537d7fe128ab521c0b9cc7686a22f9c129a2edbc1 SHA512 0f6222df2d49795f6265ea0ac24d764ad7b013a8e27bbc5c6c979ce515e03cf737a402c6679924485d9dd4c7f061de97d67b19d700a77532dd57c4731db62ef6 +EBUILD vdr-lcdproc-0.0.10.9-r1.ebuild 604 BLAKE2B f89cbab5f6775fbd89d1926efa1a78ec6af3ee8c467306b312c8cbe388a8ad7aa9523eb8cf1aa3d73b4984b1db41d6e38b651603b60b8330e667555ce644d266 SHA512 3eb8759dfb571da02e563e77a89f30b1cb03ae157cfbecec4c7252e5f033c51cc584c1fd320602cc833d5145d6fb46ee17a56be6479a3986c53f02b4bce4048b +EBUILD vdr-lcdproc-0.0.10.9.ebuild 575 BLAKE2B 7aa8d6ff4b9746f2bae40266c2ef8b4aec6a3b2efac4ec653f099b21eec43f6ba5a78c956cd7ec0184b0f3f57f5069e0df4aba16c6a2b56f2119449ef6ffea9b SHA512 ae2cd54b20c3fb46aa0087f9e17b6b57431d57430cd23944ecab82566fbc822496d7879dfa2d2ece72dae9d3f47e37088032c868efdbe131b10172e2e36ede5c MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3 diff --git a/media-plugins/vdr-lcdproc/files/vdr-2.4_lcdproc-0.0.10.9.patch b/media-plugins/vdr-lcdproc/files/vdr-2.4_lcdproc-0.0.10.9.patch new file mode 100644 index 000000000000..0d2bbe4bb69b --- /dev/null +++ b/media-plugins/vdr-lcdproc/files/vdr-2.4_lcdproc-0.0.10.9.patch @@ -0,0 +1,45 @@ +compilefix for vdr-2.4 +Suggested-by: MatthiasK @ vdr-portal.de + +fixed invalid suffix on literal; C++11 space issues + +Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 25 Dec 2019 ) +diff -Naur lcdproc-0.0.10-jw9.orig/lcd.c lcdproc-0.0.10-jw9/lcd.c +--- lcdproc-0.0.10-jw9.orig/lcd.c 2019-12-25 22:53:55.187492713 +0100 ++++ lcdproc-0.0.10-jw9/lcd.c 2019-12-25 22:54:33.075492713 +0100 +@@ -808,7 +808,7 @@ + cLcd::Write(LcdSetup.ShowTime?1:4," Welcome to V D R\0"); + cLcd::Write(LcdSetup.ShowTime?2:3,"--------------------\0"); + cLcd::Write(LcdSetup.ShowTime?3:1,"Video Disk Recorder\0"); +- cLcd::Write(LcdSetup.ShowTime?4:2,"Version: "VDRVERSION"\0"); ++ cLcd::Write(LcdSetup.ShowTime?4:2,"Version: " VDRVERSION "\0"); + + // Output init + if (LcdSetup.OutputNumber > 0){ +@@ -850,11 +850,15 @@ + } + + if ( time(NULL) > nextLcdUpdate ) { +- cChannel *channel = Channels.GetByNumber(primaryDvbApi->CurrentChannel()); ++// cChannel *channel = Channels.GetByNumber(primaryDvbApi->CurrentChannel()); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(primaryDvbApi->CurrentChannel()); + const cEvent *Present = NULL; +- cSchedulesLock schedulesLock; ++/* cSchedulesLock schedulesLock; + const cSchedules *Schedules = cSchedules::Schedules(schedulesLock); + if (Schedules) { ++ const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID()); */ ++ LOCK_SCHEDULES_READ; + const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID()); + if (Schedule) { + const char *PresentTitle, *PresentSubtitle; +@@ -873,7 +877,7 @@ + rtcycle = 10; // RT + lcrCycle = 10; // LCR + } +- } ++// } + if ( nextLcdUpdate <= time(NULL) ) + nextLcdUpdate=(time(NULL)/60)*60+60; + } diff --git a/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9-r1.ebuild b/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9-r1.ebuild new file mode 100644 index 000000000000..fa5d74a98f8d --- /dev/null +++ b/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit vdr-plugin-2 + +VERSION="932" # every bump, new version + +MY_P=${PN}-$(ver_rs 3 -jw ${PV}) + +DESCRIPTION="VDR plugin: use LCD device for additional output" +HOMEPAGE="https://projects.vdr-developer.org/projects/plg-lcdproc" +SRC_URI="mirror://vdr-developerorg/${VERSION}/${MY_P}.tgz -> ${P}.tgz" + +KEYWORDS="~amd64 ~x86" +SLOT="0" +LICENSE="GPL-2" + +DEPEND=">=app-misc/lcdproc-0.4.3 + >=media-video/vdr-2.4" + +PATCHES=( "${FILESDIR}/vdr-2.4_lcdproc-0.0.10.9.patch" ) + +S=${WORKDIR}/${MY_P#vdr-} diff --git a/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9.ebuild b/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9.ebuild index 207b8e2c1334..966c08c4fec9 100644 --- a/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9.ebuild +++ b/media-plugins/vdr-lcdproc/vdr-lcdproc-0.0.10.9.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit vdr-plugin-2 versionator +inherit vdr-plugin-2 VERSION="932" # every bump, new version -MY_P=${PN}-$(replace_version_separator 3 -jw ${PV}) +MY_P=${PN}-$(ver_rs 3 -jw ${PV}) DESCRIPTION="VDR plugin: use LCD device for additional output" HOMEPAGE="https://projects.vdr-developer.org/projects/plg-lcdproc" |