Attachment #41134 for bug #64482

View | Details | Raw Unified | Return to bug 64482
Collapse All | Expand All

Lines 6-31 Link Here

(-)Makefile (-18 / +26 lines)
6	#	6	#
7		7
8	PORTNAME= camserv	8	PORTNAME= camserv
9	PORTVERSION= 0.5.0	9	PORTVERSION= 0.5.1
10	PORTREVISION= 1
11	PORTEPOCH= 1	10	PORTEPOCH= 1
12	CATEGORIES= multimedia	11	CATEGORIES= multimedia
13	MASTER_SITES= http://cserv.sourceforge.net/old/	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
		13	MASTER_SITE_SUBDIR= cserv
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= q@uni.de
16	COMMENT= Camserv is a free program to do streaming video via the web	16	COMMENT= Camserv is a free program to do streaming video via the web
17		17
18	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \	18	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
19	Imlib2.2:${PORTSDIR}/graphics/imlib2 \	19	Imlib2.2:${PORTSDIR}/graphics/imlib2 \
20	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf	20	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
		21	freetype.9:${PORTSDIR}/print/freetype2 \
		22	ltdl.4:${PORTSDIR}/devel/libltdl
21		23
22	USE_X_LIB= yes	24	USE_X_LIB= yes
23	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
		26	USE_REINPLACE= yes
		27	USE_AUTOCONF_VER=253
24		28
		29	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
25	CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \	30	CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
26	-I${X11BASE}/include/gtk12 -I${X11BASE}/include/gdk-pixbuf-1.0 \	31	-I${X11BASE}/include/gtk12 -I${X11BASE}/include/gdk-pixbuf-1.0 \
27	-I${LOCALBASE}/include/glib12" \	32	-I${LOCALBASE}/include/glib12" \
28	LDFLAGS="-L${LOCALBASE}/lib"	33	LDFLAGS="-L${LOCALBASE}/lib"
		34	CONFIGURE_ARGS+=--enable-static=no
		35
		36	.if exists(/usr/include/dev/bktr/ioctl_bt848.h)
		37	post-patch:
		38	${REINPLACE_CMD} -e 's#machine/$ioctl_bt848.h$#dev/bktr/\1#' \
		39	${WRKSRC}/camserv/video_fbsd_bttv.c \
		40	${WRKSRC}/configure.in
		41	.endif
		42
		43	.if exists(/usr/include/machine/ioctl_bt848.h) \|\| \
		44	exists(/usr/include/dev/bktr/ioctl_bt848.h)
		45	PLIST_SUB+= BKTR=""
		46	.else
		47	PLIST_SUB+= BKTR="@comment "
		48	.endif
29		49
30	post-install:	50	post-install:
31	.if !defined(NOPORTDOCS)	51	.if !defined(NOPORTDOCS)
Lines 33-48 Link Here
33	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/javascript.txt ${DOCSDIR}	53	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/javascript.txt ${DOCSDIR}
34	.endif	54	.endif
35		55
36	.include <bsd.port.pre.mk>	56	.include <bsd.port.mk>
37
38	.if ${OSVERSION} >= 502104
39	BROKEN= "Does not compile"
40	.endif
41
42	.if ${OSVERSION} < 500000
43	ONLY_FOR_ARCHS= i386
44	.else
45	ONLY_FOR_ARCHS= alpha i386 ia64
46	.endif
47
48	.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	MD5 (camserv-0.5.0.tar.gz) = d578b54a011e8a4067573afc926ea033	1	MD5 (camserv-0.5.1.tar.gz) = ad6a1c9a5b522a4ee2189c66d7fbda72
2	SIZE (camserv-0.5.0.tar.gz) = 462974	2	SIZE (camserv-0.5.1.tar.gz) = 487645




bin/camserv
bin/relay
lib/camserv/libgdk_pixbuf_filter.a
lib/camserv/libgdk_pixbuf_filter.la
lib/camserv/libgdk_pixbuf_filter.so
lib/camserv/libgdk_pixbuf_filter.so.0
lib/camserv/libimlib2_filter.a
lib/camserv/libimlib2_filter.la
lib/camserv/libimlib2_filter.so
lib/camserv/libimlib2_filter.so.0
lib/camserv/libjpg_filter.a
lib/camserv/libjpg_filter.la
lib/camserv/libjpg_filter.so
lib/camserv/libjpg_filter.so.0
lib/camserv/librand_filter.a
lib/camserv/librand_filter.la
lib/camserv/librand_filter.so
lib/camserv/librand_filter.so.0
lib/camserv/libtext_filter.a
lib/camserv/libtext_filter.la
lib/camserv/libtext_filter.so
lib/camserv/libtext_filter.so.0
lib/camserv/libvideo_basic.a
lib/camserv/libvideo_basic.la
lib/camserv/libvideo_basic.so
lib/camserv/libvideo_basic.so.0
%%BKTR%%lib/camserv/libvideo_fbsd_bttv.la
%%BKTR%%lib/camserv/libvideo_fbsd_bttv.so
%%BKTR%%lib/camserv/libvideo_fbsd_bttv.so.0
lib/camserv/libvideo_fbsd_bttv.so.0
share/camserv/camserv.cfg.dist
share/camserv/defpage.html
%%PORTDOCS%%%%DOCSDIR%%/README

Lines 1-11 Link Here

(-)files/patch-Makefile.in (-11 lines)
1	--- camserv/Makefile.in.orig Sat Feb 7 00:23:59 2004
2	+++ camserv/Makefile.in Sat Feb 7 00:24:04 2004
3	@@ -85,7 +85,7 @@
4	datadir = @datadir@/camserv
5
6	CPPFLAGS = -DDATDIR=\"${datadir}\"
7	-LDFLAGS = -export-dynamic
8	+LDFLAGS = -export-dynamic @LDFLAGS@
9
10	bin_PROGRAMS = camserv
11	camserv_LDADD = $(LIBLTDL) $(top_srcdir)/common/libcommon.a




 #include <machine/ioctl_bt848.h>
 #include <machine/ioctl_meteor.h>
 #include <signal.h>
@@ -644,7 +644,7 @@
   if( !fbttv_dev->autobright || --fbttv_dev->autoleft > 0 )
     return 0;
 
   totmean = camserv_get_pic_mean( width, height, picbuf, 1, 0, 0, 
-				  width, height );
+				  width-1, height-1 );
   if( totmean < (256 / 2) - 10 || totmean > (256 / 2) + 10 ) {
     newbright = fbttv_dev->brightness;
     if( totmean > (256 / 2) + 10 ){




--- 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 ){




--- Makefile.in.orig	Mon Sep 16 00:28:04 2002
+++ Makefile.in	Fri Mar 19 19:35:48 2004
@@ -99,15 +99,14 @@
 install_sh = @install_sh@
 @VALID_VIDEO_TRUE@camserv_subdir = camserv
 
-SUBDIRS = libltdl \
-		common \
+SUBDIRS = common \
 		${camserv_subdir} \
 		include \
 		macros  \
 		relay
 
 
-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
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -463,7 +462,7 @@
 	uninstall-info-recursive uninstall-recursive
 
 
-camserv.cfg: camserv.cfg.in
+camserv.cfg.dist: camserv.cfg.in
 	@sed -e s%CAMSERV_MODDIR%$(CAMSERV_MODDIR)%g < camserv.cfg.in > $@ 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.




+++ camserv.cfg.in	Sat Feb  7 00:40:42 2004
@@ -2,42 +2,10 @@
 [video_basic]
 path		CAMSERV_MODDIR/libvideo_basic.so.0
 
-# video_v4l_bttv:  Example of a common BTTV module for video4linux.  
-# port 0 == TV, port 1 = Composite 1, port 2 = Composite 2

-# the value of each component.
-
-[video_v4l_bttv]
-path		CAMSERV_MODDIR/libvideo_v4l.so.0
-device_path	/dev/video0
-port		0
-mode		3

 # Channel Sets:
 # nabscst   1
 # cableirc  2
@@ -49,7 +17,7 @@
 # australia 8
 
 [video_fbsd_bttv]
-path		CAMSERV_MODDIR/libvideo_fbsd_bttv.so.0.0
+path		CAMSERV_MODDIR/libvideo_fbsd_bttv.so
 port		1
 width		320
 height		240
@@ -57,20 +25,8 @@
 #brightness	0
 #chroma		180

-channel         60
-
-[video_v4l_qcam]
-path		CAMSERV_MODDIR/libvideo_v4l.so.0
-device_path	/dev/video1
-port		0
-color		30000

+channel         3
 
 [jpg_filter]
 path            CAMSERV_MODDIR/libjpg_filter.so.0

Lines 1-11 Link Here

(-)files/patch-configure (-11 lines)
1	--- configure.orig Sat Feb 7 00:01:51 2004
2	+++ configure Sat Feb 7 00:17:32 2004
3	@@ -5465,7 +5465,7 @@
4	if test "$GDKPIXBUF_CONFIG"x != "x"; then
5	GDKPIXBUF_VERSION=`$GDKPIXBUF_CONFIG --version`
6	case "$GDKPIXBUF_VERSION" in
7	- 0.11.*) have_gdkpixbuf=yes
8	+ 0.22.*) have_gdkpixbuf=yes
9	GDKPIXBUF_CFLAGS=`$GDKPIXBUF_CONFIG --cflags`
10	GDKPIXBUF_LIBS=`$GDKPIXBUF_CONFIG --libs`
11	ac_safe=`echo "gdk-pixbuf/gdk-pixbuf.h" \| sed 'y%./+-%__p_%'`

Return to bug 64482

Lines 1-33 Link Here

(-)pkg-plist (-10 / +3 lines)
1	bin/camserv	1	bin/camserv
2	bin/relay	2	bin/relay
3	lib/camserv/libgdk_pixbuf_filter.a
4	lib/camserv/libgdk_pixbuf_filter.la	3	lib/camserv/libgdk_pixbuf_filter.la
5	lib/camserv/libgdk_pixbuf_filter.so	4	lib/camserv/libgdk_pixbuf_filter.so
6	lib/camserv/libgdk_pixbuf_filter.so.0	5	lib/camserv/libgdk_pixbuf_filter.so.0
7	lib/camserv/libimlib2_filter.a
8	lib/camserv/libimlib2_filter.la	6	lib/camserv/libimlib2_filter.la
9	lib/camserv/libimlib2_filter.so	7	lib/camserv/libimlib2_filter.so
10	lib/camserv/libimlib2_filter.so.0	8	lib/camserv/libimlib2_filter.so.0
11	lib/camserv/libjpg_filter.a
12	lib/camserv/libjpg_filter.la	9	lib/camserv/libjpg_filter.la
13	lib/camserv/libjpg_filter.so	10	lib/camserv/libjpg_filter.so
14	lib/camserv/libjpg_filter.so.0	11	lib/camserv/libjpg_filter.so.0
15	lib/camserv/librand_filter.a
16	lib/camserv/librand_filter.la	12	lib/camserv/librand_filter.la
17	lib/camserv/librand_filter.so	13	lib/camserv/librand_filter.so
18	lib/camserv/librand_filter.so.0	14	lib/camserv/librand_filter.so.0
19	lib/camserv/libtext_filter.a
20	lib/camserv/libtext_filter.la	15	lib/camserv/libtext_filter.la
21	lib/camserv/libtext_filter.so	16	lib/camserv/libtext_filter.so
22	lib/camserv/libtext_filter.so.0	17	lib/camserv/libtext_filter.so.0
23	lib/camserv/libvideo_basic.a
24	lib/camserv/libvideo_basic.la	18	lib/camserv/libvideo_basic.la
25	lib/camserv/libvideo_basic.so	19	lib/camserv/libvideo_basic.so
26	lib/camserv/libvideo_basic.so.0	20	lib/camserv/libvideo_basic.so.0
27	lib/camserv/libvideo_fbsd_bttv.a	21	%%BKTR%%lib/camserv/libvideo_fbsd_bttv.la
28	lib/camserv/libvideo_fbsd_bttv.la	22	%%BKTR%%lib/camserv/libvideo_fbsd_bttv.so
29	lib/camserv/libvideo_fbsd_bttv.so	23	%%BKTR%%lib/camserv/libvideo_fbsd_bttv.so.0
30	lib/camserv/libvideo_fbsd_bttv.so.0
31	share/camserv/camserv.cfg.dist	24	share/camserv/camserv.cfg.dist
32	share/camserv/defpage.html	25	share/camserv/defpage.html
33	%%PORTDOCS%%%%DOCSDIR%%/README	26	%%PORTDOCS%%%%DOCSDIR%%/README

Lines 8-10 Link Here

(-)files/patch-ab (+10 lines)
8	#include <machine/ioctl_bt848.h>	8	#include <machine/ioctl_bt848.h>
9	#include <machine/ioctl_meteor.h>	9	#include <machine/ioctl_meteor.h>
10	#include <signal.h>	10	#include <signal.h>
		11	@@ -644,7 +644,7 @@
		12	if( !fbttv_dev->autobright \|\| --fbttv_dev->autoleft > 0 )
		13	return 0;
		14
		15	totmean = camserv_get_pic_mean( width, height, picbuf, 1, 0, 0,
		16	- width, height );
		17	+ width-1, height-1 );
		18	if( totmean < (256 / 2) - 10 \|\| totmean > (256 / 2) + 10 ) {
		19	newbright = fbttv_dev->brightness;
		20	if( totmean > (256 / 2) + 10 ){

Lines 1-13 Link Here

(-)files/patch-ac (-13 lines)
1	--- camserv/video_fbsd_bttv.c.orig Fri Mar 5 19:22:31 2004
2	+++ camserv/video_fbsd_bttv.c Fri Mar 5 19:41:16 2004
3	@@ -644,8 +644,8 @@
4	if( !fbttv_dev->autobright \|\| --fbttv_dev->autoleft > 0 )
5	return 0;
6
7	- totmean = calculate_pic_mean( width, height, picbuf, 1, 0, 0,
8	- width, height );
9	+ totmean = camserv_get_pic_mean( width, height, picbuf, 1, 0, 0,
10	+ width-1, height-1 );
11	if( totmean < (256 / 2) - 10 \|\| totmean > (256 / 2) + 10 ) {
12	newbright = fbttv_dev->brightness;
13	if( totmean > (256 / 2) + 10 ){

Lines 1-12 Link Here

(-)files/patch-ad (-4 / +21 lines)
1	--- Makefile.in.orig Fri Mar 5 19:11:47 2004	1	--- Makefile.in.orig Mon Sep 16 00:28:04 2002
2	+++ Makefile.in Fri Mar 5 19:12:04 2004	2	+++ Makefile.in Fri Mar 19 19:35:48 2004
3	@@ -96,3 +96,3 @@	3	@@ -99,15 +99,14 @@
		4	install_sh = @install_sh@
		5	@VALID_VIDEO_TRUE@camserv_subdir = camserv
		6
		7	-SUBDIRS = libltdl \
		8	- common \
		9	+SUBDIRS = common \
		10	${camserv_subdir} \
		11	include \
		12	macros \
		13	relay
		14
4		15
5	-data_DATA = camserv.cfg defpage.html	16	-data_DATA = camserv.cfg defpage.html
6	+data_DATA = camserv.cfg.dist defpage.html	17	+data_DATA = camserv.cfg.dist defpage.html
7	EXTRA_DIST = camserv.cfg.in javascript.txt BUGS camserv.spec defpage.html	18	EXTRA_DIST = camserv.cfg.in javascript.txt BUGS camserv.spec defpage.html
8	@@ -402,3 +402,3 @@	19	subdir = .
		20	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
		21	@@ -463,7 +462,7 @@
		22	uninstall-info-recursive uninstall-recursive
		23
9		24
10	-camserv.cfg: camserv.cfg.in	25	-camserv.cfg: camserv.cfg.in
11	+camserv.cfg.dist: camserv.cfg.in	26	+camserv.cfg.dist: camserv.cfg.in
12	@sed -e s%CAMSERV_MODDIR%$(CAMSERV_MODDIR)%g < camserv.cfg.in > $@	27	@sed -e s%CAMSERV_MODDIR%$(CAMSERV_MODDIR)%g < camserv.cfg.in > $@
		28	# Tell versions [3.59,3.63) of GNU make to not export all variables.
		29	# Otherwise a system limit (for SysV at least) may be exceeded.

Lines 2-8 Link Here

(-)files/patch-camserv.cfg (-13 / +4 lines)
2	+++ camserv.cfg.in Sat Feb 7 00:40:42 2004	2	+++ camserv.cfg.in Sat Feb 7 00:40:42 2004
3	@@ -2,42 +2,10 @@	3	@@ -2,42 +2,10 @@
4	[video_basic]	4	[video_basic]
5	path CAMSERV_MODDIR/libvideo_basic.so	5	path CAMSERV_MODDIR/libvideo_basic.so.0
6		6
7	-# video_v4l_bttv: Example of a common BTTV module for video4linux.	7	-# video_v4l_bttv: Example of a common BTTV module for video4linux.
8	-# port 0 == TV, port 1 = Composite 1, port 2 = Composite 2	8	-# port 0 == TV, port 1 = Composite 1, port 2 = Composite 2
Lines 20-26 Link Here
20	-# the value of each component.	20	-# the value of each component.
21	-	21	-
22	-[video_v4l_bttv]	22	-[video_v4l_bttv]
23	-path CAMSERV_MODDIR/libvideo_v4l.so	23	-path CAMSERV_MODDIR/libvideo_v4l.so.0
24	-device_path /dev/video0	24	-device_path /dev/video0
25	-port 0	25	-port 0
26	-mode 3	26	-mode 3
Lines 44-58 Link Here
44	# Channel Sets:	44	# Channel Sets:
45	# nabscst 1	45	# nabscst 1
46	# cableirc 2	46	# cableirc 2
47	@@ -49,7 +17,7 @@
48	# australia 8
49
50	[video_fbsd_bttv]
51	-path CAMSERV_MODDIR/libvideo_fbsd_bttv.so.0.0
52	+path CAMSERV_MODDIR/libvideo_fbsd_bttv.so
53	port 1
54	width 320
55	height 240
56	@@ -57,20 +25,8 @@	47	@@ -57,20 +25,8 @@
57	#brightness 0	48	#brightness 0
58	#chroma 180	49	#chroma 180
Lines 61-67 Link Here
61	-channel 60	52	-channel 60
62	-	53	-
63	-[video_v4l_qcam]	54	-[video_v4l_qcam]
64	-path CAMSERV_MODDIR/libvideo_v4l.so	55	-path CAMSERV_MODDIR/libvideo_v4l.so.0
65	-device_path /dev/video1	56	-device_path /dev/video1
66	-port 0	57	-port 0
67	-color 30000	58	-color 30000
Lines 75-78 Link Here
75	+channel 3	66	+channel 3
76		67
77	[jpg_filter]	68	[jpg_filter]
78	path CAMSERV_MODDIR/libjpg_filter.so	69	path CAMSERV_MODDIR/libjpg_filter.so.0