Attachment 18195 Details for Bug 32802 – file.diff

[patch] file.diff

file.diff (text/plain), 8.92 KB, created by Oliver Lehmann on 2001-12-13 15:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Lehmann

Created: 2001-12-13 15:40:01 UTC

Size: 8.92 KB

patch

obsolete

>diff -ruN xawtv.old/Makefile xawtv/Makefile
>--- xawtv.old/Makefile	Thu Dec 13 16:07:08 2001
>+++ xawtv/Makefile	Thu Dec 13 15:26:52 2001
>@@ -6,9 +6,10 @@
> #
> 
> PORTNAME=       xawtv
>-PORTVERSION=	3.37
>+PORTVERSION=	3.66
> CATEGORIES=     graphics
>-MASTER_SITES=   http://www.strusel007.de/linux/xawtv/
>+WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
>+MASTER_SITES=   http://bytesex.org/xawtv/
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
> MAINTAINER=	greid@ukug.uk.freebsd.org
>@@ -17,27 +18,34 @@
> 		png.5:${PORTSDIR}/graphics/png \
> 		jpeg.9:${PORTSDIR}/graphics/jpeg
> 
>-WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
>+CONFIGURE_ARGS=	--prefix=${PREFIX}
> 
>-GNU_CONFIGURE=	yes
> 
>+GNU_CONFIGURE=	yes
>+USE_GMAKE=	yes
> USE_X_PREFIX=	yes
> 
>-SEDFILES=	. font i2c man src radio contrib/cc webcam oldstuff/vtx \
>+
>+FILES_CFLAGS=	. font i2c man src radio webcam oldstuff/vtx \
> 		libng libvbi http
>+FILES_X11BASE=	configure Make.config.in
> 
>-MAN1=		alevtd.1 fbtv.1 propwatch.1 rootv.1 showriff.1 v4l-conf.1 \
>-		v4lctl.1 webcam.1 xawtv-remote.1 xawtv.1
> 
>-post-configure:
>-.for M in ${SEDFILES}
>-	@(${SED} -e 's,^CFLAGS=,CFLAGS+=,g' ${WRKSRC}/$M/Makefile | \
>-		${SED} -e 's,-O2,,g' > ${WRKSRC}/foo && ${MV} ${WRKSRC}/foo ${WRKSRC}/$M/Makefile)
>+MAN1=		alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 record.1 \
>+		rootv.1 scantv.1 showriff.1 \
>+		streamer.1 subtitles.1 ttv.1 v4lctl.1 \
>+		webcam.1 xawtv-remote.1 xawtv.1
>+MAN5=		xawtvrc.5
>+MAN8=		v4l-conf.8
>+
>+post-patch:
>+.for i in ${FILES_X11BASE}
>+	${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/$i
> .endfor
> 
>-post-install:
>-.for F in led-koi8.pcf led-latin1.pcf led-latin2.pcf
>-	@gzip ${PREFIX}/lib/X11/fonts/misc/$F
>+post-configure:
>+.for i in ${FILES_CFLAGS}
>+	${PERL} -pi -e "s|^CFLAGS=|CFLAGS+=|g" ${WRKSRC}/$i/Makefile
> .endfor
> 
> .include <bsd.port.mk>
>diff -ruN xawtv.old/distinfo xawtv/distinfo
>--- xawtv.old/distinfo	Thu Dec 13 16:07:08 2001
>+++ xawtv/distinfo	Thu Dec 13 15:27:26 2001
>@@ -1 +1 @@
>-MD5 (xawtv_3.37.tar.gz) = a264eddc95fa92b83b14be386abc7be8
>+MD5 (xawtv_3.66.tar.gz) = 8783e6ca4530d64e0877c40b8a0bac97
>diff -ruN xawtv.old/files/patch-configure xawtv/files/patch-configure
>--- xawtv.old/files/patch-configure	Thu Jan  1 01:00:00 1970
>+++ xawtv/files/patch-configure	Thu Dec 13 15:29:51 2001
>@@ -0,0 +1,24 @@
>+--- configure.orig	Tue Dec 11 16:40:06 2001
>++++ configure	Thu Dec 13 15:29:34 2001
>+@@ -2848,19 +2848,13 @@
>+ 
>+ echo $ac_n "checking for X11 config directory""... $ac_c" 1>&6
>+ echo "configure:2851: checking for X11 config directory" >&5
>+-x11conf=/usr/X11R6/lib/X11
>+-if test -d /etc/X11; then
>+-	x11conf=/etc/X11
>+-fi
>++x11conf=%%X11BASE%%/lib/X11
>+ echo "$ac_t""$x11conf" 1>&6
>+ 
>+ 
>+ echo $ac_n "checking for X11 app-defaults directory""... $ac_c" 1>&6
>+ echo "configure:2860: checking for X11 app-defaults directory" >&5
>+-resdir=/usr/X11R6/lib/X11
>+-if test -d /etc/X11/app-defaults; then
>+-	resdir=/etc/X11
>+-fi
>++resdir=%%X11BASE%%/lib/X11
>+ echo "$ac_t""$resdir/app-defaults" 1>&6
>+ 
>+ 
>diff -ruN xawtv.old/files/patch-font::Makefile.in xawtv/files/patch-font::Makefile.in
>--- xawtv.old/files/patch-font::Makefile.in	Thu Dec 13 16:07:08 2001
>+++ xawtv/files/patch-font::Makefile.in	Thu Dec 13 15:26:32 2001
>@@ -1,9 +1,10 @@
>---- font/Makefile.in.orig	Sat Mar  3 22:50:32 2001
>-+++ font/Makefile.in		Sat Mar  3 22:50:44 2001
>-@@ -16,7 +16,6 @@
>+--- font/Makefile.in.orig	Sun Sep  2 12:01:30 2001
>++++ font/Makefile.in	Sun Sep  2 12:01:45 2001
>+@@ -23,7 +23,6 @@
>  	done
>- 	if test "$(ROOT)" = ""; then		\
>- 		(cd $(FONTDIR); mkfontdir);	\
>--		xset fp rehash;			\
>- 		true;				\
>+ 	if test "$(DESTDIR)" = ""; then		\
>+ 		(cd $(fontdir); mkfontdir);	\
>+-		xset fp rehash || true;		\
>  	fi
>+ 
>+ 
>diff -ruN xawtv.old/files/patch-src::Makefile.in xawtv/files/patch-src::Makefile.in
>--- xawtv.old/files/patch-src::Makefile.in	Thu Jan  1 01:00:00 1970
>+++ xawtv/files/patch-src::Makefile.in	Thu Dec 13 15:44:36 2001
>@@ -0,0 +1,61 @@
>+--- src/Makefile.in.orig	Tue Dec 11 16:39:55 2001
>++++ src/Makefile.in	Thu Dec 13 15:43:55 2001
>+@@ -29,7 +29,7 @@
>+ 		  -L@x_libraries@ @FSLIB@ -lm
>+ 
>+ TTV_OBJS	= aa.o channel-no-x11.o $(COMMON_OBJS)
>+-TTV_LIBS	= $(GFX_LIBS) $(AA_LIBS)
>++TTV_LIBS	= $(GFX_LIBS) $(AA_LIBS) -laa
>+ 
>+ V4LCTL_OBJS	= v4lctl.o channel-no-x11.o xv.o $(COMMON_OBJS)
>+ V4LCTL_LIBS	= $(GFX_LIBS) $(ATHENA_LIBS)
>+@@ -68,25 +68,25 @@
>+ # build rules
>+ 
>+ xawtv: $(XAWTV_OBJS)
>+-	$(CC) $(CFLAGS) -o $@ $(XAWTV_OBJS) $(XAWTV_LIBS) -ldl -Wl,-E
>++	$(CC) $(CFLAGS) -o $@ $(XAWTV_OBJS) $(XAWTV_LIBS) -Wl,-E
>+ 
>+ motv: $(MOTV_OBJS)
>+-	$(CC) $(CFLAGS) -o $@ $(MOTV_OBJS) $(MOTV_LIBS) -ldl -Wl,-E
>++	$(CC) $(CFLAGS) -o $@ $(MOTV_OBJS) $(MOTV_LIBS) -Wl,-E
>+ 
>+ fbtv: $(FBTV_OBJS)
>+-	$(CC) $(CFLAGS) -o $@ $(FBTV_OBJS) $(FBTV_LIBS) -ldl -Wl,-E
>++	$(CC) $(CFLAGS) -o $@ $(FBTV_OBJS) $(FBTV_LIBS) -Wl,-E
>+ 
>+ ttv: $(TTV_OBJS)
>+-	$(CC) $(CFLAGS) -o $@ $(TTV_OBJS) $(TTV_LIBS) -ldl -Wl,-E
>++	$(CC) $(CFLAGS) -o $@ $(TTV_OBJS) $(TTV_LIBS) -Wl,-E
>+ 
>+ v4lctl: $(V4LCTL_OBJS)
>+-	$(CC) $(CFLAGS) -o $@ $(V4LCTL_OBJS) $(V4LCTL_LIBS) -ldl -Wl,-E
>++	$(CC) $(CFLAGS) -o $@ $(V4LCTL_OBJS) $(V4LCTL_LIBS) -Wl,-E
>+ 
>+ streamer: $(STREAMER_OBJS)
>+-	$(CC) $(CFLAGS) -o $@ $(STREAMER_OBJS) $(STREAMER_LIBS) -ldl -Wl,-E
>++	$(CC) $(CFLAGS) -o $@ $(STREAMER_OBJS) $(STREAMER_LIBS) -Wl,-E
>+ 
>+ scantv: $(SCANTV_OBJS)
>+-	$(CC) $(CFLAGS) -o $@ $(SCANTV_OBJS) $(SCANTV_LIBS) -ldl -Wl,-E
>++	$(CC) $(CFLAGS) -o $@ $(SCANTV_OBJS) $(SCANTV_LIBS) -Wl,-E
>+ 
>+ xvideo: xvideo.o
>+ 	$(CC) $(CFLAGS) -o $@ xvideo.o $(ATHENA_LIBS)
>+@@ -124,12 +124,14 @@
>+ install-dirs:
>+ 	$(INSTALL_DIR) $(bindir)
>+ 	$(INSTALL_DIR) $(resdir)/app-defaults
>+-	$(INSTALL_DIR) $(resdir)/de/app-defaults
>++	for lang in $(LANG); do \
>++	  $(INSTALL_DIR) $(resdir)/$$lang/app-defaults;\
>++	done
>+ 
>+ install-common:
>+ 	$(INSTALL_DIR) $(bindir)
>+ 	$(INSTALL_DIR) $(resdir)/app-defaults
>+-	$(INSTALL_PROGRAM) $(srcdir)/subtitles $(bindir)
>++	$(INSTALL_DATA) -m 555 $(srcdir)/subtitles $(bindir)
>+ 	$(INSTALL_PROGRAM) -s xawtv-remote $(bindir)
>+ 	$(INSTALL_PROGRAM) -s streamer $(bindir)
>+ 	$(INSTALL_PROGRAM) -s v4lctl $(bindir)
>diff -ruN xawtv.old/files/patch-src::motif.c xawtv/files/patch-src::motif.c
>--- xawtv.old/files/patch-src::motif.c	Thu Jan  1 01:00:00 1970
>+++ xawtv/files/patch-src::motif.c	Thu Dec 13 15:28:19 2001
>@@ -0,0 +1,22 @@
>+--- src/motif.c.orig	Mon Sep 17 00:42:53 2001
>++++ src/motif.c	Mon Sep 17 00:45:40 2001
>+@@ -24,6 +24,19 @@
>+ # include <sys/soundcard.h>
>+ #endif
>+ 
>++#if defined(__FreeBSD__)
>++typedef struct mixer_info
>++{
>++  char id[16];  
>++  char name[32];
>++  int  modify_counter;
>++  int fillers[10];
>++} mixer_info;
>++
>++
>++# define SOUND_MIXER_INFO                _IOR ('M', 101, mixer_info)
>++#endif
>++
>+ #include <X11/Xlib.h>
>+ #include <X11/Intrinsic.h>
>+ #include <Xm/Xm.h>
>diff -ruN xawtv.old/files/patch-src::xt.c xawtv/files/patch-src::xt.c
>--- xawtv.old/files/patch-src::xt.c	Thu Jan  1 01:00:00 1970
>+++ xawtv/files/patch-src::xt.c	Thu Dec 13 15:28:22 2001
>@@ -0,0 +1,16 @@
>+--- src/xt.c.orig	Mon Sep 17 00:39:58 2001
>++++ src/xt.c	Mon Sep 17 00:40:07 2001
>+@@ -27,6 +27,13 @@
>+ # include <linux/videodev.h>
>+ #endif
>+ 
>++#if defined(__FreeBSD__)
>++#define VIDEO_SOUND_MONO        1
>++#define VIDEO_SOUND_STEREO      2
>++#define VIDEO_SOUND_LANG1       4
>++#define VIDEO_SOUND_LANG2       8
>++#endif
>++
>+ #include "config.h"
>+ 
>+ #include <X11/Xlib.h>
>diff -ruN xawtv.old/files/patch-webcam::Makefile.in xawtv/files/patch-webcam::Makefile.in
>--- xawtv.old/files/patch-webcam::Makefile.in	Thu Jan  1 01:00:00 1970
>+++ xawtv/files/patch-webcam::Makefile.in	Thu Dec 13 15:46:02 2001
>@@ -0,0 +1,11 @@
>+--- webcam/Makefile.in.orig	Thu Dec 13 15:45:27 2001
>++++ webcam/Makefile.in	Thu Dec 13 15:45:39 2001
>+@@ -15,7 +15,7 @@
>+ all build: $(PROGS)
>+ 
>+ webcam: $(OBJS)
>+-	$(CC) $(CFLAGS) -o $@ $(OBJS) ../libng/libng.a $(LDLIBS) -ldl -Wl,-E
>++	$(CC) $(CFLAGS) -o $@ $(OBJS) ../libng/libng.a $(LDLIBS) -Wl,-E
>+ 
>+ install: all
>+ 	$(INSTALL_DIR) $(bindir)
>diff -ruN xawtv.old/pkg-descr xawtv/pkg-descr
>--- xawtv.old/pkg-descr	Thu Dec 13 16:07:08 2001
>+++ xawtv/pkg-descr	Thu Dec 13 15:26:33 2001
>@@ -1,7 +1,7 @@
> This is a _simple_ xaw-based TV Program which uses the bttv driver or
> video4linux (included in 2.1.x).  Copy Policy is GNU GPL.
> 
>-WWW: http://www.strusel007.de/linux/xawtv/
>+WWW: http://bytesex.org/xawtv/
> 
> - George Reid
> greid@ukug.uk.freebsd.org
>diff -ruN xawtv.old/pkg-plist xawtv/pkg-plist
>--- xawtv.old/pkg-plist	Thu Dec 13 16:07:08 2001
>+++ xawtv/pkg-plist	Thu Dec 13 15:26:33 2001
>@@ -1,16 +1,26 @@
> bin/alevtd
> bin/dump-mixers
>+bin/ntsc-cc
> bin/propwatch
> bin/record
> bin/rootv
> bin/scantv
> bin/showriff
> bin/streamer
>+bin/subtitles
>+bin/ttv
> bin/v4lctl
> bin/webcam
> bin/xawtv
> bin/xawtv-remote
>-lib/X11/app-defaults/Xawtv
>-lib/X11/fonts/misc/led-koi8.pcf.gz
>-lib/X11/fonts/misc/led-latin1.pcf.gz
>-lib/X11/fonts/misc/led-latin2.pcf.gz
>+lib/X11/app-defaults/MoTV
>+lib/X11/fonts/misc/led-iso8859-1.pcf.gz
>+lib/X11/fonts/misc/led-iso8859-2.pcf.gz
>+lib/X11/fonts/misc/led-koi8-r.pcf.gz
>+lib/X11/de/app-defaults/MoTV
>+lib/X11/it/app-defaults/MoTV
>+@dirrm lib/X11/de/app-defaults
>+@dirrm lib/X11/de
>+@dirrm lib/X11/it/app-defaults     
>+@dirrm lib/X11/it
>+

Actions: View | Diff

Attachments on bug 32802: 18195