ports/62457: [PATCH] multimedia/camserv: unbreak/update to 0.5.0
Ulrich Spoerlein
q at uni.de
Sat Feb 7 01:10:08 UTC 2004
>Number: 62457
>Category: ports
>Synopsis: [PATCH] multimedia/camserv: unbreak/update to 0.5.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 06 17:10:03 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Ulrich Spoerlein
>Release: FreeBSD 5.2.1-RC i386
>Organization:
>Environment:
System: FreeBSD roadrunner 5.2.1-RC FreeBSD 5.2.1-RC #6: Fri Feb 6 22:51:29 CET
>Description:
- Update to 0.5.0
- Unbreak
- Fix Imlib2 and gdk-pixbuf detection
Port maintainer (chein at freebsd.org) is cc'd.
- Remove files/patch-aa
- Add files/patch-configure, patch-camserv.cfg, patch-Makefile.in
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- camserv-0.5.0,1.patch begins here ---
? files/patch-Makefile.in
? files/patch-camserv.cfg
? files/patch-configure
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/camserv/Makefile,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile
--- Makefile 6 Feb 2004 08:28:44 -0000 1.6
+++ Makefile 7 Feb 2004 00:58:20 -0000
@@ -6,40 +6,30 @@
#
PORTNAME= camserv
-PORTVERSION= 0.42
+PORTVERSION= 0.5.0
+PORTEPOCH= 1
CATEGORIES= multimedia
MASTER_SITES= http://cserv.sourceforge.net/old/
MAINTAINER= chein at freebsd.org
COMMENT= Camserv is a free program to do streaming video via the web
-LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
-
-# Things that should get fixed
-#
-# imlib2 still needs to be ported
-# http://www.us.rasterman.com/files/imlib2-0.0.5.tar.gz
-# imlib2:${PORTSDIR}/graphics/imlib2
-#
-# gtk12 has broken includes ...
-# should look something like this :
-# include <gtk12/gdk/gdkprivate.h>
-# instead of <gdk/gdkprivate.h>
+LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
+ Imlib2.2:${PORTSDIR}/graphics/imlib2 \
+ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+USE_X_LIB= yes
GNU_CONFIGURE= yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502000
-BROKEN= "Broken pkg-plist"
-.endif
+CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
+ -I${X11BASE}/include/gtk12 -I${X11BASE}/include/gdk-pixbuf-1.0 \
+ -I${LOCALBASE}/include/glib12" \
+ LDFLAGS="-L${LOCALBASE}/lib"
post-install:
-
.if !defined(NOPORTDOCS)
- @${MKDIR} ${PREFIX}/share/doc/camserv
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/camserv
- ${INSTALL_DATA} ${WRKSRC}/javascript.txt ${PREFIX}/share/doc/camserv
+ @${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/javascript.txt ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/multimedia/camserv/distinfo,v
retrieving revision 1.1
diff -u -u -r1.1 distinfo
--- distinfo 21 Aug 2000 10:29:09 -0000 1.1
+++ distinfo 7 Feb 2004 00:58:20 -0000
@@ -1 +1,2 @@
-MD5 (camserv-0.42.tar.gz) = 6afb506499e75d14ef0ba5b4ada305a9
+MD5 (camserv-0.5.0.tar.gz) = d578b54a011e8a4067573afc926ea033
+SIZE (camserv-0.5.0.tar.gz) = 462974
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/multimedia/camserv/pkg-descr,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-descr
--- pkg-descr 21 Aug 2000 10:29:09 -0000 1.1
+++ pkg-descr 7 Feb 2004 00:58:20 -0000
@@ -4,7 +4,7 @@
the multi-part JPEGs, and therefore a special javascript page must be setup.
One is included in the distribution as an example.
-Currently, the only supported BSD device is the bttv driver.
+Currently, the only supported BSD device is the bktr driver.
Both tunable modes and camera inputs are supported.
WWW: http://cserv.sourceforge.net/
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/multimedia/camserv/pkg-plist,v
retrieving revision 1.2
diff -u -u -r1.2 pkg-plist
--- pkg-plist 10 Mar 2001 05:48:01 -0000 1.2
+++ pkg-plist 7 Feb 2004 00:58:20 -0000
@@ -1,27 +1,35 @@
bin/camserv
-bin/ccamcmd
bin/relay
-lib/libjpg_filter.a
-lib/libjpg_filter.la
-lib/libjpg_filter.so
-lib/libjpg_filter.so.0
-lib/librand_filter.a
-lib/librand_filter.la
-lib/librand_filter.so
-lib/librand_filter.so.0
-lib/libtext_filter.a
-lib/libtext_filter.la
-lib/libtext_filter.so
-lib/libtext_filter.so.0
-lib/libvideo_basic.a
-lib/libvideo_basic.la
-lib/libvideo_basic.so
-lib/libvideo_basic.so.0
-lib/libvideo_fbsd_bttv.a
-lib/libvideo_fbsd_bttv.la
-lib/libvideo_fbsd_bttv.so
-lib/libvideo_fbsd_bttv.so.0
-share/camserv.cfg
-share/doc/camserv/README
-share/doc/camserv/javascript.txt
- at dirrm share/doc/camserv
+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
+lib/camserv/libvideo_fbsd_bttv.a
+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/defpage.html
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/javascript.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/multimedia/camserv/files/patch-aa,v
retrieving revision 1.1
diff -u -u -r1.1 patch-aa
--- files/patch-aa 21 Aug 2000 10:29:09 -0000 1.1
+++ files/patch-aa 7 Feb 2004 00:58:20 -0000
@@ -1,178 +0,0 @@
-*** camserv.cfg.orig Sun Feb 13 18:07:06 2000
---- camserv.cfg Sat Aug 19 02:51:13 2000
-***************
-*** 1,45 ****
- # video_basic: The 'basic' color-changing video module.
- [video_basic]
- path /usr/local/lib/libvideo_basic.so
-
-- # video_v4l_bttv: Example of a common BTTV module for video4linux.
-- # port 0 == TV, port 1 = Composite 1, port 2 = Composite 2
-- # frequency == is the channel frequency for the TV
-- # autobright == 0 turns off autobrightness adjusting, otherwise it adjusts
-- # the brightness of the picture every 'autobright' frames.
-- # brightmean == The mean pixel value that is the 'goal' of the autobright.
-- # (0->255)
-- # brightx1->y2 == (x1,y1) top left coords, and (x2,y2) bottom right coords
-- # of a rectangle of which to take the average pixel value.
-- # this is then used in calculating the mean to adjust the
-- # brightness of the image.
-- # mode == the video norm to use: 0 == PAL, 1 == NTSC, 2 == SECAM, 3 == AUTO
-- # color,hue,contrast,brightness,whiteness = 0->60000, representing
-- # the value of each component.
--
-- [video_v4l_bttv]
-- path /usr/local/lib/libvideo_v4l.so
-- device_path /dev/video0
-- port 0
-- mode 3
-- frequency 74.43
-- color 30000
-- hue 30000
-- contrast 30000
-- brightness 30000
-- whiteness 30000
-- autobright 1
-- brightmean 128
-- brightx1 0
-- brighty1 320
-- brightx2 0
-- brighty2 240
--
- # FreeBSD BTTV driver:
- # port 0 = Video
- # 1 = Tuner
- # Channel Sets:
- # nabscst 1
- # cableirc 2
- # cablehrc 3
- # weurope 4
---- 1,14 ----
- # video_basic: The 'basic' color-changing video module.
- [video_basic]
- path /usr/local/lib/libvideo_basic.so
-
- # FreeBSD BTTV driver:
- # port 0 = Video
- # 1 = Tuner
-+ # 2 = S-Video
-+ #
- # Channel Sets:
- # nabscst 1
- # cableirc 2
- # cablehrc 3
- # weurope 4
-***************
-*** 47,78 ****
- # jpncable 6
- # xussr 7
- # australia 8
-
- [video_fbsd_bttv]
-! path /usr/local/lib/libvideo_fbsd_bttv.so.0.0
- port 1
- width 320
- height 240
- autobright 100
- #brightness 0
- #chroma 180
- #contrast 1000
-! channelset 2
-! channel 60
-!
-! [video_v4l_qcam]
-! path /usr/local/lib/libvideo_v4l.so
-! device_path /dev/video1
-! port 0
-! color 30000
-! hue 30000
-! contrast 30000
-! brightness 30000
-! whiteness 30000
-! autobright 0
-!
-
- [jpg_filter]
- path /usr/local/lib/libjpg_filter.so
- quality 30
-
---- 16,35 ----
- # jpncable 6
- # xussr 7
- # australia 8
-
- [video_fbsd_bttv]
-! path /usr/local/lib/libvideo_fbsd_bttv.so
- port 1
- width 320
- height 240
- autobright 100
- #brightness 0
- #chroma 180
- #contrast 1000
-! channelset 1
-! channel 3
-
- [jpg_filter]
- path /usr/local/lib/libjpg_filter.so
- quality 30
-
-***************
-*** 147,157 ****
- # [video] - This section is devoted to all things dealing with the pictures
- # taken by the input video module. These are general things which
- # should be used by all video modules.
-
- [video]
-! video_section video_v4l_bttv
- width 320
- height 240
- maxfps 0
- memhack 1
-
---- 104,114 ----
- # [video] - This section is devoted to all things dealing with the pictures
- # taken by the input video module. These are general things which
- # should be used by all video modules.
-
- [video]
-! video_section video_fbsd_bttv
- width 320
- height 240
- maxfps 0
- memhack 1
-
-*** configure.orig Sun Feb 13 18:33:16 2000
---- configure Sat Aug 19 02:48:27 2000
-***************
-*** 2181,2193 ****
- echo "$ac_t""no" 1>&6
- fi
-
- echo $ac_n "checking for gdk_pixbuf""... $ac_c" 1>&6
- echo "configure:2186: checking for gdk_pixbuf" >&5
-! GDK_PIXBUF_CFLAGS=`$gnomeconfig gdk_pixbuf --cflags`
-! GDK_PIXBUF_LDFLAGS=`$gnomeconfig gdk_pixbuf --libs`
-!
-
- if test "_$GDK_PIXBUF_CFLAGS" != _; then
- HAVE_GDK_PIXBUF_TRUE=
- HAVE_GDK_PIXBUF_FALSE='#'
- else
---- 2181,2196 ----
- echo "$ac_t""no" 1>&6
- fi
-
- echo $ac_n "checking for gdk_pixbuf""... $ac_c" 1>&6
- echo "configure:2186: checking for gdk_pixbuf" >&5
-! echo "gdk_pixbuf seems to be broken in FreeBSD"
-! echo "not configuring GDK Pixbuf filter in this build"
-! # GDK_PIXBUF_CFLAGS=`$gnomeconfig gdk_pixbuf --cflags`
-! # GDK_PIXBUF_LDFLAGS=`$gnomeconfig gdk_pixbuf --libs`
-! GDK_PIXBUF_CFLAGS=
-! GDK_PIXBUF_LDFLAGS=
-
- if test "_$GDK_PIXBUF_CFLAGS" != _; then
- HAVE_GDK_PIXBUF_TRUE=
- HAVE_GDK_PIXBUF_FALSE='#'
- else
--- camserv-0.5.0,1.patch ends here ---
--- /dev/null Sat Feb 7 01:58:20 2004
+++ files/patch-configure Sat Feb 7 00:17:52 2004
@@ -0,0 +1,11 @@
+--- configure.orig Sat Feb 7 00:01:51 2004
++++ configure Sat Feb 7 00:17:32 2004
+@@ -5465,7 +5465,7 @@
+ if test "$GDKPIXBUF_CONFIG"x != "x"; then
+ GDKPIXBUF_VERSION=`$GDKPIXBUF_CONFIG --version`
+ case "$GDKPIXBUF_VERSION" in
+- 0.11.*) have_gdkpixbuf=yes
++ 0.22.*) have_gdkpixbuf=yes
+ GDKPIXBUF_CFLAGS=`$GDKPIXBUF_CONFIG --cflags`
+ GDKPIXBUF_LIBS=`$GDKPIXBUF_CONFIG --libs`
+ ac_safe=`echo "gdk-pixbuf/gdk-pixbuf.h" | sed 'y%./+-%__p_%'`
--- /dev/null Sat Feb 7 01:58:20 2004
+++ files/patch-camserv.cfg Sat Feb 7 00:41:05 2004
@@ -0,0 +1,78 @@
+--- camserv.cfg.in.orig Fri Mar 8 02:33:16 2002
++++ camserv.cfg.in Sat Feb 7 00:40:42 2004
+@@ -2,42 +2,10 @@
+ [video_basic]
+ path CAMSERV_MODDIR/libvideo_basic.so
+
+-# video_v4l_bttv: Example of a common BTTV module for video4linux.
+-# port 0 == TV, port 1 = Composite 1, port 2 = Composite 2
+-# frequency == is the channel frequency for the TV
+-# autobright == 0 turns off autobrightness adjusting, otherwise it adjusts
+-# the brightness of the picture every 'autobright' frames.
+-# brightmean == The mean pixel value that is the 'goal' of the autobright.
+-# (0->255)
+-# brightx1->y2 == (x1,y1) top left coords, and (x2,y2) bottom right coords
+-# of a rectangle of which to take the average pixel value.
+-# this is then used in calculating the mean to adjust the
+-# brightness of the image.
+-# mode == the video norm to use: 0 == PAL, 1 == NTSC, 2 == SECAM, 3 == AUTO
+-# color,hue,contrast,brightness,whiteness = 0->60000, representing
+-# the value of each component.
+-
+-[video_v4l_bttv]
+-path CAMSERV_MODDIR/libvideo_v4l.so
+-device_path /dev/video0
+-port 0
+-mode 3
+-#frequency 74.43
+-color 30000
+-hue 30000
+-contrast 30000
+-brightness 30000
+-whiteness 30000
+-autobright 1
+-brightmean 128
+-brightx1 0
+-brighty1 320
+-brightx2 0
+-brighty2 240
+-
+ # FreeBSD BTTV driver:
+ # port 0 = Video
+ # 1 = Tuner
++# 2 = S-Video
+ # 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
+ #contrast 1000
+-channelset 2
+-channel 60
+-
+-[video_v4l_qcam]
+-path CAMSERV_MODDIR/libvideo_v4l.so
+-device_path /dev/video1
+-port 0
+-color 30000
+-hue 30000
+-contrast 30000
+-brightness 30000
+-whiteness 30000
+-autobright 0
+-
++channelset 1
++channel 3
+
+ [jpg_filter]
+ path CAMSERV_MODDIR/libjpg_filter.so
--- /dev/null Sat Feb 7 02:00:00 2004
+++ files/patch-Makefile.in Sat Feb 7 00:35:18 2004
@@ -0,0 +1,11 @@
+--- camserv/Makefile.in.orig Sat Feb 7 00:23:59 2004
++++ camserv/Makefile.in Sat Feb 7 00:24:04 2004
+@@ -85,7 +85,7 @@
+ datadir = @datadir@/camserv
+
+ CPPFLAGS = -DDATDIR=\"${datadir}\"
+-LDFLAGS = -export-dynamic
++LDFLAGS = -export-dynamic @LDFLAGS@
+
+ bin_PROGRAMS = camserv
+ camserv_LDADD = $(LIBLTDL) $(top_srcdir)/common/libcommon.a
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list