From owner-svn-ports-head@FreeBSD.ORG  Sat May 25 13:39:24 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7359DF2C;
 Sat, 25 May 2013 13:39:24 +0000 (UTC) (envelope-from nox@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4C1551AF;
 Sat, 25 May 2013 13:39:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4PDdOJ2035463;
 Sat, 25 May 2013 13:39:24 GMT (envelope-from nox@svn.freebsd.org)
Received: (from nox@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4PDdNqL035458;
 Sat, 25 May 2013 13:39:23 GMT (envelope-from nox@svn.freebsd.org)
Message-Id: <201305251339.r4PDdNqL035458@svn.freebsd.org>
From: Juergen Lock <nox@FreeBSD.org>
Date: Sat, 25 May 2013 13:39:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319050 - in head/multimedia/vdr-plugin-ttxtsubs: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 May 2013 13:39:24 -0000

Author: nox
Date: Sat May 25 13:39:23 2013
New Revision: 319050
URL: http://svnweb.freebsd.org/changeset/ports/319050

Log:
  - Fix bug uncovered by recent clang.
  - Strip Makefile header.
  - Bump PORTREVISION.
  
  Submitted by:	pointyhat amd64 10-exprun via miwi

Added:
  head/multimedia/vdr-plugin-ttxtsubs/files/patch-vdr-1.7.29   (contents, props changed)
Modified:
  head/multimedia/vdr-plugin-ttxtsubs/Makefile

Modified: head/multimedia/vdr-plugin-ttxtsubs/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-ttxtsubs/Makefile	Sat May 25 13:37:08 2013	(r319049)
+++ head/multimedia/vdr-plugin-ttxtsubs/Makefile	Sat May 25 13:39:23 2013	(r319050)
@@ -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}

Added: head/multimedia/vdr-plugin-ttxtsubs/files/patch-vdr-1.7.29
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/vdr-plugin-ttxtsubs/files/patch-vdr-1.7.29	Sat May 25 13:39:23 2013	(r319050)
@@ -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);