Attachment 41134 Details for Bug 64482 – camserv-0.5.1,1.patch

[patch] camserv-0.5.1,1.patch

camserv-0.5.1,1.patch (text/plain), 9.85 KB, created by Ulrich Spoerlein on 2004-03-19 20:50:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ulrich Spoerlein

Created: 2004-03-19 20:50:15 UTC

Size: 9.85 KB

patch

obsolete

>? patch
>? files/patch-configure.in
>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/camserv/Makefile,v
>retrieving revision 1.10
>diff -u -u -r1.10 Makefile
>--- Makefile	19 Mar 2004 12:10:33 -0000	1.10
>+++ Makefile	19 Mar 2004 20:36:52 -0000
>@@ -6,26 +6,46 @@
> #
> 
> PORTNAME=	camserv
>-PORTVERSION=	0.5.0
>-PORTREVISION=	1
>+PORTVERSION=	0.5.1
> PORTEPOCH=	1
> CATEGORIES=	multimedia
>-MASTER_SITES=	http://cserv.sourceforge.net/old/
>+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>+MASTER_SITE_SUBDIR=	cserv
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	q@uni.de
> COMMENT=	Camserv is a free program to do streaming video via the web
> 
> LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
> 		Imlib2.2:${PORTSDIR}/graphics/imlib2 \
>-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
>+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
>+		freetype.9:${PORTSDIR}/print/freetype2 \
>+		ltdl.4:${PORTSDIR}/devel/libltdl
> 
> USE_X_LIB=	yes
> GNU_CONFIGURE=	yes
>+USE_REINPLACE=	yes
>+USE_AUTOCONF_VER=253
> 
>+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
> 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"
>+CONFIGURE_ARGS+=--enable-static=no
>+
>+.if exists(/usr/include/dev/bktr/ioctl_bt848.h)
>+post-patch:
>+	${REINPLACE_CMD} -e 's#machine/$ioctl_bt848.h$#dev/bktr/\1#' \
>+		${WRKSRC}/camserv/video_fbsd_bttv.c \
>+		${WRKSRC}/configure.in
>+.endif
>+
>+.if exists(/usr/include/machine/ioctl_bt848.h) || \
>+	exists(/usr/include/dev/bktr/ioctl_bt848.h)
>+PLIST_SUB+=	BKTR=""
>+.else
>+PLIST_SUB+=	BKTR="@comment "
>+.endif
> 
> post-install:
> .if !defined(NOPORTDOCS)
>@@ -33,16 +53,4 @@
> 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/javascript.txt ${DOCSDIR}
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${OSVERSION} >= 502104
>-BROKEN=		"Does not compile"
>-.endif
>-  
>-.if ${OSVERSION} < 500000
>-ONLY_FOR_ARCHS=	i386
>-.else
>-ONLY_FOR_ARCHS=	alpha i386 ia64
>-.endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/camserv/distinfo,v
>retrieving revision 1.2
>diff -u -u -r1.2 distinfo
>--- distinfo	4 Mar 2004 06:29:01 -0000	1.2
>+++ distinfo	19 Mar 2004 20:36:52 -0000
>@@ -1,2 +1,2 @@
>-MD5 (camserv-0.5.0.tar.gz) = d578b54a011e8a4067573afc926ea033
>-SIZE (camserv-0.5.0.tar.gz) = 462974
>+MD5 (camserv-0.5.1.tar.gz) = ad6a1c9a5b522a4ee2189c66d7fbda72
>+SIZE (camserv-0.5.1.tar.gz) = 487645
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/camserv/pkg-plist,v
>retrieving revision 1.4
>diff -u -u -r1.4 pkg-plist
>--- pkg-plist	9 Mar 2004 20:15:22 -0000	1.4
>+++ pkg-plist	19 Mar 2004 20:36:52 -0000
>@@ -1,33 +1,26 @@
> 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
>-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
>+%%BKTR%%lib/camserv/libvideo_fbsd_bttv.la
>+%%BKTR%%lib/camserv/libvideo_fbsd_bttv.so
>+%%BKTR%%lib/camserv/libvideo_fbsd_bttv.so.0
> share/camserv/camserv.cfg.dist
> share/camserv/defpage.html
> %%PORTDOCS%%%%DOCSDIR%%/README
>Index: files/patch-Makefile.in
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/camserv/files/patch-Makefile.in,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-Makefile.in
>--- files/patch-Makefile.in	4 Mar 2004 06:29:01 -0000	1.1
>+++ files/patch-Makefile.in	19 Mar 2004 20:36:52 -0000
>@@ -1,11 +0,0 @@
>---- 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
>Index: files/patch-ab
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/camserv/files/patch-ab,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-ab
>--- files/patch-ab	14 May 2003 07:50:04 -0000	1.1
>+++ files/patch-ab	19 Mar 2004 20:36:52 -0000
>@@ -8,3 +8,13 @@
>  #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 ){
>Index: files/patch-ac
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/camserv/files/patch-ac,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-ac
>--- files/patch-ac	9 Mar 2004 20:15:21 -0000	1.1
>+++ files/patch-ac	19 Mar 2004 20:36:52 -0000
>@@ -1,13 +0,0 @@
>---- 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 ){
>Index: files/patch-ad
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/camserv/files/patch-ad,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-ad
>--- files/patch-ad	9 Mar 2004 20:15:21 -0000	1.1
>+++ files/patch-ad	19 Mar 2004 20:36:52 -0000
>@@ -1,12 +1,29 @@
>---- Makefile.in.orig	Fri Mar  5 19:11:47 2004
>-+++ Makefile.in	Fri Mar  5 19:12:04 2004
>-@@ -96,3 +96,3 @@
>+--- 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
>-@@ -402,3 +402,3 @@
>+ 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.
>Index: files/patch-camserv.cfg
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/camserv/files/patch-camserv.cfg,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-camserv.cfg
>--- files/patch-camserv.cfg	4 Mar 2004 06:29:01 -0000	1.1
>+++ files/patch-camserv.cfg	19 Mar 2004 20:36:52 -0000
>@@ -2,7 +2,7 @@
> +++ camserv.cfg.in	Sat Feb  7 00:40:42 2004
> @@ -2,42 +2,10 @@
>  [video_basic]
>- path		CAMSERV_MODDIR/libvideo_basic.so
>+ 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
>@@ -20,7 +20,7 @@
> -# the value of each component.
> -
> -[video_v4l_bttv]
>--path		CAMSERV_MODDIR/libvideo_v4l.so
>+-path		CAMSERV_MODDIR/libvideo_v4l.so.0
> -device_path	/dev/video0
> -port		0
> -mode		3
>@@ -44,15 +44,6 @@
>  # 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
>@@ -61,7 +52,7 @@
> -channel         60
> -
> -[video_v4l_qcam]
>--path		CAMSERV_MODDIR/libvideo_v4l.so
>+-path		CAMSERV_MODDIR/libvideo_v4l.so.0
> -device_path	/dev/video1
> -port		0
> -color		30000
>@@ -75,4 +66,4 @@
> +channel         3
>  
>  [jpg_filter]
>- path            CAMSERV_MODDIR/libjpg_filter.so
>+ path            CAMSERV_MODDIR/libjpg_filter.so.0
>Index: files/patch-configure
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/camserv/files/patch-configure,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-configure
>--- files/patch-configure	4 Mar 2004 06:29:01 -0000	1.1
>+++ files/patch-configure	19 Mar 2004 20:36:52 -0000
>@@ -1,11 +0,0 @@
>---- 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_%'`

Actions: View | Diff

Attachments on bug 64482: 41134