New camserv-0.5.0 broken in 4-stable?
Ulrich Spoerlein
q at uni.de
Tue Mar 9 05:32:10 PST 2004
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
--
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
-------------- next part --------------
? files/patch-ac
? files/patch-ad
Index: Makefile
===================================================================
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 @@
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 -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;
+
+- 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 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 @@
+
+-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 > $@
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20040305/d4f1bc0b/attachment.bin
More information about the freebsd-ports
mailing list