From owner-svn-ports-head@FreeBSD.ORG Tue Mar 19 18:03:03 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 71DC7D10; Tue, 19 Mar 2013 18:03:03 +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 5CAA1A7C; Tue, 19 Mar 2013 18:03:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2JI33AT085059; Tue, 19 Mar 2013 18:03:03 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2JI33Ht085057; Tue, 19 Mar 2013 18:03:03 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201303191803.r2JI33Ht085057@svn.freebsd.org> From: Juergen Lock Date: Tue, 19 Mar 2013 18:03:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314671 - in head/multimedia/vdr: . 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Mar 2013 18:03:03 -0000 Author: nox Date: Tue Mar 19 18:03:02 2013 New Revision: 314671 URL: http://svnweb.freebsd.org/changeset/ports/314671 Log: - Add fix for crashes when cutting. [1] - Convert Makefile header. - Bump PORTREVISION. Reported by: gb+ML-2011@derbrauer.homelinux.net (Gerhard Brauer) [1] Added: head/multimedia/vdr/files/patch-z-cutter.c (contents, props changed) Modified: head/multimedia/vdr/Makefile Modified: head/multimedia/vdr/Makefile ============================================================================== --- head/multimedia/vdr/Makefile Tue Mar 19 18:00:29 2013 (r314670) +++ head/multimedia/vdr/Makefile Tue Mar 19 18:03:02 2013 (r314671) @@ -1,13 +1,9 @@ -# New ports collection makefile for: vdr -# Date created: Wed Apr 14 18:11:42 CEST 2010 -# Whom: Juergen Lock -# +# Created by: Juergen Lock # $FreeBSD$ -# PORTNAME= vdr PORTVERSION= 1.7.29 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.tvdr.de/vdr/Developer/ Added: head/multimedia/vdr/files/patch-z-cutter.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vdr/files/patch-z-cutter.c Tue Mar 19 18:03:02 2013 (r314671) @@ -0,0 +1,61 @@ +--- cutter.c.orig ++++ cutter.c +@@ -83,7 +83,18 @@ void cCuttingThread::Action(void) + int LastIFrame = 0; + toMarks.Add(0); + toMarks.Save(); ++#ifdef __FreeBSD__ ++ // XXX save thread stack space ++ uchar *buffer = MALLOC(uchar, MAXFRAMESIZE); ++ uchar *buffer2 = MALLOC(uchar, MAXFRAMESIZE); ++ if (buffer == NULL || buffer2 == NULL) { ++ free(buffer); ++ error = "malloc"; ++ return; ++ } ++#else + uchar buffer[MAXFRAMESIZE], buffer2[MAXFRAMESIZE]; ++#endif + int Length2; + bool CheckForSeamlessStream = false; + bool LastMark = false; +@@ -108,7 +119,7 @@ void cCuttingThread::Action(void) + CurrentFileNumber = FileNumber; + } + if (fromFile) { +- int len = ReadFrame(fromFile, buffer, Length, sizeof(buffer)); ++ int len = ReadFrame(fromFile, buffer, Length, MAXFRAMESIZE); + if (len < 0) { + error = "ReadFrame"; + break; +@@ -193,7 +204,7 @@ void cCuttingThread::Action(void) + if (FileNumber != CurrentFileNumber) + fromFile = fromFileName->SetOffset(FileNumber, FileOffset); + if (fromFile) { +- int len = ReadFrame(fromFile, buffer2, Length2, sizeof(buffer2)); ++ int len = ReadFrame(fromFile, buffer2, Length2, MAXFRAMESIZE); + if (len >= 0 && len == Length2) + CheckForSeamlessStream = true; + } +@@ -216,6 +227,10 @@ void cCuttingThread::Action(void) + } + } + Recordings.TouchUpdate(); ++#ifdef __FreeBSD__ ++ free(buffer); ++ free(buffer2); ++#endif + } + else + esyslog("no editing marks found!"); +--- thread.c.orig ++++ thread.c +@@ -242,7 +242,7 @@ void cThread::SetPriority(int Priority) + void cThread::SetIOPriority(int Priority) + { + #ifdef __FreeBSD__ +- esyslog("ERROR: syscall(SYS_ioprio_set ...) unsupported on FreeBSD"); ++ // esyslog("ERROR: syscall(SYS_ioprio_set ...) unsupported on FreeBSD"); + #else + if (syscall(SYS_ioprio_set, 1, 0, (Priority & 0xff) | (2 << 13)) < 0) // best effort class + LOG_ERROR;