From owner-freebsd-ports@FreeBSD.ORG Tue Mar 9 05:32:10 2004 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 812FB16A4D0 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 C268B43D55 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 0EA72B6BF7; Tue, 9 Mar 2004 14:32:09 +0100 (CET) Received: from virusscan (localhost [127.0.0.1]) by wrzx34.rz.uni-wuerzburg.de (Postfix) with ESMTP id E44E96793F; 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 910D2678F5; 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 72B8AB6BFA; 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 i25J6pBH097722; Fri, 5 Mar 2004 20:06:51 +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 i25J6pYe008563; Fri, 5 Mar 2004 20:06:51 +0100 (CET) (envelope-from q@roadrunner.q.local) Received: (from q@localhost) by roadrunner.q.local (8.12.10/8.12.10/Submit) id i25J6oTI008562; Fri, 5 Mar 2004 20:06:50 +0100 (CET) (envelope-from q) Date: Fri, 5 Mar 2004 20:06:50 +0100 From: Ulrich Spoerlein To: Mark Linimon Message-ID: <20040305190650.GC822@galgenberg.net> Mail-Followup-To: Mark Linimon , Kenneth W Cochran , freebsd-ports@freebsd.org References: <200403041524.KAA24937406@shell.TheWorld.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="zjcmjzIkjQU2rmur" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.6i X-Virus-Scanned: by amavisd-new (Rechenzentrum Universitaet Wuerzburg) cc: Kenneth W Cochran cc: freebsd-ports@freebsd.org Subject: Re: New camserv-0.5.0 broken in 4-stable? X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Mar 2004 13:32:10 -0000 --zjcmjzIkjQU2rmur Content-Type: multipart/mixed; boundary="EY/WZ/HvNxOox07X" Content-Disposition: inline --EY/WZ/HvNxOox07X Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hello, could you please be so kind and commit the attached patch? It makes the autobright option work and no longer clobbers camserv.cfg on re-install. The author renamed the get_pic_mean() function from version 0.42 to version 0.50 and forgot to change the name in the bttv-case. In addition, the parameters passed to get_pic_mean() are off by one. New files: files/patch-ac, files/patch-ad Ulrich Spoerlein --=20 PGP Key ID: F0DB9F44 Get it while it's hot! PGP Fingerprint: F1CE D062 0CA9 ADE3 349B 2FE8 980A C6B5 F0DB 9F44 I abhor a system designed for the "user", if that word is a coded pejorative meaning "stupid and unsophisticated". -- Ken Thompson --EY/WZ/HvNxOox07X Content-Type: text/plain; charset=us-ascii Content-Description: camserv.patch Content-Disposition: attachment; filename=foo Content-Transfer-Encoding: quoted-printable ? files/patch-ac ? files/patch-ad Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/multimedia/camserv/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- Makefile 4 Mar 2004 06:54:21 -0000 1.8 +++ Makefile 5 Mar 2004 19:05:18 -0000 @@ -7,6 +7,7 @@ =20 PORTNAME=3D camserv PORTVERSION=3D 0.5.0 +PORTREVISION=3D 1 PORTEPOCH=3D 1 CATEGORIES=3D multimedia MASTER_SITES=3D http://cserv.sourceforge.net/old/ Index: pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/multimedia/camserv/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- pkg-plist 4 Mar 2004 06:29:01 -0000 1.3 +++ pkg-plist 5 Mar 2004 19:05:18 -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 Fri Mar 5 20:02:02 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; +=20 +- totmean =3D calculate_pic_mean( width, height, picbuf, 1, 0, 0,=20 +- width, height ); ++ totmean =3D camserv_get_pic_mean( width, height, picbuf, 1, 0, 0,=20 ++ width-1, height-1 ); + if( totmean < (256 / 2) - 10 || totmean > (256 / 2) + 10 ) { + newbright =3D fbttv_dev->brightness; + if( totmean > (256 / 2) + 10 ){ --- /dev/null Fri Mar 5 20:02:02 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 @@ +=20 +-data_DATA =3D camserv.cfg defpage.html ++data_DATA =3D camserv.cfg.dist defpage.html + EXTRA_DIST =3D camserv.cfg.in javascript.txt BUGS camserv.spec defpage.ht= ml +@@ -402,3 +402,3 @@ +=20 +-camserv.cfg: camserv.cfg.in ++camserv.cfg.dist: camserv.cfg.in + @sed -e s%CAMSERV_MODDIR%$(CAMSERV_MODDIR)%g < camserv.cfg.in > $@=20 --EY/WZ/HvNxOox07X-- --zjcmjzIkjQU2rmur Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFASM/KmArGtfDbn0QRAoTZAKCQiXTbxfZ5Wf+dQ/Zqsed8bRJqBACfeHpQ mm5L/4tpKZuGqTSpqKKSt+4= =1aMq -----END PGP SIGNATURE----- --zjcmjzIkjQU2rmur--