diff --git a/plugins/vdr-tvguide/.SRCINFO b/plugins/vdr-tvguide/.SRCINFO deleted file mode 100644 index 566b29f1c..000000000 --- a/plugins/vdr-tvguide/.SRCINFO +++ /dev/null @@ -1,24 +0,0 @@ -pkgbase = vdr-tvguide - pkgdesc = highly customizable 2D EPG viewer plugin. - pkgver = 1.2.2 - pkgrel = 11 - epoch = 1 - url = http://projects.vdr-developer.org/projects/plg-tvguide - arch = x86_64 - arch = i686 - arch = arm - arch = armv6h - arch = armv7h - license = GPL2 - makedepends = git - depends = graphicsmagick - depends = libpng - depends = vdr-api=2.4.0 - backup = etc/vdr/conf.avail/50-tvguide.conf - source = http://projects.vdr-developer.org/attachments/download/1701/vdr-tvguide-1.2.2.tgz - source = 50-tvguide.conf - md5sums = 1e811e1a99f68afd8f85f56fd416a0f1 - md5sums = 3caf2313b8794eaa525af664a7208b7a - -pkgname = vdr-tvguide - diff --git a/plugins/vdr-tvguide/50-tvguide.conf b/plugins/vdr-tvguide/50-tvguide.conf deleted file mode 100644 index fb10115f5..000000000 --- a/plugins/vdr-tvguide/50-tvguide.conf +++ /dev/null @@ -1,9 +0,0 @@ -[tvguide] -#--epgimages= -# Set directory where epgimages are stored. - -#--iconpath= -# Set directory where icons are stored. - -#--logopath= -# Set directory where logos are stored. \ No newline at end of file diff --git a/plugins/vdr-tvguide/PKGBUILD b/plugins/vdr-tvguide/PKGBUILD deleted file mode 100644 index 452cc655c..000000000 --- a/plugins/vdr-tvguide/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# This PKGBUILD is part of the VDR4Arch project [https://github.com/vdr4arch] - -# Maintainer: Christopher Reimer -pkgname=vdr-tvguide -pkgver=1.2.2 -epoch=1 -_vdrapi=2.4.0 -pkgrel=11 -pkgdesc="highly customizable 2D EPG viewer plugin." -url="http://projects.vdr-developer.org/projects/plg-tvguide" -arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h') -license=('GPL2') -depends=('graphicsmagick' 'libpng' "vdr-api=$_vdrapi") -makedepends=('git') -_plugname=${pkgname//vdr-/} -source=("http://projects.vdr-developer.org/attachments/download/1701/$pkgname-$pkgver.tgz" - "50-$_plugname.conf") -backup=("etc/vdr/conf.avail/50-$_plugname.conf") -md5sums=('1e811e1a99f68afd8f85f56fd416a0f1' - '3caf2313b8794eaa525af664a7208b7a') - -build() { - cd "$srcdir/$_plugname-$pkgver" - make IMAGELIB=graphicsmagick -} - -package() { - cd "$srcdir/$_plugname-$pkgver" - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/50-$_plugname.conf" "$pkgdir/etc/vdr/conf.avail/50-$_plugname.conf" - - chown -R 666:666 "$pkgdir/var/lib/vdr" -} diff --git a/plugins/vdr-tvguideng/.SRCINFO b/plugins/vdr-tvguideng/.SRCINFO index 7b6dcfd68..623c498a9 100644 --- a/plugins/vdr-tvguideng/.SRCINFO +++ b/plugins/vdr-tvguideng/.SRCINFO @@ -13,8 +13,10 @@ pkgbase = vdr-tvguideng depends = vdr-skindesigner backup = etc/vdr/conf.avail/50-tvguideng.conf source = http://projects.vdr-developer.org/git/vdr-plugin-tvguideng.git/snapshot/vdr-plugin-tvguideng-0.3.0.tar.bz2 + source = tvguideng_235.diff::https://www.vdr-portal.de/index.php?attachment/41876-tvguideng-235-diff/ source = tvguideng-fix-compile-error.diff md5sums = dd810a231a1718444d4f02180ae39bb5 + md5sums = ed7610ee07ab3b44420135f6da77f382 md5sums = 1c89a7ec96785eb223ec02f2ad4963f5 pkgname = vdr-tvguideng diff --git a/plugins/vdr-tvguideng/PKGBUILD b/plugins/vdr-tvguideng/PKGBUILD index 741281e23..5826a2618 100644 --- a/plugins/vdr-tvguideng/PKGBUILD +++ b/plugins/vdr-tvguideng/PKGBUILD @@ -12,14 +12,17 @@ license=('GPL2') depends=("vdr-api=$_vdrapi" 'vdr-skindesigner') _plugname=${pkgname//vdr-/} source=("http://projects.vdr-developer.org/git/vdr-plugin-$_plugname.git/snapshot/vdr-plugin-$_plugname-$pkgver.tar.bz2" + "tvguideng_235.diff::https://www.vdr-portal.de/index.php?attachment/41876-tvguideng-235-diff/" 'tvguideng-fix-compile-error.diff') backup=("etc/vdr/conf.avail/50-$_plugname.conf") md5sums=('dd810a231a1718444d4f02180ae39bb5' + 'ed7610ee07ab3b44420135f6da77f382' '1c89a7ec96785eb223ec02f2ad4963f5') prepare() { cd "$srcdir/vdr-plugin-$_plugname-$pkgver" patch -p1 -i "$srcdir/tvguideng-fix-compile-error.diff" + patch -p1 -i "$srcdir/tvguideng_235.diff" } build() { diff --git a/plugins/vdr-zappilot/.SRCINFO b/plugins/vdr-zappilot/.SRCINFO index 32b3af988..b4dca1cca 100644 --- a/plugins/vdr-zappilot/.SRCINFO +++ b/plugins/vdr-zappilot/.SRCINFO @@ -13,7 +13,9 @@ pkgbase = vdr-zappilot depends = vdr-api=2.4.0 backup = etc/vdr/conf.avail/50-zappilot.conf source = http://projects.vdr-developer.org/attachments/download/1318/vdr-zappilot-0.0.5.tgz + source = zappilot-0.0.5-vdr-2.3.1-porting.diff md5sums = 0774d4093fc6158dc321e52b336aa2ab + md5sums = 6acf67f7e5f84d2965ba6826f91124f3 pkgname = vdr-zappilot diff --git a/plugins/vdr-zappilot/PKGBUILD b/plugins/vdr-zappilot/PKGBUILD index 00c093dfd..ad53f3fa2 100644 --- a/plugins/vdr-zappilot/PKGBUILD +++ b/plugins/vdr-zappilot/PKGBUILD @@ -11,9 +11,16 @@ arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h') license=('GPL') depends=('gcc-libs' "vdr-api=${_vdrapi}") _plugname=${pkgname//vdr-/} -source=("http://projects.vdr-developer.org/attachments/download/1318/$pkgname-$pkgver.tgz") +source=("http://projects.vdr-developer.org/attachments/download/1318/$pkgname-$pkgver.tgz" + "zappilot-0.0.5-vdr-2.3.1-porting.diff") backup=("etc/vdr/conf.avail/50-$_plugname.conf") -md5sums=('0774d4093fc6158dc321e52b336aa2ab') +md5sums=('0774d4093fc6158dc321e52b336aa2ab' + '6acf67f7e5f84d2965ba6826f91124f3') + +prepare() { + cd "$srcdir/$_plugname-$pkgver" + patch -p1 -i "$srcdir/zappilot-0.0.5-vdr-2.3.1-porting.diff" +} build() { cd "$srcdir/$_plugname-$pkgver" diff --git a/plugins/vdr-zappilot/zappilot-0.0.5-vdr-2.3.1-porting.diff b/plugins/vdr-zappilot/zappilot-0.0.5-vdr-2.3.1-porting.diff new file mode 100644 index 000000000..fae635a75 --- /dev/null +++ b/plugins/vdr-zappilot/zappilot-0.0.5-vdr-2.3.1-porting.diff @@ -0,0 +1,276 @@ +--- b/zappilotosd.c 2015-06-24 14:32:15.000000000 +0200 ++++ a/zappilotosd.c 2015-10-22 18:39:36.000000000 +0200 +@@ -69,7 +69,7 @@ cZappilotOsd::~cZappilotOsd(void) + + void cZappilotOsd::DisplayChannel(const cChannel *Channel) + { +- int BufSize = 255; ++ int BufSize = 1020; + if (Channel) + { + if (Channel->GroupSep()) +@@ -172,11 +172,11 @@ void cZappilotOsd::UpdateEPGInfo(int Now + titleFollowingInfo = NULL; + subtitlePresentInfo = NULL; + subtitleFollowingInfo = NULL; +- cSchedulesLock SchedulesLock; +- const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock); ++ LOCK_SCHEDULES_READ; ++ LOCK_CHANNELS_READ; + if (Schedules) + { +- const cSchedule *Schedule = Schedules->GetSchedule(Channels.GetByNumber(PilotChannelNumber)->GetChannelID()); ++ const cSchedule *Schedule = Schedules->GetSchedule(Channels->GetByNumber(PilotChannelNumber)->GetChannelID()); + if (Schedule) + { + // Get Present event +@@ -267,9 +267,9 @@ void cZappilotOsd::UpdateEPGInfo(int Now + void cZappilotOsd::Show() + { + // find the actual current +- cChannel *Channel = Channels.GetByNumber(cDevice::PrimaryDevice()->CurrentChannel()); +- currentChannel = Channels.GetByNumber(cDevice::PrimaryDevice()->CurrentChannel()); +- ++ LOCK_CHANNELS_READ; ++ const cChannel *Channel = Channels->GetByNumber(cDevice::PrimaryDevice()->CurrentChannel()); ++ currentChannel = Channel; + if (Channel) + { + PilotChannelNumber = Channel->Number(); +@@ -333,13 +333,14 @@ eOSState cZappilotOsd::ProcessKey(eKeys + case k1 ... k9: + if (number >= 0) + { +- if (number > Channels.MaxNumber()) ++ LOCK_CHANNELS_READ; ++ if (number > Channels->MaxNumber()) + number = Key - k0; + else + number = number * 10 + Key - k0; + if (number > 0) + { +- cChannel *channel = Channels.GetByNumber(number); ++ const cChannel *channel = Channels->GetByNumber(number); + if (channel) + { + PilotChannelNumber = channel->Number(); +@@ -363,7 +364,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys + if (config.fastbrowse) + { + CursorDown(); +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + if (channel) + group = channel->Index()-1; + break; +@@ -380,7 +382,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys + if (config.fastbrowse) + { + CursorUp(); +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + if (channel) + group = channel->Index()-1; + break; +@@ -396,7 +399,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys + { + if (group < 0) + { +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + if (channel) + group = channel->Index(); + } +@@ -405,15 +409,18 @@ eOSState cZappilotOsd::ProcessKey(eKeys + int SaveGroup = group; + if (NORMALKEY(Key) == kRight) + { +- group = Channels.GetNextGroup(group); ++ LOCK_CHANNELS_READ; ++ group = Channels->GetNextGroup(group); + } + else + { +- group = Channels.GetPrevGroup(group < 1 ? 1 : group); ++ LOCK_CHANNELS_READ; ++ group = Channels->GetPrevGroup(group < 1 ? 1 : group); + } + if (group < 0) + group = SaveGroup; +- cChannel *channel = Channels.Get(group); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->Get(group); + if (channel) + { + //DisplayChannel(channel); +@@ -449,7 +456,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys + else + { + CursorUp(); +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + if (channel) + group = channel->Index()-1; + break; +@@ -466,20 +474,22 @@ eOSState cZappilotOsd::ProcessKey(eKeys + else + { + CursorDown(); +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + if (channel) +- group = channel->Index()-1; ++ group = channel->Index()-1; + break; + } + case kNone: + if (number && (int)cTimeMs::Now() - lastTime > 1000) + { +- if (Channels.GetByNumber(number)) ++ LOCK_CHANNELS_READ; ++ if (Channels->GetByNumber(number)) + { + PilotChannelNumber = number; + lastTime = cTimeMs::Now(); + number = 0; +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + if (channel) + group = channel->Index()-1; + } +@@ -553,7 +563,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys + { + if (group < 0) + { +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + if (channel) + group = channel->Index(); + } +@@ -562,15 +573,18 @@ eOSState cZappilotOsd::ProcessKey(eKeys + int SaveGroup = group; + if (NORMALKEY(Key) == kBlue) + { +- group = Channels.GetNextGroup(group); ++ LOCK_CHANNELS_READ; ++ group = Channels->GetNextGroup(group); + } + else + { +- group = Channels.GetPrevGroup(group < 1 ? 1 : group); ++ LOCK_CHANNELS_READ; ++ group = Channels->GetPrevGroup(group < 1 ? 1 : group); + } + if (group < 0) + group = SaveGroup; +- cChannel *channel = Channels.Get(group); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->Get(group); + if (channel) + { + //DisplayChannel(channel); +@@ -663,8 +677,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys + void cZappilotOsd::CursorUp() + { + int n = PilotChannelNumber + 1; +- cChannel *channel; +- channel = Channels.GetByNumber(n, 1); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(n, 1); + if (channel) + { + n = channel->Number(); +@@ -678,8 +692,8 @@ void cZappilotOsd::CursorUp() + void cZappilotOsd::CursorDown() + { + int n = PilotChannelNumber - 1; +- cChannel *channel; +- channel = Channels.GetByNumber(n, -1); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(n, -1); + if (channel) + { + n = channel->Number(); +@@ -693,9 +707,13 @@ void cZappilotOsd::CursorDown() + void cZappilotOsd::CursorOK() + { + DrawMenu(0,2); +- if (currentChannel != Channels.GetByNumber(PilotChannelNumber)) ++ LOCK_CHANNELS_READ; ++ const cChannel* chan = Channels->GetByNumber(PilotChannelNumber); ++ ++ if (currentChannel != chan) + { +- cChannel *Channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *Channel = Channels->GetByNumber(PilotChannelNumber); + if (Channel) + { + cDevice::PrimaryDevice()->SwitchChannel(Channel, true); +@@ -750,7 +768,8 @@ void cZappilotOsd::DisplayInfo(int delta + displayTimer = NULL; + displayChannel = Skins.Current()->DisplayChannel(true); + } +- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); + + if (!isempty(titlePresentInfo)) + { +@@ -778,14 +797,17 @@ void cZappilotOsd::DisplayExtraInfo() + displayEvent = NULL; + } + +- displayEvent = new cMenuEvent(Present,false,true); ++ ++ LOCK_TIMERS_READ; ++ LOCK_CHANNELS_READ; ++ displayEvent = new cMenuEvent(Timers, Channels, Present,false,true); + displayEvent->Display(); + } + + + void cZappilotOsd::DisplayTimer() + { +- ++ + if (displayChannel) + { + delete displayChannel; +@@ -797,13 +819,17 @@ void cZappilotOsd::DisplayTimer() + displayEvent = NULL; + } + ++ LOCK_TIMERS_WRITE; ++ + cTimer *timer = new cTimer(Present); +- cTimer *t = Timers.GetTimer(timer); ++ cTimer *t = Timers->GetMatch(Present); ++ + if (t) + { + delete timer; + timer = t; + } ++ + displayTimer=new cMenuEditTimer(timer, !t); + displayTimer->Display(); + } +diff -rupN b/zappilotosd.h a/zappilotosd.h +--- b/zappilotosd.h 2015-06-24 14:32:15.000000000 +0200 ++++ a/zappilotosd.h 2015-10-22 18:40:02.000000000 +0200 +@@ -39,7 +39,7 @@ class cZappilotOsd : public cOsdObject + int offset; + int lines; + int type; +- cChannel* currentChannel; ++ const cChannel* currentChannel; + + public: + cZappilotOsd(void); diff --git a/repo-gen.json b/repo-gen.json index 1a4e851f5..85244acfd 100644 --- a/repo-gen.json +++ b/repo-gen.json @@ -2,7 +2,6 @@ "repo_name": "vdr4arch", "sign": true, "skip_directories": [ - "plugins/vdr-tvguideng", "plugins/vdr-softhddevice", "plugins/vdr-favorites", "plugins/vdr-channellists", @@ -22,7 +21,6 @@ "plugins/vdr-skinpearlhd", "plugins/vdr-hddarchive", "plugins/vdr-tvscraper", - "plugins/vdr-tvguide", "plugins/vdr-vompserver", "plugins/vdr-noepg", "plugins/vdr-epgfixer", diff --git a/vdr-addon-lifeguard/.SRCINFO b/vdr-addon-lifeguard/.SRCINFO index cdc47c12c..2b51e1ab9 100644 --- a/vdr-addon-lifeguard/.SRCINFO +++ b/vdr-addon-lifeguard/.SRCINFO @@ -9,7 +9,7 @@ pkgbase = vdr-addon-lifeguard optdepends = samba: To check active samba connections optdepends = afpfs-ng: To check active AFP connections backup = etc/vdr/lifeguard.conf - source = http://e-tobi.net/vdr-experimental/pool-squeeze/source/addons/vdr-addon-lifeguard_0.0.4.tar.gz + source = https://packages.e-tobi.net/vdr-experimental/pool-squeeze/source/addons/vdr-addon-lifeguard_0.0.4.tar.gz source = lifeguard-use_ss_instead_of_netstat.diff md5sums = 9494c1b691256452ead283f59956ebd4 md5sums = de99fdd8d1662150408200dcf095519f