ports/63985: [PATCH] multimedia/camserv: Unbreak the autobright option

[Ulrich Spoerlein]

>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: