New camserv-0.5.0 broken in 4-stable?

[Ulrich Spoerlein]

On Thu, 04.03.2004 at 15:02:08 -0600, Mark Linimon wrote:
> > Just updated to camserv-0.5.0 and when trying to use it with
> > a bktr card I get the following:
> > /usr/libexec/ld-elf.so.1: /usr/local/lib/camserv/libvideo_fbsd_bttv.so: Undefined symbol "calculate_pic_mean"
> > What's (not) happening here?
> > It worked fine previously and fxtv works.
> Hmm, I merely tested the compile and diffed the distfiles.
> Running 'camserv' doesn't seem to produce this problem.
> (I run fxtv on that machine, although honestly, I did not
> test the binary before the commit).
> 
> I have Cc:ed the submitter of the PR that updated to 0.5.0
> to ask if the submitter can confirm this?
> 
> I have 4.9-PRERELEASE on the machine that did the compile
> testing, if that matters.

I already sent an Email two days ago, but it looks like it got stuck
somewhere. Sorry if this appears twice.

I took a look at the source code and found out, that 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.

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 > $@ 

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 --------------
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/20040307/37cc4f45/attachment.bin