commit: 4f0de639b97e28eb4c1b2d57dbc9442fd0b6f5b8 Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> AuthorDate: Sat Sep 27 14:23:09 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 3 00:42:31 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0de639
media-plugins/vdr-radio: fix usage of cControl::Control() introduce subslot dependency on media-video/vdr Closes: https://bugs.gentoo.org/963424 Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> Part-of: https://github.com/gentoo/gentoo/pull/43960 Signed-off-by: Sam James <sam <AT> gentoo.org> .../vdr-radio/files/vdr-radio-1.1.0_cControl.patch | 13 ++++++++ media-plugins/vdr-radio/vdr-radio-1.1.0-r2.ebuild | 39 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/media-plugins/vdr-radio/files/vdr-radio-1.1.0_cControl.patch b/media-plugins/vdr-radio/files/vdr-radio-1.1.0_cControl.patch new file mode 100644 index 000000000000..3fd2b051193f --- /dev/null +++ b/media-plugins/vdr-radio/files/vdr-radio-1.1.0_cControl.patch @@ -0,0 +1,13 @@ +diff '--color=auto' -Naur vdr-plugin-radio-1.1.0.orig/radioaudio.c vdr-plugin-radio-1.1.0/radioaudio.c +--- vdr-plugin-radio-1.1.0.orig/radioaudio.c 2018-02-23 16:33:59.000000000 +0100 ++++ vdr-plugin-radio-1.1.0/radioaudio.c 2025-09-27 16:18:29.443910432 +0200 +@@ -2392,7 +2392,8 @@ + // check end @ replay + if (RT_Replay) { + int rplayCur, rplayTot; +- cControl::Control()->GetIndex(rplayCur, rplayTot, false); ++ cMutexLock MutexLock; ++ cControl::Control(MutexLock)->GetIndex(rplayCur, rplayTot, false); + if (rplayCur >= rplayTot - 1) { + Hide(); + return osEnd; diff --git a/media-plugins/vdr-radio/vdr-radio-1.1.0-r2.ebuild b/media-plugins/vdr-radio/vdr-radio-1.1.0-r2.ebuild new file mode 100644 index 000000000000..b42b11e04964 --- /dev/null +++ b/media-plugins/vdr-radio/vdr-radio-1.1.0-r2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit vdr-plugin-2 + +DESCRIPTION="VDR plugin: show background image for radio and decode RDS Text" +HOMEPAGE="https://github.com/vdr-projects/vdr-plugin-radio/"; +SRC_URI="https://github.com/vdr-projects/vdr-plugin-radio/archive/refs/tags/${PV}.tar.gz -> ${P}.tgz" +S="${WORKDIR}/vdr-plugin-radio-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +DEPEND="media-video/vdr:=" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/vdr-radio-1.1.0_cControl.patch" ) + +src_prepare() { + sed -e '/^CXXFLAGS +=/ s/$/ -std=c++14/' -i Makefile || die + vdr-plugin-2_src_prepare +} + +src_install() { + vdr-plugin-2_src_install + + cd "${S}"/config || die "Can't enter source folder" + + insinto /usr/share/vdr/radio + doins mpegstill/rtext* + dosym rtextOben-kleo2-live.mpg /usr/share/vdr/radio/radio.mpg + dosym rtextOben-kleo2-replay.mpg /usr/share/vdr/radio/replay.mpg + + exeinto /usr/share/vdr/radio + doexe scripts/radioinfo* +}
