Attachment #99910 for bug #139114




#

PORTNAME=	vlc
DISTVERSION=	1.0.2
PORTREVISION=	1
PORTEPOCH=	3
CATEGORIES=	multimedia audio ipv6 net www
MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \

MAINTAINER=	jsa@wickedmachine.net
COMMENT=	Multimedia streaming server and player for various audio/video formats

BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat \
		${LOCALBASE}/include/X11/xpm.h:${PORTSDIR}/x11/libXpm
LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera



USE_BZIP2=	yes
USE_GMAKE=	yes
.if !defined(WITHOUT_X11)
WANT_GNOME=	yes
USE_GNOME=	gnomehack gnometarget libxml2
.endif
.if !defined(WITHOUT_SDL) && !defined(WITHOUT_X11)
WANT_SDL=	yes
.endif
USE_ICONV=	yes
USE_PERL5_BUILD=yes


			--enable-postproc \
			--without-dv-raw1394 \
			--disable-dv \
			--disable-galaktos \
			--disable-glx

MAN1=		vlc.1 \
		vlc-config.1 \

BROKEN=	Does not compile with perl ${PERL_VERSION}
.endif

.if !defined(WITHOUT_QT4) && !defined(WITHOUT_X11)
USE_QT_VER+=	4
QT_COMPONENTS+=	gui corelib moc_build rcc_build uic_build
CONFIGURE_ARGS+=--enable-qt4

DEFAULT_DVD_DEVICE=/dev/acd0
.endif

.if !defined(WITHOUT_GNOMEVFS) && !defined(WITHOUT_X11)
USE_GNOME+=	gnomevfs2
CONFIGURE_ARGS+=	--enable-gnomevfs
.else

DEFAULT_CDROM_DEVICE=/dev/acd0
.endif

.if !defined(WITHOUT_LIBNOTIFY) && !defined(WITHOUT_X11)
LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
CONFIGURE_ARGS+=--enable-notify
.else
CONFIGURE_ARGS+=--disable-notify
.endif

.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS) && !defined(WITHOUT_QT4) && !defined(WITHOUT_X11)
LIB_DEPENDS+=	tar.0:${PORTSDIR}/devel/libtar
CONFIGURE_ARGS+=--enable-skins2 --enable-libtar
.else

CONFIGURE_ARGS+=--disable-zvbi
.endif

.if !defined(WITHOUT_HAL) && !defined(WITHOUT_X11)
LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
CONFIGURE_ARGS+=--enable-hal
.else
CONFIGURE_ARGS+=--disable-hal
.endif

.if (defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS) && !defined(WITHOUT_X11)
LIB_DEPENDS+=	 artsc.0:${PORTSDIR}/audio/arts
CONFIGURE_ARGS+=	--enable-arts
.else

CONFIGURE_ARGS+=--disable-dvdread
.endif

.if (defined(WITH_ESOUND) || defined(HAVE_GNOME) && ${HAVE_GNOME:Mesound}!="") && !defined(WITHOUT_ESOUND) && !defined(WITHOUT_X11)
USE_GNOME+=	esound
CONFIGURE_ARGS+=--enable-esd
.else

CONFIGURE_ARGS+=--disable-smb
.endif

.if !defined(WITHOUT_SDL) && !defined(WITHOUT_X11)
USE_SDL=	image
CONFIGURE_ARGS+=--enable-sdl
.else

CONFIGURE_ARGS+=--disable-sout
.endif

.if (defined(WITH_SVG) || defined(HAVE_GNOME) && ${HAVE_GNOME:Mlibrsvg2}!="") && !defined(WITHOUT_SVG) && !defined(WITHOUT_X11)
USE_GNOME+=	librsvg2
CONFIGURE_ARGS+=--enable-svg
.else

.if defined(WITHOUT_V4L)
CONFIGURE_ARGS+=--disable-v4l
.else
BUILD_DEPENDS+=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
CONFIGURE_ARGS+=--enable-v4l
.endif


CONFIGURE_ARGS+=--disable-x11
.else
USE_XORG=	xpm
BUILD_DEPENDS+=	${LOCALBASE}/include/X11/xpm.h:${PORTSDIR}/x11/libXpm
CONFIGURE_ARGS+=--enable-x11
.endif





		${SED} -e 's|^|lib/|' >> ${PLIST} \
		&& ${FIND} -d * -type d | \
		${SED} -e 's|^|@dirrm lib/|' >> ${PLIST}
.if !defined(WITHOUT_X11)
	cd ${FAKEDIR}/libdata && ${FIND} -s * -type f -o -type l| \
		${SED} -e 's|^|libdata/|' >> ${PLIST} \
		&& ${FIND} -d * -type d | \
		${SED} -e 's|^|@dirrmtry libdata/|' >> ${PLIST}
.endif
.for dir in vlc
	cd ${FAKEDIR}/share/${dir} && ${FIND} -s * -type f -o -type l | \
		${SED} -e 's|^|share/${dir}/|' >> ${PLIST} \

		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include
	cd ${FAKEDIR}/lib && ${FIND} . | \
		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib
.if !defined(WITHOUT_X11)
	cd ${FAKEDIR}/libdata && ${FIND} . | \
		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/libdata
.endif
	cd ${FAKEDIR}/share && ${FIND} . | \
		${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share
.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)

Lines 1-3 Link Here

(-)multimedia/vlc/distinfo (-3 / +3 lines)
1	MD5 (vlc-1.0.1.tar.bz2) = 6e299d373e7751bb36de001cdc6a2989	1	MD5 (vlc-1.0.2.tar.bz2) = 69d4e30fe4fc2691780fbeacd40359d2
2	SHA256 (vlc-1.0.1.tar.bz2) = 2b4a1d82699f37a7b696bcdc87e669f17c1ba6ab37bf7a96fd953940e00fd463	2	SHA256 (vlc-1.0.2.tar.bz2) = 38b176fd495f3254db74e03977235a0a2212fc6533d7cd1a4c3dddc495b074f0
3	SIZE (vlc-1.0.1.tar.bz2) = 19794042	3	SIZE (vlc-1.0.2.tar.bz2) = 20958212




--- configure.orig	2009-09-23 23:31:31.000000000 +0100
+++ configure	2009-09-23 23:30:51.000000000 +0100
@@ -29130,7 +29130,16 @@
     CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}"
     for ac_header in dvbpsi/dr.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "dvbpsi/dr.h" "ac_cv_header_dvbpsi_dr_h" "$ac_includes_default"
+  ac_fn_c_check_header_compile "$LINENO" "dvbpsi/dr.h" "ac_cv_header_dvbpsi_dr_h" "#if defined( HAVE_STDINT_H )
+#   include <stdint.h>
+#elif defined( HAVE_INTTYPES_H )
+#   include <inttypes.h>
+#endif
+#include <dvbpsi/dvbpsi.h>
+#include <dvbpsi/descriptor.h>
+#include <dvbpsi/pat.h>
+#include <dvbpsi/pmt.h>
+"
 if test "x$ac_cv_header_dvbpsi_dr_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DVBPSI_DR_H 1

Lines 1-10 Link Here

(-)multimedia/vlc/files/patch-modules__access__file.c (-10 lines)
1	--- modules/access/file.c.orig 2009-09-13 21:50:02.000000000 +0900
2	+++ modules/access/file.c 2009-09-13 21:50:37.000000000 +0900
3	@@ -52,6 +52,7 @@
4	# include <linux/magic.h>
5	# define HAVE_FSTATFS 1
6	#elif defined (HAVE_SYS_MOUNT_H)
7	+# include <sys/param.h>
8	# include <sys/mount.h>
9	# define HAVE_FSTATFS 1
10	#endif




     p_sys->i_video_pts = p_block->i_pts = p_block->i_dts = mdate();
 
     return p_block;
--- configure.orig	Mon Jun 12 10:44:45 2006
+++ configure	Mon Jun 12 10:46:11 2006
@@ -39400,7 +39400,7 @@
   enableval="$enable_v4l"
 fi

-if test "${enable_v4l}" = "yes"
+if true
 then
 
 # Check whether --with-v4l or --without-v4l was given.

Return to bug 139114

Lines 9-16 Link Here

(-)multimedia/vlc/Makefile (-14 / +18 lines)
9	#	9	#
10		10
11	PORTNAME= vlc	11	PORTNAME= vlc
12	DISTVERSION= 1.0.1	12	DISTVERSION= 1.0.2
13	PORTREVISION= 1
14	PORTEPOCH= 3	13	PORTEPOCH= 3
15	CATEGORIES= multimedia audio ipv6 net www	14	CATEGORIES= multimedia audio ipv6 net www
16	MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \	15	MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
Lines 20-27 Link Here
20	MAINTAINER= jsa@wickedmachine.net	19	MAINTAINER= jsa@wickedmachine.net
21	COMMENT= Multimedia streaming server and player for various audio/video formats	20	COMMENT= Multimedia streaming server and player for various audio/video formats
22		21
23	BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat \
24	${LOCALBASE}/include/X11/xpm.h:${PORTSDIR}/x11/libXpm
25	LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg	22	LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
26	RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera	23	RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
27		24
Lines 65-73 Link Here
65		62
66	USE_BZIP2= yes	63	USE_BZIP2= yes
67	USE_GMAKE= yes	64	USE_GMAKE= yes
		65	.if !defined(WITHOUT_X11)
68	WANT_GNOME= yes	66	WANT_GNOME= yes
69	USE_GNOME= gnomehack gnometarget libxml2	67	USE_GNOME= gnomehack gnometarget libxml2
		68	.endif
		69	.if !defined(WITHOUT_SDL) && !defined(WITHOUT_X11)
70	WANT_SDL= yes	70	WANT_SDL= yes
		71	.endif
71	USE_ICONV= yes	72	USE_ICONV= yes
72	USE_PERL5_BUILD=yes	73	USE_PERL5_BUILD=yes
73		74
Lines 87-93 Link Here
87	--enable-postproc \	88	--enable-postproc \
88	--without-dv-raw1394 \	89	--without-dv-raw1394 \
89	--disable-dv \	90	--disable-dv \
90	--disable-galaktos	91	--disable-galaktos \
		92	--disable-glx
91		93
92	MAN1= vlc.1 \	94	MAN1= vlc.1 \
93	vlc-config.1 \	95	vlc-config.1 \
Lines 105-111 Link Here
105	BROKEN= Does not compile with perl ${PERL_VERSION}	107	BROKEN= Does not compile with perl ${PERL_VERSION}
106	.endif	108	.endif
107		109
108	.if !defined(WITHOUT_QT4)	110	.if !defined(WITHOUT_QT4) && !defined(WITHOUT_X11)
109	USE_QT_VER+= 4	111	USE_QT_VER+= 4
110	QT_COMPONENTS+= gui corelib moc_build rcc_build uic_build	112	QT_COMPONENTS+= gui corelib moc_build rcc_build uic_build
111	CONFIGURE_ARGS+=--enable-qt4	113	CONFIGURE_ARGS+=--enable-qt4
Lines 162-168 Link Here
162	DEFAULT_DVD_DEVICE=/dev/acd0	164	DEFAULT_DVD_DEVICE=/dev/acd0
163	.endif	165	.endif
164		166
165	.if !defined(WITHOUT_GNOMEVFS)	167	.if !defined(WITHOUT_GNOMEVFS) && !defined(WITHOUT_X11)
166	USE_GNOME+= gnomevfs2	168	USE_GNOME+= gnomevfs2
167	CONFIGURE_ARGS+= --enable-gnomevfs	169	CONFIGURE_ARGS+= --enable-gnomevfs
168	.else	170	.else
Lines 175-188 Link Here
175	DEFAULT_CDROM_DEVICE=/dev/acd0	177	DEFAULT_CDROM_DEVICE=/dev/acd0
176	.endif	178	.endif
177		179
178	.if !defined(WITHOUT_LIBNOTIFY)	180	.if !defined(WITHOUT_LIBNOTIFY) && !defined(WITHOUT_X11)
179	LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify	181	LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify
180	CONFIGURE_ARGS+=--enable-notify	182	CONFIGURE_ARGS+=--enable-notify
181	.else	183	.else
182	CONFIGURE_ARGS+=--disable-notify	184	CONFIGURE_ARGS+=--disable-notify
183	.endif	185	.endif
184		186
185	.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS) && !defined(WITHOUT_QT4)	187	.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS) && !defined(WITHOUT_QT4) && !defined(WITHOUT_X11)
186	LIB_DEPENDS+= tar.0:${PORTSDIR}/devel/libtar	188	LIB_DEPENDS+= tar.0:${PORTSDIR}/devel/libtar
187	CONFIGURE_ARGS+=--enable-skins2 --enable-libtar	189	CONFIGURE_ARGS+=--enable-skins2 --enable-libtar
188	.else	190	.else
Lines 231-244 Link Here
231	CONFIGURE_ARGS+=--disable-zvbi	233	CONFIGURE_ARGS+=--disable-zvbi
232	.endif	234	.endif
233		235
234	.if !defined(WITHOUT_HAL)	236	.if !defined(WITHOUT_HAL) && !defined(WITHOUT_X11)
235	LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal	237	LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
236	CONFIGURE_ARGS+=--enable-hal	238	CONFIGURE_ARGS+=--enable-hal
237	.else	239	.else
238	CONFIGURE_ARGS+=--disable-hal	240	CONFIGURE_ARGS+=--disable-hal
239	.endif	241	.endif
240		242
241	.if (defined(WITH_ARTS) \|\| exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS)	243	.if (defined(WITH_ARTS) \|\| exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS) && !defined(WITHOUT_X11)
242	LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts	244	LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
243	CONFIGURE_ARGS+= --enable-arts	245	CONFIGURE_ARGS+= --enable-arts
244	.else	246	.else
Lines 296-302 Link Here
296	CONFIGURE_ARGS+=--disable-dvdread	298	CONFIGURE_ARGS+=--disable-dvdread
297	.endif	299	.endif
298		300
299	.if (defined(WITH_ESOUND) \|\| ${HAVE_GNOME:Mesound}!="") && !defined(WITHOUT_ESOUND)	301	.if (defined(WITH_ESOUND) \|\| defined(HAVE_GNOME) && ${HAVE_GNOME:Mesound}!="") && !defined(WITHOUT_ESOUND) && !defined(WITHOUT_X11)
300	USE_GNOME+= esound	302	USE_GNOME+= esound
301	CONFIGURE_ARGS+=--enable-esd	303	CONFIGURE_ARGS+=--enable-esd
302	.else	304	.else
Lines 502-508 Link Here
502	CONFIGURE_ARGS+=--disable-smb	504	CONFIGURE_ARGS+=--disable-smb
503	.endif	505	.endif
504		506
505	.if !defined(WITHOUT_SDL)	507	.if !defined(WITHOUT_SDL) && !defined(WITHOUT_X11)
506	USE_SDL= image	508	USE_SDL= image
507	CONFIGURE_ARGS+=--enable-sdl	509	CONFIGURE_ARGS+=--enable-sdl
508	.else	510	.else
Lines 532-538 Link Here
532	CONFIGURE_ARGS+=--disable-sout	534	CONFIGURE_ARGS+=--disable-sout
533	.endif	535	.endif
534		536
535	.if (defined(WITH_SVG) \|\| ${HAVE_GNOME:Mlibrsvg2}!="") && !defined(WITHOUT_SVG)	537	.if (defined(WITH_SVG) \|\| defined(HAVE_GNOME) && ${HAVE_GNOME:Mlibrsvg2}!="") && !defined(WITHOUT_SVG) && !defined(WITHOUT_X11)
536	USE_GNOME+= librsvg2	538	USE_GNOME+= librsvg2
537	CONFIGURE_ARGS+=--enable-svg	539	CONFIGURE_ARGS+=--enable-svg
538	.else	540	.else
Lines 587-592 Link Here
587	.if defined(WITHOUT_V4L)	589	.if defined(WITHOUT_V4L)
588	CONFIGURE_ARGS+=--disable-v4l	590	CONFIGURE_ARGS+=--disable-v4l
589	.else	591	.else
		592	BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
590	CONFIGURE_ARGS+=--enable-v4l	593	CONFIGURE_ARGS+=--enable-v4l
591	.endif	594	.endif
592		595
Lines 594-599 Link Here
594	CONFIGURE_ARGS+=--disable-x11	597	CONFIGURE_ARGS+=--disable-x11
595	.else	598	.else
596	USE_XORG= xpm	599	USE_XORG= xpm
		600	BUILD_DEPENDS+= ${LOCALBASE}/include/X11/xpm.h:${PORTSDIR}/x11/libXpm
597	CONFIGURE_ARGS+=--enable-x11	601	CONFIGURE_ARGS+=--enable-x11
598	.endif	602	.endif
599		603

Lines 257-266 Link Here

(-)multimedia/vlc/Makefile.inc (+4 lines)
257	${SED} -e 's\|^\|lib/\|' >> ${PLIST} \	257	${SED} -e 's\|^\|lib/\|' >> ${PLIST} \
258	&& ${FIND} -d * -type d \| \	258	&& ${FIND} -d * -type d \| \
259	${SED} -e 's\|^\|@dirrm lib/\|' >> ${PLIST}	259	${SED} -e 's\|^\|@dirrm lib/\|' >> ${PLIST}
		260	.if !defined(WITHOUT_X11)
260	cd ${FAKEDIR}/libdata && ${FIND} -s * -type f -o -type l\| \	261	cd ${FAKEDIR}/libdata && ${FIND} -s * -type f -o -type l\| \
261	${SED} -e 's\|^\|libdata/\|' >> ${PLIST} \	262	${SED} -e 's\|^\|libdata/\|' >> ${PLIST} \
262	&& ${FIND} -d * -type d \| \	263	&& ${FIND} -d * -type d \| \
263	${SED} -e 's\|^\|@dirrmtry libdata/\|' >> ${PLIST}	264	${SED} -e 's\|^\|@dirrmtry libdata/\|' >> ${PLIST}
		265	.endif
264	.for dir in vlc	266	.for dir in vlc
265	cd ${FAKEDIR}/share/${dir} && ${FIND} -s * -type f -o -type l \| \	267	cd ${FAKEDIR}/share/${dir} && ${FIND} -s * -type f -o -type l \| \
266	${SED} -e 's\|^\|share/${dir}/\|' >> ${PLIST} \	268	${SED} -e 's\|^\|share/${dir}/\|' >> ${PLIST} \
Lines 297-304 Link Here
297	${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include	299	${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include
298	cd ${FAKEDIR}/lib && ${FIND} . \| \	300	cd ${FAKEDIR}/lib && ${FIND} . \| \
299	${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib	301	${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib
		302	.if !defined(WITHOUT_X11)
300	cd ${FAKEDIR}/libdata && ${FIND} . \| \	303	cd ${FAKEDIR}/libdata && ${FIND} . \| \
301	${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/libdata	304	${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/libdata
		305	.endif
302	cd ${FAKEDIR}/share && ${FIND} . \| \	306	cd ${FAKEDIR}/share && ${FIND} . \| \
303	${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share	307	${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share
304	.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)	308	.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)

Line 0 Link Here

(-)multimedia/vlc/files/patch-configure-dvbpsi (+20 lines)
	1	--- configure.orig 2009-09-23 23:31:31.000000000 +0100
	2	+++ configure 2009-09-23 23:30:51.000000000 +0100
	3	@@ -29130,7 +29130,16 @@
	4	CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}"
	5	for ac_header in dvbpsi/dr.h
	6	do :
	7	- ac_fn_c_check_header_mongrel "$LINENO" "dvbpsi/dr.h" "ac_cv_header_dvbpsi_dr_h" "$ac_includes_default"
	8	+ ac_fn_c_check_header_compile "$LINENO" "dvbpsi/dr.h" "ac_cv_header_dvbpsi_dr_h" "#if defined( HAVE_STDINT_H )
	9	+# include <stdint.h>
	10	+#elif defined( HAVE_INTTYPES_H )
	11	+# include <inttypes.h>
	12	+#endif
	13	+#include <dvbpsi/dvbpsi.h>
	14	+#include <dvbpsi/descriptor.h>
	15	+#include <dvbpsi/pat.h>
	16	+#include <dvbpsi/pmt.h>
	17	+"
	18	if test "x$ac_cv_header_dvbpsi_dr_h" = x""yes; then :
	19	cat >>confdefs.h <<_ACEOF
	20	#define HAVE_DVBPSI_DR_H 1

Lines 73-86 Link Here

(-)multimedia/vlc/files/patch-v4l (-11 lines)
73	p_sys->i_video_pts = p_block->i_pts = p_block->i_dts = mdate();	73	p_sys->i_video_pts = p_block->i_pts = p_block->i_dts = mdate();
74		74
75	return p_block;	75	return p_block;
76	--- configure.orig Mon Jun 12 10:44:45 2006
77	+++ configure Mon Jun 12 10:46:11 2006
78	@@ -39400,7 +39400,7 @@
79	enableval="$enable_v4l"
80	fi
81
82	-if test "${enable_v4l}" = "yes"
83	+if true
84	then
85
86	# Check whether --with-v4l or --without-v4l was given.