View | Details | Raw Unified | Return to bug 62457 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-23 / +13 lines)
Lines 6-45 Link Here
6
#
6
#
7
7
8
PORTNAME=	camserv
8
PORTNAME=	camserv
9
PORTVERSION=	0.42
9
PORTVERSION=	0.5.0
10
PORTEPOCH=	1
10
CATEGORIES=	multimedia
11
CATEGORIES=	multimedia
11
MASTER_SITES=	http://cserv.sourceforge.net/old/
12
MASTER_SITES=	http://cserv.sourceforge.net/old/
12
13
13
MAINTAINER=	chein@freebsd.org
14
MAINTAINER=	chein@freebsd.org
14
COMMENT=	Camserv is a free program to do streaming video via the web
15
COMMENT=	Camserv is a free program to do streaming video via the web
15
16
16
LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
17
LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
17
18
		Imlib2.2:${PORTSDIR}/graphics/imlib2 \
18
# Things that should get fixed
19
		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
19
#
20
# imlib2 still needs to be ported
21
# http://www.us.rasterman.com/files/imlib2-0.0.5.tar.gz
22
# imlib2:${PORTSDIR}/graphics/imlib2
23
#
24
# gtk12 has broken includes ...
25
# should look something like this :
26
# include <gtk12/gdk/gdkprivate.h>
27
# instead of <gdk/gdkprivate.h>
28
20
21
USE_X_LIB=	yes
29
GNU_CONFIGURE=	yes
22
GNU_CONFIGURE=	yes
30
23
31
.include <bsd.port.pre.mk>
24
CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
32
25
		-I${X11BASE}/include/gtk12 -I${X11BASE}/include/gdk-pixbuf-1.0 \
33
.if ${OSVERSION} >= 502000
26
		-I${LOCALBASE}/include/glib12" \
34
BROKEN=		"Broken pkg-plist"
27
		LDFLAGS="-L${LOCALBASE}/lib"
35
.endif
36
28
37
post-install:
29
post-install:
38
39
.if !defined(NOPORTDOCS)
30
.if !defined(NOPORTDOCS)
40
	@${MKDIR} ${PREFIX}/share/doc/camserv
31
	@${MKDIR} ${DOCSDIR}
41
	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/camserv
32
	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/javascript.txt ${DOCSDIR}
42
	${INSTALL_DATA} ${WRKSRC}/javascript.txt ${PREFIX}/share/doc/camserv
43
.endif
33
.endif
44
34
45
.include <bsd.port.post.mk>
35
.include <bsd.port.mk>
(-)distinfo (-1 / +2 lines)
Line 1 Link Here
1
MD5 (camserv-0.42.tar.gz) = 6afb506499e75d14ef0ba5b4ada305a9
1
MD5 (camserv-0.5.0.tar.gz) = d578b54a011e8a4067573afc926ea033
2
SIZE (camserv-0.5.0.tar.gz) = 462974
(-)pkg-descr (-1 / +1 lines)
Lines 4-10 Link Here
4
the multi-part JPEGs, and therefore a special javascript page must be setup.
4
the multi-part JPEGs, and therefore a special javascript page must be setup.
5
One is included in the distribution as an example. 
5
One is included in the distribution as an example. 
6
6
7
Currently, the only supported BSD device is the bttv driver.
7
Currently, the only supported BSD device is the bktr driver.
8
Both tunable modes and camera inputs are supported. 
8
Both tunable modes and camera inputs are supported. 
9
9
10
WWW: http://cserv.sourceforge.net/
10
WWW: http://cserv.sourceforge.net/
(-)pkg-plist (-25 / +33 lines)
Lines 1-27 Link Here
1
bin/camserv
1
bin/camserv
2
bin/ccamcmd
3
bin/relay
2
bin/relay
4
lib/libjpg_filter.a
3
lib/camserv/libgdk_pixbuf_filter.a
5
lib/libjpg_filter.la
4
lib/camserv/libgdk_pixbuf_filter.la
6
lib/libjpg_filter.so
5
lib/camserv/libgdk_pixbuf_filter.so
7
lib/libjpg_filter.so.0
6
lib/camserv/libgdk_pixbuf_filter.so.0
8
lib/librand_filter.a
7
lib/camserv/libimlib2_filter.a
9
lib/librand_filter.la
8
lib/camserv/libimlib2_filter.la
10
lib/librand_filter.so
9
lib/camserv/libimlib2_filter.so
11
lib/librand_filter.so.0
10
lib/camserv/libimlib2_filter.so.0
12
lib/libtext_filter.a
11
lib/camserv/libjpg_filter.a
13
lib/libtext_filter.la
12
lib/camserv/libjpg_filter.la
14
lib/libtext_filter.so
13
lib/camserv/libjpg_filter.so
15
lib/libtext_filter.so.0
14
lib/camserv/libjpg_filter.so.0
16
lib/libvideo_basic.a
15
lib/camserv/librand_filter.a
17
lib/libvideo_basic.la
16
lib/camserv/librand_filter.la
18
lib/libvideo_basic.so
17
lib/camserv/librand_filter.so
19
lib/libvideo_basic.so.0
18
lib/camserv/librand_filter.so.0
20
lib/libvideo_fbsd_bttv.a
19
lib/camserv/libtext_filter.a
21
lib/libvideo_fbsd_bttv.la
20
lib/camserv/libtext_filter.la
22
lib/libvideo_fbsd_bttv.so
21
lib/camserv/libtext_filter.so
23
lib/libvideo_fbsd_bttv.so.0
22
lib/camserv/libtext_filter.so.0
24
share/camserv.cfg
23
lib/camserv/libvideo_basic.a
25
share/doc/camserv/README
24
lib/camserv/libvideo_basic.la
26
share/doc/camserv/javascript.txt
25
lib/camserv/libvideo_basic.so
27
@dirrm share/doc/camserv
26
lib/camserv/libvideo_basic.so.0
27
lib/camserv/libvideo_fbsd_bttv.a
28
lib/camserv/libvideo_fbsd_bttv.la
29
lib/camserv/libvideo_fbsd_bttv.so
30
lib/camserv/libvideo_fbsd_bttv.so.0
31
share/camserv/camserv.cfg
32
share/camserv/defpage.html
33
%%PORTDOCS%%%%DOCSDIR%%/README
34
%%PORTDOCS%%%%DOCSDIR%%/javascript.txt
35
%%PORTDOCS%%@dirrm %%DOCSDIR%%
(-)files/patch-aa (-178 lines)
Lines 1-178 Link Here
1
*** camserv.cfg.orig	Sun Feb 13 18:07:06 2000
2
--- camserv.cfg	Sat Aug 19 02:51:13 2000
3
***************
4
*** 1,45 ****
5
  # video_basic: The 'basic' color-changing video module.
6
  [video_basic]
7
  path		/usr/local/lib/libvideo_basic.so
8
  
9
- # video_v4l_bttv:  Example of a common BTTV module for video4linux.  
10
- # port 0 == TV, port 1 = Composite 1, port 2 = Composite 2
11
- # frequency == is the channel frequency for the TV
12
- # autobright == 0 turns off autobrightness adjusting, otherwise it adjusts
13
- #               the brightness of the picture every 'autobright' frames.
14
- # brightmean == The mean pixel value that is the 'goal' of the autobright.
15
- #               (0->255)
16
- # brightx1->y2 == (x1,y1) top left coords, and (x2,y2) bottom right coords
17
- #                 of a rectangle of which to take the average pixel value.
18
- #                 this is then used in calculating the mean to adjust the
19
- #                 brightness of the image.
20
- # mode == the video norm to use:  0 == PAL, 1 == NTSC, 2 == SECAM, 3 == AUTO
21
- # color,hue,contrast,brightness,whiteness = 0->60000, representing
22
- # the value of each component.
23
- 
24
- [video_v4l_bttv]
25
- path		/usr/local/lib/libvideo_v4l.so
26
- device_path	/dev/video0
27
- port		0
28
- mode		3
29
- frequency	74.43
30
- color		30000
31
- hue		30000
32
- contrast	30000
33
- brightness	30000
34
- whiteness	30000
35
- autobright	1
36
- brightmean      128
37
- brightx1	0
38
- brighty1	320
39
- brightx2	0
40
- brighty2	240
41
- 
42
  # FreeBSD BTTV driver:
43
  # port 0  = Video
44
  #      1  = Tuner
45
  # Channel Sets:
46
  # nabscst   1
47
  # cableirc  2
48
  # cablehrc  3
49
  # weurope   4
50
--- 1,14 ----
51
  # video_basic: The 'basic' color-changing video module.
52
  [video_basic]
53
  path		/usr/local/lib/libvideo_basic.so
54
  
55
  # FreeBSD BTTV driver:
56
  # port 0  = Video
57
  #      1  = Tuner
58
+ #      2  = S-Video
59
+ #
60
  # Channel Sets:
61
  # nabscst   1
62
  # cableirc  2
63
  # cablehrc  3
64
  # weurope   4
65
***************
66
*** 47,78 ****
67
  # jpncable  6
68
  # xussr     7
69
  # australia 8
70
  
71
  [video_fbsd_bttv]
72
! path		/usr/local/lib/libvideo_fbsd_bttv.so.0.0
73
  port		1
74
  width		320
75
  height		240
76
  autobright	100
77
  #brightness	0
78
  #chroma		180
79
  #contrast	1000
80
! channelset      2
81
! channel         60
82
! 
83
! [video_v4l_qcam]
84
! path		/usr/local/lib/libvideo_v4l.so
85
! device_path	/dev/video1
86
! port		0
87
! color		30000
88
! hue		30000
89
! contrast	30000
90
! brightness	30000
91
! whiteness	30000
92
! autobright	0
93
! 
94
  
95
  [jpg_filter]
96
  path            /usr/local/lib/libjpg_filter.so
97
  quality		30
98
  
99
--- 16,35 ----
100
  # jpncable  6
101
  # xussr     7
102
  # australia 8
103
  
104
  [video_fbsd_bttv]
105
! path		/usr/local/lib/libvideo_fbsd_bttv.so
106
  port		1
107
  width		320
108
  height		240
109
  autobright	100
110
  #brightness	0
111
  #chroma		180
112
  #contrast	1000
113
! channelset      1
114
! channel         3
115
  
116
  [jpg_filter]
117
  path            /usr/local/lib/libjpg_filter.so
118
  quality		30
119
  
120
***************
121
*** 147,157 ****
122
  # [video] - This section is devoted to all things dealing with the pictures
123
  #           taken by the input video module.  These are general things which
124
  #           should be used by all video modules.
125
  
126
  [video]
127
! video_section		video_v4l_bttv
128
  width			320
129
  height			240
130
  maxfps                  0
131
  memhack			1
132
  
133
--- 104,114 ----
134
  # [video] - This section is devoted to all things dealing with the pictures
135
  #           taken by the input video module.  These are general things which
136
  #           should be used by all video modules.
137
  
138
  [video]
139
! video_section		video_fbsd_bttv
140
  width			320
141
  height			240
142
  maxfps                  0
143
  memhack			1
144
  
145
*** configure.orig	Sun Feb 13 18:33:16 2000
146
--- configure	Sat Aug 19 02:48:27 2000
147
***************
148
*** 2181,2193 ****
149
    echo "$ac_t""no" 1>&6
150
  fi
151
  
152
  echo $ac_n "checking for gdk_pixbuf""... $ac_c" 1>&6
153
  echo "configure:2186: checking for gdk_pixbuf" >&5
154
! GDK_PIXBUF_CFLAGS=`$gnomeconfig gdk_pixbuf --cflags`
155
! GDK_PIXBUF_LDFLAGS=`$gnomeconfig gdk_pixbuf --libs`
156
! 
157
  
158
  if test "_$GDK_PIXBUF_CFLAGS" != _; then
159
    HAVE_GDK_PIXBUF_TRUE=
160
    HAVE_GDK_PIXBUF_FALSE='#'
161
  else
162
--- 2181,2196 ----
163
    echo "$ac_t""no" 1>&6
164
  fi
165
  
166
  echo $ac_n "checking for gdk_pixbuf""... $ac_c" 1>&6
167
  echo "configure:2186: checking for gdk_pixbuf" >&5
168
! echo "gdk_pixbuf seems to be broken in FreeBSD"
169
! echo "not configuring GDK Pixbuf filter in this build"
170
! # GDK_PIXBUF_CFLAGS=`$gnomeconfig gdk_pixbuf --cflags`
171
! # GDK_PIXBUF_LDFLAGS=`$gnomeconfig gdk_pixbuf --libs`
172
! GDK_PIXBUF_CFLAGS=
173
! GDK_PIXBUF_LDFLAGS=
174
  
175
  if test "_$GDK_PIXBUF_CFLAGS" != _; then
176
    HAVE_GDK_PIXBUF_TRUE=
177
    HAVE_GDK_PIXBUF_FALSE='#'
178
  else

Return to bug 62457