o Update to 0.7.27.20030122

o USE_QT_VER has to be defined BEFORE <bsd.port.pre.mk>: move QT
  toolkit selection test [1] [2]
o Build VIDIX support if WITH_VIDIX knob: currently requires avifile
  to run as root

PR:		44533 [1]
Submitted by:	maintainer [2],
		dinoex [1]
Approved by:	maintainer

4 files changed, 58 insertions, 23 deletions

diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 8c8baebd4ad6..be4f21d33ec4 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	avifile
-PORTVERSION=	0.7.22.20021129
+PORTVERSION=	0.7.27.20030122
 PORTEPOCH=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://avifile.sourceforge.net/
@@ -34,7 +34,6 @@ CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib `${ECHO_CMD} ${PTHREAD_LIBS}`"
 CONFIGURE_ARGS= --with-gnu-ld --enable-iconv \
 		--disable-v4l \
-		--disable-vidix \
 		--disable-divx4
 CONFIGURE_TARGET=
 
@@ -52,6 +51,20 @@ SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 DIFF?=		/usr/bin/diff
 FMT?=		/usr/bin/fmt
 
+# qt -- USE_QT_VER has to happen befor bsd.port.pre.mk
+.if !defined(WITHOUT_QT)
+. if exists(${X11BASE}/include/qt2/qapp.h)
+USE_QT_VER=	2
+. else
+USE_QT_VER=	3
+. endif
+PLIST_SUB+=	QT=""
+.else
+CONFIGURE_ARGS+=	--without-qt
+
+PLIST_SUB+=	QT="@comment "
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386"
@@ -103,20 +116,6 @@ CONFIGURE_ARGS+=	--disable-mad
 PLIST_SUB+=	MAD="@comment "
 .endif
 
-# qt
-.if !defined(WITHOUT_QT)
-. if exists(${X11BASE}/include/qt2/qapp.h)
-USE_QT_VER=	2
-. else
-USE_QT_VER=	3
-. endif
-PLIST_SUB+=	QT=""
-.else
-CONFIGURE_ARGS+=	--without-qt
-
-PLIST_SUB+=	QT="@comment "
-.endif
-
 # sdl
 .if !defined(WITHOUT_SDL)
 LIB_DEPENDS+=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
@@ -127,6 +126,15 @@ CONFIGURE_ARGS+=	--with-sdl-prefix=${LOCALBASE} \
 CONFIGURE_ARGS+=	--without-sdl
 .endif
 
+# vidix support: requires root privileges
+.if defined(WITH_VIDIX)
+CONFIGURE_ARGS+=	--enable-vidix	
+PLIST_SUB+=	VIDIX=""
+.else
+CONFIGURE_ARGS+=	--disable-vidix
+PLIST_SUB+=	VIDIX="@comment "
+.endif
+
 # libvorbis; thus, libogg
 .if !defined(WITHOUT_VORBIS)
 LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
@@ -171,6 +179,9 @@ pre-everything::
 .if !defined(WITHOUT_SDL)
 	@${ECHO_MSG} "You can disable SDL supported tools by defining WITHOUT_SDL."
 .endif
+.if !defined(WITH_VIDIX)
+	@${ECHO_MSG} "You can enable VIDIX support by defining WITH_VIDIX."
+.endif
 .if !defined(WITHOUT_VORBIS)
 	@${ECHO_MSG} "You can disable vorbis support by defining WITHOUT_VORBIS."
 .endif
@@ -231,11 +242,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|sighandler_t|sig_t|' \
 		${WRKSRC}/samples/misc/benchmark.cpp
 # fix breakage if either auto{conf,make} are installed
+# CFLAGS safeness
 # do not version library names
 # fix incorrect behavior of configure script
 	@${FIND} ${WRKSRC} \( -name Makefile.in -o -name configure \) | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -E -e \
 		's|INSTALL = \@INSTALL\@|INSTALL = ${INSTALL}|; \
+		s!-O4!${CFLAGS}!; \
 		s!-release[[:space:]]+\$$\([^\)]+\)!!; \
 		s!ACLOCAL =!ACLOCAL = ${TRUE} || !; \
 		s!AUTOCONF =!AUTOCONF = ${TRUE} || !; \
diff --git a/multimedia/avifile/distinfo b/multimedia/avifile/distinfo
index 0ef7649b162a..6adcb2bd0cac 100644
--- a/multimedia/avifile/distinfo
+++ b/multimedia/avifile/distinfo
@@ -1 +1 @@
-MD5 (avifile-0.7.22-20021129.tgz) = 0e73a68de65fe65d589d0f18486e503f
+MD5 (avifile-0.7.27-20030122.tgz) = e8431bc88e0f49059077ac7138e7e47d
diff --git a/multimedia/avifile/files/patch-ffmpeg::libavformat::allformats.c b/multimedia/avifile/files/patch-ffmpeg::libavformat::allformats.c
new file mode 100644
index 000000000000..66e6cc02c98f
--- /dev/null
+++ b/multimedia/avifile/files/patch-ffmpeg::libavformat::allformats.c
@@ -0,0 +1,10 @@
+--- ffmpeg/libavformat/allformats.c.orig	Wed Jan 22 17:38:35 2003
++++ ffmpeg/libavformat/allformats.c	Wed Jan 22 17:37:03 2003
+@@ -55,6 +55,7 @@
+ #ifndef CONFIG_WIN32
+     ffm_init();
+ #endif
++#undef CONFIG_VIDEO4LINUX
+ #ifdef CONFIG_VIDEO4LINUX
+     video_grab_init();
+ #endif
diff --git a/multimedia/avifile/pkg-plist b/multimedia/avifile/pkg-plist
index 8acbcf0437db..6dbff48408c1 100644
--- a/multimedia/avifile/pkg-plist
+++ b/multimedia/avifile/pkg-plist
@@ -5,7 +5,6 @@ bin/avimake
 %%QT%%bin/aviplay
 %%QT%%bin/avirecompress
 bin/avitype
-%%WIN32%%bin/mmxnow-config
 include/avifile/Locker.h
 include/avifile/StreamInfo.h
 include/avifile/VideoDPMS.h
@@ -34,7 +33,6 @@ include/avifile/utils.h
 include/avifile/version.h
 include/avifile/videodecoder.h
 include/avifile/videoencoder.h
-%%WIN32%%include/mmxnow.h
 %%AC3_PASS%%lib/avifile/ac3pass.la
 %%AC3_PASS%%lib/avifile/ac3pass.so
 lib/avifile/audiodec.la
@@ -51,6 +49,22 @@ lib/avifile/mp3lame_audioenc.so
 %%LAME%%lib/avifile/mp3lamebin_audioenc.so
 lib/avifile/mpeg_audiodec.la
 lib/avifile/mpeg_audiodec.so
+%%VIDIX%%lib/avifile/vidix/libgenfb.la
+%%VIDIX%%lib/avifile/vidix/libgenfb.so
+%%VIDIX%%lib/avifile/vidix/libmach64.la
+%%VIDIX%%lib/avifile/vidix/libmach64.so
+%%VIDIX%%lib/avifile/vidix/libmga.la
+%%VIDIX%%lib/avifile/vidix/libmga.so
+%%VIDIX%%lib/avifile/vidix/libmga_crtc2.la
+%%VIDIX%%lib/avifile/vidix/libmga_crtc2.so
+%%VIDIX%%lib/avifile/vidix/libnvidia.la
+%%VIDIX%%lib/avifile/vidix/libnvidia.so
+%%VIDIX%%lib/avifile/vidix/libpm3.la
+%%VIDIX%%lib/avifile/vidix/libpm3.so
+%%VIDIX%%lib/avifile/vidix/libradeon.la
+%%VIDIX%%lib/avifile/vidix/libradeon.so
+%%VIDIX%%lib/avifile/vidix/librage128.la
+%%VIDIX%%lib/avifile/vidix/librage128.so
 %%VORBIS%%lib/avifile/vorbis_audio.la
 %%VORBIS%%lib/avifile/vorbis_audio.so
 %%WIN32%%lib/avifile/win32.la
@@ -61,9 +75,6 @@ lib/libaviplay.a
 lib/libaviplay.la
 lib/libaviplay.so
 lib/libaviplay.so.0
-%%WIN32%%lib/libmmxnow.la
-%%WIN32%%lib/libmmxnow.so
-%%WIN32%%lib/libmmxnow.so.0
 %%QT%%lib/libqavm.a
 %%QT%%lib/libqavm.la
 %%QT%%lib/libqavm.so
@@ -79,9 +90,10 @@ share/avifile/pause.ppm
 share/avifile/play.ppm
 share/avifile/stop.ppm
 share/avifile/test.png
+share/avifile/test.xpm
 %%PORTDOCS%%share/doc/avifile/README
 %%PORTDOCS%%@dirrm share/doc/avifile
 @dirrm share/avifile
-@dirrm lib/avifile/vidix
+@unexec rmdir %D/lib/avifile/vidix 2>/dev/null || true
 @dirrm lib/avifile
 @dirrm include/avifile