gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

media-plugins/vdr-devstatus: drop 0.4.1-r1

Browse Source 
Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
Part-of: https://github.com/gentoo/gentoo/pull/45676
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
Martin Dummer
2026-02-07 20:34:37 +01:00
committed by Conrad Kostecki
parent 2276142fc9
commit 1d8596ee91
7 changed files with 0 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media-plugins/vdr-devstatus/Manifest
View File

@@ -1,2 +1 @@
DIST vdr-devstatus-0.4.1.tgz 22469 BLAKE2B 36e60b2d754209f5a2e30ff62114575565d9e0acf21e269797b39e9e487831288a7fcf0c12b32d2ed40f4c626ce6f6514169a767035d704a84c33ead25eb65c0 SHA512 4dde8cce6b4aaa6e0ce22b2cd5ad718ab04e7e5967a3cb2c05ac64946115b6291d395e36dff38d479e5a7d5c3c296feb4df7f8dce509c15ac0d8cafa179b7177
DIST vdr-devstatus-0.5.0.tar.gz 22458 BLAKE2B fd94c422809c13734ca245641ef012cae8760ef0a3f228f8dbc7cdec30b23a7f4da8258e8960c17bab7ab6324d07f31eed87a76a56f56a8cee5588815641ad28 SHA512 c36330ada546ecc4cae23d3b0d4aecdc29992f680c6f381cd66b704190b6f0887bcf8b533bf1b76ecb494399b7291ac678ace57414fd9d894335fcf687eafad9

20
media-plugins/vdr-devstatus/files/vdr-devstatus-0.4.1-channelswitch.patch
View File

@@ -1,20 +0,0 @@
--- a/devstatus.c
+++ b/devstatus.c
@@ -122,7 +122,7 @@
#else
virtual void Recording(const cDevice *Device, const char *Name);
#endif
- virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
+ virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView);
};
cList<cRecObj> CurrentRecordings;
@@ -660,7 +660,7 @@
}
}
-void cDevStatusMonitor::ChannelSwitch(const cDevice *Device, int ChannelNumber) {
+void cDevStatusMonitor::ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView) {
if (!ChannelNumber) return;
update=1;
}

22
media-plugins/vdr-devstatus/files/vdr-devstatus-0.4.1-dvb-adapter-frontend.patch
View File

@@ -1,22 +0,0 @@
--- a/devstatus.c
+++ b/devstatus.c
@@ -161,6 +161,10 @@
private:
public:
void deviceinfoAsString(cDevice *d) {
+ cDvbDevice *dvb = dynamic_cast<cDvbDevice *>(d);
+ if (dvb == NULL)
+ return;
+
struct dvb_frontend_info m_FrontendInfo;
int m_Frontend;
// fe_status_t status;
@@ -170,7 +174,7 @@
char* output = NULL;
#define FRONTEND_DEVICE "/dev/dvb/adapter%d/frontend%d"
- cString dev = cString::sprintf(FRONTEND_DEVICE, d->CardIndex(), 0);
+ cString dev = cString::sprintf(FRONTEND_DEVICE, dvb->Adapter(), dvb->Frontend());
m_Frontend = open(dev, O_RDONLY | O_NONBLOCK);
if (m_Frontend < 0) {
return;

74
media-plugins/vdr-devstatus/files/vdr-devstatus-0.4.1-memoryleak.patch
View File

@@ -1,74 +0,0 @@
--- a/devstatus.c
+++ b/devstatus.c
@@ -561,8 +561,8 @@
cString cPluginDevstatus::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode) {
// Process SVDRP commands this plugin implements
if(strcasecmp(Command, "DEVSTAT") == 0) {
- char* output = NULL;
- asprintf(&output, "%s:\n", tr("List of DVB devices"));
+ cString output;
+ output = cString::sprintf("%s:\n", tr("List of DVB devices"));
for (int i = 0; i < cDevice::NumDevices(); i++) {
cDevice *d = cDevice::GetDevice(i);
char* devName = NULL;
@@ -570,7 +570,7 @@
if (d->HasDecoder() || d->IsPrimaryDevice())
asprintf(&devInfo, " (%s%s%s)", d->HasDecoder() ? tr("device with decoder") : "", (d->HasDecoder() && d->IsPrimaryDevice()) ? ", " : "", d->IsPrimaryDevice() ? tr("primary device") : "");
asprintf(&devName, "--- %s %d%s ---", tr("Device"), i+1, devInfo ? devInfo : "");
- asprintf(&output, "%s %s:\n", output , devName); // add device output and there info's
+ output = cString::sprintf("%s %s:\n", *output , devName); // add device output and there info's
free(devName);
if (devInfo)
free(devInfo);
@@ -582,30 +582,29 @@
Name = strdup(r->name);
char* itemText = NULL;
asprintf(&itemText, "%s %s", DAYDATETIME(r->timer->StartTime()), Name);
- asprintf(&output, "%s %s\n", output , itemText);
+ output = cString::sprintf("%s %s\n", *output , itemText);
free(itemText);
}
Count++;
}
}
if (Count == 0)
- asprintf(&output, "%s %s\n", output, tr("currently no recordings"));
+ output = cString::sprintf("%s %s\n", *output, tr("currently no recordings"));
if (i < cDevice::NumDevices())
- asprintf(&output, "%s\n", output);
+ output = cString::sprintf("%s\n", *output);
}
// we use the default reply code here
- // return cString::sprintf("%s", output);
return output;
}
if(strcasecmp(Command, "RECNUMBER") == 0) {
- char* output = NULL;
- asprintf(&output, "%s:\n", tr("Number of concurrent recordings"));
+ cString output;
+ output = cString::sprintf("%s:\n", tr("Number of concurrent recordings"));
for (int i = 0; i < cDevice::NumDevices(); i++) {
cDevice *d = cDevice::GetDevice(i);
char* devName = NULL;
asprintf(&devName, "%s %d", tr("Device"), i+1);
- asprintf(&output, "%s %s:", output , devName); // add device output and there info's
+ output = cString::sprintf("%s %s:", *output , devName); // add device output and there info's
free(devName);
int Count = 0;
for (cRecObj *r = CurrentRecordings.First(); r; r = CurrentRecordings.Next(r)){ // add recordings to the output
@@ -613,12 +612,11 @@
Count++;
}
}
- asprintf(&output, "%s %i\n", output, Count);
+ output = cString::sprintf("%s %i\n", *output, Count);
if (i < cDevice::NumDevices())
- asprintf(&output, "%s\n", output);
+ output = cString::sprintf("%s\n", *output);
}
// we use the default reply code here
- // return cString::sprintf("%s", output);
return output;
}

17
media-plugins/vdr-devstatus/files/vdr-devstatus-0.4.1-recordingfound.patch
View File

@@ -1,17 +0,0 @@
Index: b/devstatus.c
===================================================================
--- a/devstatus.c
+++ b/devstatus.c
@@ -351,7 +351,11 @@
recordingFound = recording;
if (!recordingFound)
return osContinue;
- cReplayControl::SetRecording(recordingFound->FileName(), recordingFound->Title());
+ #if VDRVERSNUM < 10728
+ cReplayControl::SetRecording(recordingFound->FileName(), recordingFound->Title());
+ #else
+ cReplayControl::SetRecording(recordingFound->FileName());
+ #endif
return osReplay;
}

99
media-plugins/vdr-devstatus/files/vdr-devstatus-0.4.1-vdr2.3.patch
View File

@@ -1,99 +0,0 @@
--- a/devstatus.c
+++ b/devstatus.c
@@ -55,8 +55,14 @@
int channelNo;
cChannel *channel = NULL;
+#if VDRVERSNUM < 20300
for (channelNo = 1; channelNo <= Channels.MaxNumber(); channelNo++) {
if( (channel = Channels.GetByNumber(channelNo)) ) {
+#else
+ LOCK_CHANNELS_READ;
+ for (channelNo = 1; channelNo <= Channels->MaxNumber(); channelNo++) {
+ if( (channel = (cChannel*) Channels->GetByNumber(channelNo)) ) {
+#endif
if (d->IsTunedToTransponder(channel)) {
return channel;
}
@@ -78,8 +84,14 @@
cChannel *resChannel = NULL;
int oldQRG = getTunedFrequency(device);
+#if VDRVERSNUM < 20300
for (channelNo = 1; channelNo <= Channels.MaxNumber(); channelNo++) {
if( (channel = Channels.GetByNumber(channelNo)) ) {
+#else
+ LOCK_CHANNELS_READ;
+ for (channelNo = 1; channelNo <= Channels->MaxNumber(); channelNo++) {
+ if( (channel = (cChannel*) Channels->GetByNumber(channelNo)) ) {
+#endif
if( device->ProvidesSource( channel->Source() ) ) { // same source (DVB-T, -S, ...)
if( !ISTRANSPONDER(channel->Frequency(),oldQRG) ) { //not the same transponder
if( channel->Frequency()*direction > oldQRG*direction ) {
@@ -152,7 +164,11 @@
int GetChannelNr() { return ChannelNr; }
bool IsChannel() { return ChannelNr != 0; }
bool HasDevice() { return DeviceNr >= 0; }
+#if VDRVERSNUM < 20300
cChannel* GetChannel() { return Channels.GetByNumber(ChannelNr); }
+#else
+ cChannel* GetChannel() { LOCK_CHANNELS_READ; return (cChannel*) Channels->GetByNumber(ChannelNr); }
+#endif
cDevice* GetDevice() { return cDevice::GetDevice(DeviceNr); };
};
@@ -279,8 +295,15 @@
int channelNo;
cChannel *channel = NULL;
+#if VDRVERSNUM < 20300
for (channelNo = 1; channelNo <= Channels.MaxNumber(); channelNo++) {
if( (channel = Channels.GetByNumber(channelNo)) ) {
+#else
+ LOCK_CHANNELS_READ;
+ for (channelNo = 1; channelNo <= Channels->MaxNumber(); channelNo++) {
+ if( (channel = (cChannel*) Channels->GetByNumber(channelNo)) ) {
+
+#endif
if (d->IsTunedToTransponder(channel)) {
bool currentLive = channelNo == d->CurrentChannel()
&& (i == cDevice::ActualDevice()->CardIndex());
@@ -350,7 +373,12 @@
eOSState Play(char* file) {
// Play the selected recording
cRecording* recordingFound = NULL;
+#if VDRVERSNUM < 20300
for(cRecording* recording = Recordings.First(); recording; recording = Recordings.Next(recording))
+#else
+ LOCK_RECORDINGS_READ;
+ for(cRecording* recording = (cRecording*) Recordings->First(); recording; recording = (cRecording*) Recordings->Next(recording))
+#endif
if (strstr(recording->Title(), file))
recordingFound = recording;
if (!recordingFound)
@@ -405,7 +433,12 @@
ri = (cMenuRecItem*)Get(Current());
if (ri->Selectable()) {
if (ri->IsChannel()) {
+#if VDRVERSNUM < 20300
Channels.SwitchTo(ri->GetChannelNr());
+#else
+ LOCK_CHANNELS_READ;
+ Channels->SwitchTo(ri->GetChannelNr());
+#endif
Write(); //repaint; maybe 'Live' has changed
return osContinue;
} else
@@ -635,7 +668,12 @@
#endif
if (Name) {
// insert new timers currently recording in TimersRecording
+#if VDRVERSNUM < 20300
for (cTimer *ti = Timers.First(); ti; ti = Timers.Next(ti))
+#else
+ LOCK_TIMERS_READ;
+ for (cTimer *ti = (cTimer*) Timers->First(); ti; ti = (cTimer*) Timers->Next(ti))
+#endif
if (ti->Recording()) {
// check if this is a new entry
bool bFound = false;

36
media-plugins/vdr-devstatus/vdr-devstatus-0.4.1-r1.ebuild
View File

@@ -1,36 +0,0 @@
# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit vdr-plugin-2
DESCRIPTION="VDR plugin: display the usage status of the available DVB devices"
HOMEPAGE="https://www.u32.de/vdr.html"
SRC_URI="https://www.u32.de/download/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="media-video/vdr"
RDEPEND="${DEPEND}"
QA_FLAGS_IGNORED="
usr/lib/vdr/plugins/libvdr-.*
usr/lib64/vdr/plugins/libvdr-.*"
PATCHES=(
"${FILESDIR}/${P}-recordingfound.patch"
"${FILESDIR}/${P}-channelswitch.patch"
"${FILESDIR}/${P}-dvb-adapter-frontend.patch"
"${FILESDIR}/${P}-memoryleak.patch"
"${FILESDIR}/${P}-vdr2.3.patch"
)
src_prepare() {
# remove untranslated .po files
rm "${S}"/po/{ca_ES,cs_CZ,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,sl_SI,sv_SE,tr_TR}.po \
|| die "failed to remove untranslated .po files"
vdr-plugin-2_src_prepare
}