From owner-svn-ports-all@FreeBSD.ORG Tue Jul 22 09:59:02 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7F29D648; Tue, 22 Jul 2014 09:59:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5FCF2224D; Tue, 22 Jul 2014 09:59:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6M9x2X2093984; Tue, 22 Jul 2014 09:59:02 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6M9x1hP093977; Tue, 22 Jul 2014 09:59:01 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201407220959.s6M9x1hP093977@svn.freebsd.org> From: Koop Mast Date: Tue, 22 Jul 2014 09:59:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362527 - in head/multimedia/mjpegtools: . 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jul 2014 09:59:02 -0000 Author: kwm Date: Tue Jul 22 09:59:01 2014 New Revision: 362527 URL: http://svnweb.freebsd.org/changeset/ports/362527 QAT: https://qat.redports.org/buildarchive/r362527/ Log: Fix two problems. Use class instead of struct for RateCtl in encoderparams.hh. Class RateCtl is defined in ratectl.hh and used elsewhere in the code too. Fix headerguard typo in ontheflyratectlpass[12].hh. Found by: Clang Added: head/multimedia/mjpegtools/files/patch-mpeg2enc_encoderparams.hh (contents, props changed) head/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass1.hh (contents, props changed) head/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass2.hh (contents, props changed) Modified: head/multimedia/mjpegtools/Makefile Modified: head/multimedia/mjpegtools/Makefile ============================================================================== --- head/multimedia/mjpegtools/Makefile Tue Jul 22 09:33:37 2014 (r362526) +++ head/multimedia/mjpegtools/Makefile Tue Jul 22 09:59:01 2014 (r362527) @@ -3,7 +3,7 @@ PORTNAME= mjpegtools PORTVERSION= 2.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION} Added: head/multimedia/mjpegtools/files/patch-mpeg2enc_encoderparams.hh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mjpegtools/files/patch-mpeg2enc_encoderparams.hh Tue Jul 22 09:59:01 2014 (r362527) @@ -0,0 +1,14 @@ +Use class RateCtl instead of struct. +Class RateCtl is defined in ratectl.hh and used elsewhere in the code too. + +--- ./mpeg2enc/encoderparams.hh.orig 2014-07-21 16:50:46.000000000 +0200 ++++ ./mpeg2enc/encoderparams.hh 2014-07-21 16:50:56.000000000 +0200 +@@ -79,7 +79,7 @@ + }; + + +-struct RateCtl; ++class RateCtl; + class MPEG2EncOptions; + + class EncoderParams Added: head/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass1.hh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass1.hh Tue Jul 22 09:59:01 2014 (r362527) @@ -0,0 +1,9 @@ +--- mpeg2enc/ontheflyratectlpass1.hh.orig 2014-07-21 16:51:41.000000000 +0200 ++++ mpeg2enc/ontheflyratectlpass1.hh 2014-07-21 16:52:29.000000000 +0200 +@@ -1,5 +1,5 @@ + #ifndef _ONTHEFLYRATECTLPASS1_HH +-#define _ONTHELFYRATECTLPASS1_HH ++#define _ONTHEFLYRATECTLPASS1_HH + + /* (C) 2003 Andrew Stevens */ + Added: head/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass2.hh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass2.hh Tue Jul 22 09:59:01 2014 (r362527) @@ -0,0 +1,9 @@ +--- mpeg2enc/ontheflyratectlpass2.hh.orig 2014-07-21 16:51:46.000000000 +0200 ++++ mpeg2enc/ontheflyratectlpass2.hh 2014-07-21 16:52:33.000000000 +0200 +@@ -1,5 +1,5 @@ + #ifndef _ONTHEFLYRATECTLPASS2_HH +-#define _ONTHELFYRATECTLPASS2_HH ++#define _ONTHEFLYRATECTLPASS2_HH + + /* (C) 2003 Andrew Stevens */ +