From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 9 05:40:12 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4340316A4CE for ; Tue, 9 Mar 2004 05:40:12 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32DF443D2D for ; Tue, 9 Mar 2004 05:40:12 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i29DeCbv032686 for ; Tue, 9 Mar 2004 05:40:12 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i29DeCwo032685; Tue, 9 Mar 2004 05:40:12 -0800 (PST) (envelope-from gnats) Resent-Date: Tue, 9 Mar 2004 05:40:12 -0800 (PST) Resent-Message-Id: <200403091340.i29DeCwo032685@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ulrich Spoerlein Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6619316A4CE for ; Tue, 9 Mar 2004 05:32:10 -0800 (PST) Received: from wrzx28.rz.uni-wuerzburg.de (wrzx28.rz.uni-wuerzburg.de [132.187.3.28]) by mx1.FreeBSD.org (Postfix) with ESMTP id C239643D31 for ; Tue, 9 Mar 2004 05:32:09 -0800 (PST) (envelope-from q@uni.de) Received: from wrzx34.rz.uni-wuerzburg.de (wrzx34.rz.uni-wuerzburg.de [132.187.3.34]) by wrzx28.rz.uni-wuerzburg.de (Postfix) with ESMTP id 75A2BB6C05 for ; Tue, 9 Mar 2004 14:32:08 +0100 (CET) Received: from virusscan (localhost [127.0.0.1]) by wrzx34.rz.uni-wuerzburg.de (Postfix) with ESMTP id 5D0DC678F5 for ; Tue, 9 Mar 2004 14:32:08 +0100 (CET) Received: from wrzx28.rz.uni-wuerzburg.de (wrzx28.rz.uni-wuerzburg.de [132.187.3.28]) by wrzx34.rz.uni-wuerzburg.de (Postfix) with ESMTP id 30DC464AF9 for ; Tue, 9 Mar 2004 14:32:08 +0100 (CET) Received: from coyote.q.local (wwsx14.win-screen.uni-wuerzburg.de [132.187.253.14]) by mailmaster.uni-wuerzburg.de (Postfix) with ESMTP id 142F9B6C05 for ; Tue, 9 Mar 2004 14:32:08 +0100 (CET) Received: from roadrunner.q.local (roadrunner.q.local [192.168.0.147]) by coyote.q.local (8.12.10/8.12.10) with ESMTP id i28GT2MG036897 for ; Mon, 8 Mar 2004 17:29:02 +0100 (CET) (envelope-from q@roadrunner.q.local) Received: from roadrunner.q.local (localhost [127.0.0.1]) by roadrunner.q.local (8.12.10/8.12.10) with ESMTP id i28GT1dG074481 for ; Mon, 8 Mar 2004 17:29:01 +0100 (CET) (envelope-from q@roadrunner.q.local) Received: (from q@localhost) by roadrunner.q.local (8.12.10/8.12.10/Submit) id i28GT1rq074480; Mon, 8 Mar 2004 17:29:01 +0100 (CET) (envelope-from q) Message-Id: <200403081629.i28GT1rq074480@roadrunner.q.local> Date: Mon, 8 Mar 2004 17:29:01 +0100 (CET) From: Ulrich Spoerlein To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/63985: [PATCH] multimedia/camserv: Unbreak the autobright option X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Mar 2004 13:40:12 -0000 >Number: 63985 >Category: ports >Synopsis: [PATCH] multimedia/camserv: Unbreak the autobright option >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Mar 09 05:40:11 PST 2004 >Closed-Date: >Last-Modified: >Originator: Ulrich Spoerlein >Release: FreeBSD 5.2.1-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD roadrunner 5.2.1-RELEASE-p1 FreeBSD 5.2.1-RELEASE-p1 #10: Wed Mar 3 22:48:11 CET >Description: The author forgot to rename calculate_pic_mean() to camserv_get_pic_mean(). There is also an off-by-one error in that function. Please use this patch, it works for me. There are two new files, patch-ac and patch-ad. I also fixed the configuration file from getting overwritten on re-install. Generated with FreeBSD Port Tools 0.50 >How-To-Repeat: >Fix: --- camserv-0.5.0_1,1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/multimedia/camserv/Makefile,v retrieving revision 1.8 diff -u -u -r1.8 Makefile --- Makefile 4 Mar 2004 06:54:21 -0000 1.8 +++ Makefile 8 Mar 2004 16:26:33 -0000 @@ -7,6 +7,7 @@ PORTNAME= camserv PORTVERSION= 0.5.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= http://cserv.sourceforge.net/old/ Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/multimedia/camserv/pkg-plist,v retrieving revision 1.3 diff -u -u -r1.3 pkg-plist --- pkg-plist 4 Mar 2004 06:29:01 -0000 1.3 +++ pkg-plist 8 Mar 2004 16:26:33 -0000 @@ -28,7 +28,7 @@ lib/camserv/libvideo_fbsd_bttv.la lib/camserv/libvideo_fbsd_bttv.so lib/camserv/libvideo_fbsd_bttv.so.0 -share/camserv/camserv.cfg +share/camserv/camserv.cfg.dist share/camserv/defpage.html %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/javascript.txt --- /dev/null Mon Mar 8 17:28:09 2004 +++ files/patch-ac Fri Mar 5 20:02:00 2004 @@ -0,0 +1,13 @@ +--- camserv/video_fbsd_bttv.c.orig Fri Mar 5 19:22:31 2004 ++++ camserv/video_fbsd_bttv.c Fri Mar 5 19:41:16 2004 +@@ -644,8 +644,8 @@ + if( !fbttv_dev->autobright || --fbttv_dev->autoleft > 0 ) + return 0; + +- totmean = calculate_pic_mean( width, height, picbuf, 1, 0, 0, +- width, height ); ++ totmean = camserv_get_pic_mean( width, height, picbuf, 1, 0, 0, ++ width-1, height-1 ); + if( totmean < (256 / 2) - 10 || totmean > (256 / 2) + 10 ) { + newbright = fbttv_dev->brightness; + if( totmean > (256 / 2) + 10 ){ --- /dev/null Mon Mar 8 17:28:16 2004 +++ files/patch-ad Fri Mar 5 20:02:00 2004 @@ -0,0 +1,12 @@ +--- Makefile.in.orig Fri Mar 5 19:11:47 2004 ++++ Makefile.in Fri Mar 5 19:12:04 2004 +@@ -96,3 +96,3 @@ + +-data_DATA = camserv.cfg defpage.html ++data_DATA = camserv.cfg.dist defpage.html + EXTRA_DIST = camserv.cfg.in javascript.txt BUGS camserv.spec defpage.html +@@ -402,3 +402,3 @@ + +-camserv.cfg: camserv.cfg.in ++camserv.cfg.dist: camserv.cfg.in + @sed -e s%CAMSERV_MODDIR%$(CAMSERV_MODDIR)%g < camserv.cfg.in > $@ --- camserv-0.5.0_1,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: