Attachment #18195 for bug #32802

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




#

PORTNAME=       xawtv
PORTVERSION=	3.66
CATEGORIES=     graphics
WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
MASTER_SITES=   http://bytesex.org/xawtv/
DISTNAME=	${PORTNAME}_${PORTVERSION}

MAINTAINER=	greid@ukug.uk.freebsd.org

		png.5:${PORTSDIR}/graphics/png \
		jpeg.9:${PORTSDIR}/graphics/jpeg

CONFIGURE_ARGS=	--prefix=${PREFIX}

GNU_CONFIGURE=	yes

GNU_CONFIGURE=	yes
USE_GMAKE=	yes
USE_X_PREFIX=	yes


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

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-configure:
.for i in ${FILES_CFLAGS}
	${PERL} -pi -e "s|^CFLAGS=|CFLAGS+=|g" ${WRKSRC}/$i/Makefile
.endfor

.include <bsd.port.mk>

Line 1 Link Here

(-)xawtv/distinfo (-1 / +1 lines)
1	MD5 (xawtv_3.37.tar.gz) = a264eddc95fa92b83b14be386abc7be8	1	MD5 (xawtv_3.66.tar.gz) = 8783e6ca4530d64e0877c40b8a0bac97




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

Lines 1-9 Link Here

(-)xawtv/files/patch-font::Makefile.in (-7 / +8 lines)
1	--- font/Makefile.in.orig Sat Mar 3 22:50:32 2001	1	--- font/Makefile.in.orig Sun Sep 2 12:01:30 2001
2	+++ font/Makefile.in Sat Mar 3 22:50:44 2001	2	+++ font/Makefile.in Sun Sep 2 12:01:45 2001
3	@@ -16,7 +16,6 @@	3	@@ -23,7 +23,6 @@
4	done	4	done
5	if test "$(ROOT)" = ""; then \	5	if test "$(DESTDIR)" = ""; then \
6	(cd $(FONTDIR); mkfontdir); \	6	(cd $(fontdir); mkfontdir); \
7	- xset fp rehash; \	7	- xset fp rehash \|\| true; \
8	true; \
9	fi	8	fi
		9
		10




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




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




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

Line 0 Link Here

(-)xawtv/files/patch-webcam::Makefile.in (+11 lines)
	1	--- webcam/Makefile.in.orig Thu Dec 13 15:45:27 2001
	2	+++ webcam/Makefile.in Thu Dec 13 15:45:39 2001
	3	@@ -15,7 +15,7 @@
	4	all build: $(PROGS)
	5
	6	webcam: $(OBJS)
	7	- $(CC) $(CFLAGS) -o $@ $(OBJS) ../libng/libng.a $(LDLIBS) -ldl -Wl,-E
	8	+ $(CC) $(CFLAGS) -o $@ $(OBJS) ../libng/libng.a $(LDLIBS) -Wl,-E
	9
	10	install: all
	11	$(INSTALL_DIR) $(bindir)

Lines 1-7 Link Here

(-)xawtv/pkg-descr (-1 / +1 lines)
1	This is a _simple_ xaw-based TV Program which uses the bttv driver or	1	This is a _simple_ xaw-based TV Program which uses the bttv driver or
2	video4linux (included in 2.1.x). Copy Policy is GNU GPL.	2	video4linux (included in 2.1.x). Copy Policy is GNU GPL.
3		3
4	WWW: http://www.strusel007.de/linux/xawtv/	4	WWW: http://bytesex.org/xawtv/
5		5
6	- George Reid	6	- George Reid
7	greid@ukug.uk.freebsd.org	7	greid@ukug.uk.freebsd.org




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/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


Return to bug 32802

Lines 6-14 Link Here

(-)xawtv/Makefile (-14 / +22 lines)
6	#	6	#
7		7
8	PORTNAME= xawtv	8	PORTNAME= xawtv
9	PORTVERSION= 3.37	9	PORTVERSION= 3.66
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= http://www.strusel007.de/linux/xawtv/	11	WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
		12	MASTER_SITES= http://bytesex.org/xawtv/
12	DISTNAME= ${PORTNAME}_${PORTVERSION}	13	DISTNAME= ${PORTNAME}_${PORTVERSION}
13		14
14	MAINTAINER= greid@ukug.uk.freebsd.org	15	MAINTAINER= greid@ukug.uk.freebsd.org
Lines 17-43 Link Here
17	png.5:${PORTSDIR}/graphics/png \	18	png.5:${PORTSDIR}/graphics/png \
18	jpeg.9:${PORTSDIR}/graphics/jpeg	19	jpeg.9:${PORTSDIR}/graphics/jpeg
19		20
20	WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}	21	CONFIGURE_ARGS= --prefix=${PREFIX}
21		22
22	GNU_CONFIGURE= yes
23		23
		24	GNU_CONFIGURE= yes
		25	USE_GMAKE= yes
24	USE_X_PREFIX= yes	26	USE_X_PREFIX= yes
25		27
26	SEDFILES= . font i2c man src radio contrib/cc webcam oldstuff/vtx \	28
		29	FILES_CFLAGS= . font i2c man src radio webcam oldstuff/vtx \
27	libng libvbi http	30	libng libvbi http
		31	FILES_X11BASE= configure Make.config.in
28		32
29	MAN1= alevtd.1 fbtv.1 propwatch.1 rootv.1 showriff.1 v4l-conf.1 \
30	v4lctl.1 webcam.1 xawtv-remote.1 xawtv.1
31		33
32	post-configure:	34	MAN1= alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 record.1 \
33	.for M in ${SEDFILES}	35	rootv.1 scantv.1 showriff.1 \
34	@(${SED} -e 's,^CFLAGS=,CFLAGS+=,g' ${WRKSRC}/$M/Makefile \| \	36	streamer.1 subtitles.1 ttv.1 v4lctl.1 \
35	${SED} -e 's,-O2,,g' > ${WRKSRC}/foo && ${MV} ${WRKSRC}/foo ${WRKSRC}/$M/Makefile)	37	webcam.1 xawtv-remote.1 xawtv.1
		38	MAN5= xawtvrc.5
		39	MAN8= v4l-conf.8
		40
		41	post-patch:
		42	.for i in ${FILES_X11BASE}
		43	${PERL} -pi -e "s\|%%X11BASE%%\|${X11BASE}\|g" ${WRKSRC}/$i
36	.endfor	44	.endfor
37		45
38	post-install:	46	post-configure:
39	.for F in led-koi8.pcf led-latin1.pcf led-latin2.pcf	47	.for i in ${FILES_CFLAGS}
40	@gzip ${PREFIX}/lib/X11/fonts/misc/$F	48	${PERL} -pi -e "s\|^CFLAGS=\|CFLAGS+=\|g" ${WRKSRC}/$i/Makefile
41	.endfor	49	.endfor
42		50
43	.include <bsd.port.mk>	51	.include <bsd.port.mk>

Line 0 Link Here

(-)xawtv/files/patch-configure (+24 lines)
	1	--- configure.orig Tue Dec 11 16:40:06 2001
	2	+++ configure Thu Dec 13 15:29:34 2001
	3	@@ -2848,19 +2848,13 @@
	4
	5	echo $ac_n "checking for X11 config directory""... $ac_c" 1>&6
	6	echo "configure:2851: checking for X11 config directory" >&5
	7	-x11conf=/usr/X11R6/lib/X11
	8	-if test -d /etc/X11; then
	9	- x11conf=/etc/X11
	10	-fi
	11	+x11conf=%%X11BASE%%/lib/X11
	12	echo "$ac_t""$x11conf" 1>&6
	13
	14
	15	echo $ac_n "checking for X11 app-defaults directory""... $ac_c" 1>&6
	16	echo "configure:2860: checking for X11 app-defaults directory" >&5
	17	-resdir=/usr/X11R6/lib/X11
	18	-if test -d /etc/X11/app-defaults; then
	19	- resdir=/etc/X11
	20	-fi
	21	+resdir=%%X11BASE%%/lib/X11
	22	echo "$ac_t""$resdir/app-defaults" 1>&6
	23
	24

Line 0 Link Here

(-)xawtv/files/patch-src::Makefile.in (+61 lines)
	1	--- src/Makefile.in.orig Tue Dec 11 16:39:55 2001
	2	+++ src/Makefile.in Thu Dec 13 15:43:55 2001
	3	@@ -29,7 +29,7 @@
	4	-L@x_libraries@ @FSLIB@ -lm
	5
	6	TTV_OBJS = aa.o channel-no-x11.o $(COMMON_OBJS)
	7	-TTV_LIBS = $(GFX_LIBS) $(AA_LIBS)
	8	+TTV_LIBS = $(GFX_LIBS) $(AA_LIBS) -laa
	9
	10	V4LCTL_OBJS = v4lctl.o channel-no-x11.o xv.o $(COMMON_OBJS)
	11	V4LCTL_LIBS = $(GFX_LIBS) $(ATHENA_LIBS)
	12	@@ -68,25 +68,25 @@
	13	# build rules
	14
	15	xawtv: $(XAWTV_OBJS)
	16	- $(CC) $(CFLAGS) -o $@ $(XAWTV_OBJS) $(XAWTV_LIBS) -ldl -Wl,-E
	17	+ $(CC) $(CFLAGS) -o $@ $(XAWTV_OBJS) $(XAWTV_LIBS) -Wl,-E
	18
	19	motv: $(MOTV_OBJS)
	20	- $(CC) $(CFLAGS) -o $@ $(MOTV_OBJS) $(MOTV_LIBS) -ldl -Wl,-E
	21	+ $(CC) $(CFLAGS) -o $@ $(MOTV_OBJS) $(MOTV_LIBS) -Wl,-E
	22
	23	fbtv: $(FBTV_OBJS)
	24	- $(CC) $(CFLAGS) -o $@ $(FBTV_OBJS) $(FBTV_LIBS) -ldl -Wl,-E
	25	+ $(CC) $(CFLAGS) -o $@ $(FBTV_OBJS) $(FBTV_LIBS) -Wl,-E
	26
	27	ttv: $(TTV_OBJS)
	28	- $(CC) $(CFLAGS) -o $@ $(TTV_OBJS) $(TTV_LIBS) -ldl -Wl,-E
	29	+ $(CC) $(CFLAGS) -o $@ $(TTV_OBJS) $(TTV_LIBS) -Wl,-E
	30
	31	v4lctl: $(V4LCTL_OBJS)
	32	- $(CC) $(CFLAGS) -o $@ $(V4LCTL_OBJS) $(V4LCTL_LIBS) -ldl -Wl,-E
	33	+ $(CC) $(CFLAGS) -o $@ $(V4LCTL_OBJS) $(V4LCTL_LIBS) -Wl,-E
	34
	35	streamer: $(STREAMER_OBJS)
	36	- $(CC) $(CFLAGS) -o $@ $(STREAMER_OBJS) $(STREAMER_LIBS) -ldl -Wl,-E
	37	+ $(CC) $(CFLAGS) -o $@ $(STREAMER_OBJS) $(STREAMER_LIBS) -Wl,-E
	38
	39	scantv: $(SCANTV_OBJS)
	40	- $(CC) $(CFLAGS) -o $@ $(SCANTV_OBJS) $(SCANTV_LIBS) -ldl -Wl,-E
	41	+ $(CC) $(CFLAGS) -o $@ $(SCANTV_OBJS) $(SCANTV_LIBS) -Wl,-E
	42
	43	xvideo: xvideo.o
	44	$(CC) $(CFLAGS) -o $@ xvideo.o $(ATHENA_LIBS)
	45	@@ -124,12 +124,14 @@
	46	install-dirs:
	47	$(INSTALL_DIR) $(bindir)
	48	$(INSTALL_DIR) $(resdir)/app-defaults
	49	- $(INSTALL_DIR) $(resdir)/de/app-defaults
	50	+ for lang in $(LANG); do \
	51	+ $(INSTALL_DIR) $(resdir)/$$lang/app-defaults;\
	52	+ done
	53
	54	install-common:
	55	$(INSTALL_DIR) $(bindir)
	56	$(INSTALL_DIR) $(resdir)/app-defaults
	57	- $(INSTALL_PROGRAM) $(srcdir)/subtitles $(bindir)
	58	+ $(INSTALL_DATA) -m 555 $(srcdir)/subtitles $(bindir)
	59	$(INSTALL_PROGRAM) -s xawtv-remote $(bindir)
	60	$(INSTALL_PROGRAM) -s streamer $(bindir)
	61	$(INSTALL_PROGRAM) -s v4lctl $(bindir)

Line 0 Link Here

(-)xawtv/files/patch-src::motif.c (+22 lines)
	1	--- src/motif.c.orig Mon Sep 17 00:42:53 2001
	2	+++ src/motif.c Mon Sep 17 00:45:40 2001
	3	@@ -24,6 +24,19 @@
	4	# include <sys/soundcard.h>
	5	#endif
	6
	7	+#if defined(__FreeBSD__)
	8	+typedef struct mixer_info
	9	+{
	10	+ char id[16];
	11	+ char name[32];
	12	+ int modify_counter;
	13	+ int fillers[10];
	14	+} mixer_info;
	15	+
	16	+
	17	+# define SOUND_MIXER_INFO _IOR ('M', 101, mixer_info)
	18	+#endif
	19	+
	20	#include <X11/Xlib.h>
	21	#include <X11/Intrinsic.h>
	22	#include <Xm/Xm.h>

Line 0 Link Here

(-)xawtv/files/patch-src::xt.c (+16 lines)
	1	--- src/xt.c.orig Mon Sep 17 00:39:58 2001
	2	+++ src/xt.c Mon Sep 17 00:40:07 2001
	3	@@ -27,6 +27,13 @@
	4	# include <linux/videodev.h>
	5	#endif
	6
	7	+#if defined(__FreeBSD__)
	8	+#define VIDEO_SOUND_MONO 1
	9	+#define VIDEO_SOUND_STEREO 2
	10	+#define VIDEO_SOUND_LANG1 4
	11	+#define VIDEO_SOUND_LANG2 8
	12	+#endif
	13	+
	14	#include "config.h"
	15
	16	#include <X11/Xlib.h>

Lines 1-16 Link Here

(-)xawtv/pkg-plist (-4 / +14 lines)
1	bin/alevtd	1	bin/alevtd
2	bin/dump-mixers	2	bin/dump-mixers
		3	bin/ntsc-cc
3	bin/propwatch	4	bin/propwatch
4	bin/record	5	bin/record
5	bin/rootv	6	bin/rootv
6	bin/scantv	7	bin/scantv
7	bin/showriff	8	bin/showriff
8	bin/streamer	9	bin/streamer
		10	bin/subtitles
		11	bin/ttv
9	bin/v4lctl	12	bin/v4lctl
10	bin/webcam	13	bin/webcam
11	bin/xawtv	14	bin/xawtv
12	bin/xawtv-remote	15	bin/xawtv-remote
13	lib/X11/app-defaults/Xawtv	16	lib/X11/app-defaults/MoTV
14	lib/X11/fonts/misc/led-koi8.pcf.gz	17	lib/X11/fonts/misc/led-iso8859-1.pcf.gz
15	lib/X11/fonts/misc/led-latin1.pcf.gz	18	lib/X11/fonts/misc/led-iso8859-2.pcf.gz
16	lib/X11/fonts/misc/led-latin2.pcf.gz	19	lib/X11/fonts/misc/led-koi8-r.pcf.gz
		20	lib/X11/de/app-defaults/MoTV
		21	lib/X11/it/app-defaults/MoTV
		22	@dirrm lib/X11/de/app-defaults
		23	@dirrm lib/X11/de
		24	@dirrm lib/X11/it/app-defaults
		25	@dirrm lib/X11/it
		26