diff options
| author | Juergen Lock <nox@FreeBSD.org> | 2013-05-25 13:39:23 +0000 |
|---|---|---|
| committer | Juergen Lock <nox@FreeBSD.org> | 2013-05-25 13:39:23 +0000 |
| commit | f73a685857c35637fc2e9ee024115ce9a6a82175 (patch) | |
| tree | 6b593ef8ad4b757cfd99076c65a624d164f87d25 /multimedia/vdr-plugin-ttxtsubs | |
| parent | 02111b30a2d8d83abf47ae340804b2f2c50f5db7 (diff) | |
| download | ports-f73a685857c35637fc2e9ee024115ce9a6a82175.tar.gz ports-f73a685857c35637fc2e9ee024115ce9a6a82175.zip | |
- Fix bug uncovered by recent clang.
- Strip Makefile header.
- Bump PORTREVISION.
Submitted by: pointyhat amd64 10-exprun via miwi
Notes
Notes:
svn path=/head/; revision=319050
Diffstat (limited to 'multimedia/vdr-plugin-ttxtsubs')
| -rw-r--r-- | multimedia/vdr-plugin-ttxtsubs/Makefile | 8 | ||||
| -rw-r--r-- | multimedia/vdr-plugin-ttxtsubs/files/patch-vdr-1.7.29 | 25 |
2 files changed, 27 insertions, 6 deletions
diff --git a/multimedia/vdr-plugin-ttxtsubs/Makefile b/multimedia/vdr-plugin-ttxtsubs/Makefile index 66ae730b4113..09835c71d2cc 100644 --- a/multimedia/vdr-plugin-ttxtsubs/Makefile +++ b/multimedia/vdr-plugin-ttxtsubs/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: vdr-plugin-ttxtsubs -# Date created: Fri May 13 18:13:34 CEST 2011 -# Whom: Juergen Lock <nox@freebsd.org> -# +# Created by: Juergen Lock <nox@FreeBSD.org> # $FreeBSD$ -# PORTNAME= vdr-plugin-ttxtsubs PORTVERSION= 0.2.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/725/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-ttxtsubs/files/patch-vdr-1.7.29 b/multimedia/vdr-plugin-ttxtsubs/files/patch-vdr-1.7.29 new file mode 100644 index 000000000000..011554752592 --- /dev/null +++ b/multimedia/vdr-plugin-ttxtsubs/files/patch-vdr-1.7.29 @@ -0,0 +1,25 @@ +--- ttxtsubs.c.orig ++++ ttxtsubs.c +@@ -136,7 +136,7 @@ public: + + // -- cStatus + protected: +- virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber); ++ virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView); + virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On); + // virtual void OsdClear(void) { ShowTtxt(); } + // virtual void OsdTitle(const char *Title) { HideTtxt(); } +@@ -333,10 +333,11 @@ bool cPluginTtxtsubs::SetupParse(const c + return true; + } + +-void cPluginTtxtsubs::ChannelSwitch(const cDevice *Device, int ChannelNumber) ++void cPluginTtxtsubs::ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView) + { + //dprint("cPluginTtxtsubs::ChannelSwitch(devicenr: %d, channelnr: %d) - mDispl: %x\n", Device->DeviceNumber(), ChannelNumber, mDispl); // XXX +- if (Device->IsPrimaryDevice() && !Device->Replaying() && ChannelNumber) ++ if (LiveView /*Device->IsPrimaryDevice()*/ && ++ !Device->Replaying() && ChannelNumber) + { + StopTtxt(); + DELETENULL(mLiveReceiver); |