mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
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@gmx.net> Part-of: https://github.com/gentoo/gentoo/pull/43960 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
13
media-plugins/vdr-radio/files/vdr-radio-1.1.0_cControl.patch
Normal file
13
media-plugins/vdr-radio/files/vdr-radio-1.1.0_cControl.patch
Normal file
@@ -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;
|
||||
39
media-plugins/vdr-radio/vdr-radio-1.1.0-r2.ebuild
Normal file
39
media-plugins/vdr-radio/vdr-radio-1.1.0-r2.ebuild
Normal file
@@ -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*
|
||||
}
|
||||
Reference in New Issue
Block a user