Attachment #28775 for bug #48252

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




#

PORTNAME=	xawtv
PORTVERSION=	3.85
CATEGORIES=	graphics
MASTER_SITES=	http://bytesex.org/xawtv/
DISTNAME=	${PORTNAME}_${PORTVERSION}

USE_XPM=	yes
USE_X_PREFIX=	yes
USE_REINPLACE=	yes
CONFIGURE_ENV=	LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib"
MAKE_ENV=	verbose=yes

FILES_LIBJPEG=	console/Subdir.mk debug/Subdir.mk x11/Subdir.mk


.include <bsd.port.pre.mk>

.if defined(WITH_LIBDV)
LIB_DEPENDS+=	dv.3:${PORTSDIR}/multimedia/libdv
CONFIGURE_ARGS+=--enable-dv
PLIST_SUB+=	DV=
.else
CONFIGURE_ARGS+=--enable-dv=no
PLIST_SUB+=	DV="@comment "
.endif

.if defined(WITH_MMX)
CONFIGURE_ARGS+=--enable-mmx
CFLAGS+=	-DMMX=1
.endif

.if defined(WITH_LIBQTIME)
CONFIGURE_ARGS+=--enable-quicktime
LIB_DEPENDS+=	quicktime.0:${PORTSDIR}/graphics/libquicktime
PLIST_SUB+=	QT=
.else
CONFIGURE_ARGS+=--enable-quicktime=no
PLIST_SUB+=	QT="@comment "
.endif

PLIST_SUB+=	X11PREFIX=${X11BASE}

pre-everything::
	@${ECHO} ""
	@${ECHO} "You may use the following build options:"
	@${ECHO} ""
	@${ECHO} "	WITH_LIBDV=yes    Enable reading/writing raw dv files"
	@${ECHO} "	WITH_LIBQTIME=yes Enable quicktime support"
	@${ECHO} "	WITH_MMX=yes      Enable mmx support"
	@${ECHO} ""

lpost-patch:
	@${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|g" \
		-e "s|/usr/local|${LOCALBASE}|g" \
		-e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure

.for i in ${FILES_LIBJPEG}
	@${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i

Line 1 Link Here

(-)/usr/ports/graphics/xawtv/distinfo (-1 / +1 lines)
1	MD5 (xawtv_3.83.tar.gz) = 866acba0fa7994c966d5c69a4528fb5b	1	MD5 (xawtv_3.85.tar.gz) = 7ef19068bbc27b3a8e0b92a3d7ab437f




--- configure.orig	Fri Feb  7 12:02:43 2003
+++ configure	Thu Feb 13 16:57:29 2003
@@ -5399,7 +5399,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldv -lm $LIBS"
+LIBS="-ldv -lm $LIBPTHREAD $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -5452,7 +5452,7 @@
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_DV 1
 _ACEOF
- FOUND_DV="yes"; LIBDV="-ldv -lm"
+ FOUND_DV="yes"; LIBDV="-ldv -lm $LIBPTHREAD $LIBS"
 fi
 
 else
@@ -5466,7 +5466,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lquicktime -ldl -lglib $LIBPTHREAD $LIBS"
+LIBS="-lquicktime -lglib12 $LIBPTHREAD $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -5527,7 +5527,7 @@
 fi
 QTLIBS=""
 if test "$FOUND_LQT" = "yes"; then
-    QTLIBS="-lquicktime -ldl -lglib -lm"
+    QTLIBS="-lquicktime -lglib12 $LIBPTHREAD $LIBS"
 fi
 
 
@@ -6062,9 +6062,6 @@
 echo "$as_me:$LINENO: checking for X11 config directory" >&5
 echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6
 x11conf=/usr/X11R6/lib/X11

 echo "$as_me:$LINENO: result: $x11conf" >&5
 echo "${ECHO_T}$x11conf" >&6
 
@@ -6072,9 +6069,6 @@
 echo "$as_me:$LINENO: checking for X11 app-defaults directory" >&5
 echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6
 resdir=/usr/X11R6/lib/X11

Line 0 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-libng::contrib-plugins::Subdir.mk (+11 lines)
	1	--- libng/contrib-plugins/Subdir.mk.orig Thu Feb 13 15:15:28 2003
	2	+++ libng/contrib-plugins/Subdir.mk Thu Feb 13 15:15:34 2003
	3	@@ -18,7 +18,7 @@
	4
	5	# linear-blend has mmx support ...
	6	ifeq ($(USE_MMX),yes)
	7	-libng/contrib-plugins/linear-blend.so : CFLAGS += -DMMX=1
	8	+#libng/contrib-plugins/linear-blend.so : CFLAGS += -DMMX=1
	9	endif
	10
	11	# global targets

Lines 15-21 Link Here

(-)/usr/ports/graphics/xawtv/pkg-plist (-1 / +5 lines)
15	bin/xawtv	15	bin/xawtv
16	bin/xawtv-remote	16	bin/xawtv-remote
17	lib/xawtv/bilinear.so	17	lib/xawtv/bilinear.so
18	lib/xawtv/conv-audio.so	18	@comment lib/xawtv/conv-audio.so
19	lib/xawtv/conv-mjpeg.so	19	lib/xawtv/conv-mjpeg.so
20	lib/xawtv/cubic.so	20	lib/xawtv/cubic.so
21	lib/xawtv/drv0-bsd.so	21	lib/xawtv/drv0-bsd.so
Lines 26-33 Link Here
26	lib/xawtv/linear-blend.so	26	lib/xawtv/linear-blend.so
27	lib/xawtv/linedoubler.so	27	lib/xawtv/linedoubler.so
28	lib/xawtv/read-avi.so	28	lib/xawtv/read-avi.so
		29	%%DV%%lib/xawtv/read-dv.so
		30	%%QT%%lib/xawtv/read-qt.so
29	lib/xawtv/snd-oss.so	31	lib/xawtv/snd-oss.so
30	lib/xawtv/write-avi.so	32	lib/xawtv/write-avi.so
		33	%%DV%%lib/xawtv/write-dv.so
		34	%%QT%%lib/xawtv/write-qt.so
31	@dirrm lib/xawtv	35	@dirrm lib/xawtv
32	man/es/man1/fbtv.1	36	man/es/man1/fbtv.1
33	man/es/man1/rootv.1	37	man/es/man1/rootv.1

Return to bug 48252

Lines 6-12 Link Here

(-)/usr/ports/graphics/xawtv/Makefile (-4 / +37 lines)
6	#	6	#
7		7
8	PORTNAME= xawtv	8	PORTNAME= xawtv
9	PORTVERSION= 3.83	9	PORTVERSION= 3.85
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= http://bytesex.org/xawtv/	11	MASTER_SITES= http://bytesex.org/xawtv/
12	DISTNAME= ${PORTNAME}_${PORTVERSION}	12	DISTNAME= ${PORTNAME}_${PORTVERSION}
Lines 26-32 Link Here
26	USE_XPM= yes	26	USE_XPM= yes
27	USE_X_PREFIX= yes	27	USE_X_PREFIX= yes
28	USE_REINPLACE= yes	28	USE_REINPLACE= yes
29		29	CONFIGURE_ENV= LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib"
30	MAKE_ENV= verbose=yes	30	MAKE_ENV= verbose=yes
31		31
32	FILES_LIBJPEG= console/Subdir.mk debug/Subdir.mk x11/Subdir.mk	32	FILES_LIBJPEG= console/Subdir.mk debug/Subdir.mk x11/Subdir.mk
Lines 40-50 Link Here
40		40
41	.include <bsd.port.pre.mk>	41	.include <bsd.port.pre.mk>
42		42
		43	.if defined(WITH_LIBDV)
		44	LIB_DEPENDS+= dv.3:${PORTSDIR}/multimedia/libdv
		45	CONFIGURE_ARGS+=--enable-dv
		46	PLIST_SUB+= DV=
		47	.else
		48	CONFIGURE_ARGS+=--enable-dv=no
		49	PLIST_SUB+= DV="@comment "
		50	.endif
		51
		52	.if defined(WITH_MMX)
		53	CONFIGURE_ARGS+=--enable-mmx
		54	CFLAGS+= -DMMX=1
		55	.endif
		56
		57	.if defined(WITH_LIBQTIME)
		58	CONFIGURE_ARGS+=--enable-quicktime
		59	LIB_DEPENDS+= quicktime.0:${PORTSDIR}/graphics/libquicktime
		60	PLIST_SUB+= QT=
		61	.else
		62	CONFIGURE_ARGS+=--enable-quicktime=no
		63	PLIST_SUB+= QT="@comment "
		64	.endif
		65
43	PLIST_SUB+= X11PREFIX=${X11BASE}	66	PLIST_SUB+= X11PREFIX=${X11BASE}
44		67
45	post-patch:	68	pre-everything::
		69	@${ECHO} ""
		70	@${ECHO} "You may use the following build options:"
		71	@${ECHO} ""
		72	@${ECHO} " WITH_LIBDV=yes Enable reading/writing raw dv files"
		73	@${ECHO} " WITH_LIBQTIME=yes Enable quicktime support"
		74	@${ECHO} " WITH_MMX=yes Enable mmx support"
		75	@${ECHO} ""
		76
		77	lpost-patch:
46	@${REINPLACE_CMD} -e "s\|/usr/X11R6\|${X11BASE}\|g" \	78	@${REINPLACE_CMD} -e "s\|/usr/X11R6\|${X11BASE}\|g" \
47	-e "s\|/usr/local\|${LOCALBASE}\|g" ${WRKSRC}/configure	79	-e "s\|/usr/local\|${LOCALBASE}\|g" \
		80	-e "s\|-lpthread\|${PTHREAD_LIBS}\|g" ${WRKSRC}/configure
48		81
49	.for i in ${FILES_LIBJPEG}	82	.for i in ${FILES_LIBJPEG}
50	@${REINPLACE_CMD} -e "s\|-ljpeg\|-L${LOCALBASE}/lib -ljpeg\|g" ${WRKSRC}/$i	83	@${REINPLACE_CMD} -e "s\|-ljpeg\|-L${LOCALBASE}/lib -ljpeg\|g" ${WRKSRC}/$i

Lines 1-6 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-configure (-4 / +40 lines)
1	--- configure.orig Wed Oct 30 12:26:42 2002	1	--- configure.orig Fri Feb 7 12:02:43 2003
2	+++ configure Wed Oct 30 20:59:10 2002	2	+++ configure Thu Feb 13 16:57:29 2003
3	@@ -5749,9 +5749,6 @@	3	@@ -5399,7 +5399,7 @@
		4	echo $ECHO_N "(cached) $ECHO_C" >&6
		5	else
		6	ac_check_lib_save_LIBS=$LIBS
		7	-LIBS="-ldv -lm $LIBS"
		8	+LIBS="-ldv -lm $LIBPTHREAD $LIBS"
		9	cat >conftest.$ac_ext <<_ACEOF
		10	#line $LINENO "configure"
		11	/* confdefs.h. */
		12	@@ -5452,7 +5452,7 @@
		13	cat >>confdefs.h <<\_ACEOF
		14	#define HAVE_DV 1
		15	_ACEOF
		16	- FOUND_DV="yes"; LIBDV="-ldv -lm"
		17	+ FOUND_DV="yes"; LIBDV="-ldv -lm $LIBPTHREAD $LIBS"
		18	fi
		19
		20	else
		21	@@ -5466,7 +5466,7 @@
		22	echo $ECHO_N "(cached) $ECHO_C" >&6
		23	else
		24	ac_check_lib_save_LIBS=$LIBS
		25	-LIBS="-lquicktime -ldl -lglib $LIBPTHREAD $LIBS"
		26	+LIBS="-lquicktime -lglib12 $LIBPTHREAD $LIBS"
		27	cat >conftest.$ac_ext <<_ACEOF
		28	#line $LINENO "configure"
		29	/* confdefs.h. */
		30	@@ -5527,7 +5527,7 @@
		31	fi
		32	QTLIBS=""
		33	if test "$FOUND_LQT" = "yes"; then
		34	- QTLIBS="-lquicktime -ldl -lglib -lm"
		35	+ QTLIBS="-lquicktime -lglib12 $LIBPTHREAD $LIBS"
		36	fi
		37
		38
		39	@@ -6062,9 +6062,6 @@
4	echo "$as_me:$LINENO: checking for X11 config directory" >&5	40	echo "$as_me:$LINENO: checking for X11 config directory" >&5
5	echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6	41	echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6
6	x11conf=/usr/X11R6/lib/X11	42	x11conf=/usr/X11R6/lib/X11
Lines 10-16 Link Here
10	echo "$as_me:$LINENO: result: $x11conf" >&5	46	echo "$as_me:$LINENO: result: $x11conf" >&5
11	echo "${ECHO_T}$x11conf" >&6	47	echo "${ECHO_T}$x11conf" >&6
12		48
13	@@ -5759,9 +5756,6 @@	49	@@ -6072,9 +6069,6 @@
14	echo "$as_me:$LINENO: checking for X11 app-defaults directory" >&5	50	echo "$as_me:$LINENO: checking for X11 app-defaults directory" >&5
15	echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6	51	echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6
16	resdir=/usr/X11R6/lib/X11	52	resdir=/usr/X11R6/lib/X11