Fix PLIST hadnling for SIMD extension modules.

Force altivec and x86 simd modules to build.

2 files changed, 29 insertions, 9 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 08ed9b83c42..277232bbdcc 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2008/09/08 18:58:24 ahoka Exp $
+# $NetBSD: Makefile,v 1.59 2008/09/20 22:33:02 ahoka Exp $
 #
 
 DISTNAME=		vlc-0.9.1
+PKGREVISION=		1
 CATEGORIES=		multimedia
 MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/0.9.1/
 EXTRACT_SUFX=		.tar.bz2
@@ -19,6 +20,7 @@ GNU_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
 USE_LANGUAGES=		c99 c++
 USE_DIRS+=		xdg-1.4
+PLIST_VARS+=		x86simd altivec
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
@@ -41,6 +43,16 @@ CONFIGURE_ARGS+=	--enable-cddax \
 			--enable-live555 \
 			--enable-snapshot
 
+# Build optimalized modules
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+PLIST.x86simd=		yes
+CONFIGURE_ARGS+=	--enable-mmx \
+			--enable-sse
+.endif
+.if ${MACHINE_ARCH} == "powerpc"
+PLIST.altivec=		yes
+CONFIGURE_ARGS+=	--enable-altivec
+.endif
 
 INSTALLATION_DIRS+=	${PREFIX}/share/vlc/http/dialogs \
 			${PREFIX}/share/vlc/http/images \
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index db60fdf58f7..5ad4c2ce182 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2008/09/08 18:58:24 ahoka Exp $
+@comment $NetBSD: PLIST,v 1.17 2008/09/20 22:33:02 ahoka Exp $
 ${PLIST.faad}lib/vlc/codec/libfaad_plugin.la
 ${PLIST.dbus}lib/vlc/control/libdbus_plugin.la
 ${PLIST.dbus}lib/vlc/misc/libinhibit_plugin.la
@@ -17,6 +17,18 @@ ${PLIST.sdl}lib/vlc/codec/libsdl_image_plugin.la
 ${PLIST.sdl}lib/vlc/audio_output/libaout_sdl_plugin.la
 ${PLIST.sdl}lib/vlc/video_output/libvout_sdl_plugin.la
 ${PLIST.esound}lib/vlc/audio_output/libesd_plugin.la
+${PLIST.altivec}lib/vlc/video_chroma/libi420_yuy2_altivec_plugin.la
+${PLIST.altivec}lib/vlc/misc/libmemcpyaltivec_plugin.la
+${PLIST.x86simd}lib/vlc/video_chroma/libi420_rgb_mmx_plugin.la
+${PLIST.x86simd}lib/vlc/misc/libmemcpy3dn_plugin.la
+${PLIST.x86simd}lib/vlc/misc/libmemcpymmx_plugin.la
+${PLIST.x86simd}lib/vlc/misc/libmemcpymmxext_plugin.la
+${PLIST.x86simd}lib/vlc/video_chroma/libi420_yuy2_mmx_plugin.la
+${PLIST.x86simd}lib/vlc/video_chroma/libi420_ymga_mmx_plugin.la
+${PLIST.x86simd}lib/vlc/video_chroma/libi422_yuy2_mmx_plugin.la
+${PLIST.x86simd}lib/vlc/video_chroma/libi420_rgb_sse2_plugin.la
+${PLIST.x86simd}lib/vlc/video_chroma/libi420_yuy2_sse2_plugin.la
+${PLIST.x86simd}lib/vlc/video_chroma/libi422_yuy2_sse2_plugin.la
 bin/cvlc
 bin/rvlc
 bin/vlc
@@ -122,6 +134,9 @@ lib/vlc/audio_filter/libspatializer_plugin.la
 lib/vlc/audio_filter/libtrivial_channel_mixer_plugin.la
 lib/vlc/audio_filter/libtrivial_resampler_plugin.la
 lib/vlc/audio_filter/libugly_resampler_plugin.la
+lib/vlc/audio_filter/libdtstofloat32_plugin.a
+lib/vlc/audio_filter/libdtstofloat32_plugin.la
+lib/vlc/audio_filter/libdtstofloat32_plugin.so
 lib/vlc/audio_mixer/libfloat32_mixer_plugin.la
 lib/vlc/audio_mixer/libspdif_mixer_plugin.la
 lib/vlc/audio_mixer/libtrivial_mixer_plugin.la
@@ -209,10 +224,7 @@ lib/vlc/misc/libdummy_plugin.la
 lib/vlc/misc/libexport_plugin.la
 lib/vlc/misc/libfreetype_plugin.la
 lib/vlc/misc/liblogger_plugin.la
-lib/vlc/misc/libmemcpy3dn_plugin.la
 lib/vlc/misc/libmemcpy_plugin.la
-lib/vlc/misc/libmemcpymmx_plugin.la
-lib/vlc/misc/libmemcpymmxext_plugin.la
 lib/vlc/misc/libosd_parser_plugin.la
 lib/vlc/misc/libscreensaver_plugin.la
 lib/vlc/misc/libstats_plugin.la
@@ -250,14 +262,10 @@ lib/vlc/stream_out/libstream_out_rtp_plugin.la
 lib/vlc/stream_out/libstream_out_standard_plugin.la
 lib/vlc/stream_out/libstream_out_transcode_plugin.la
 lib/vlc/video_chroma/libgrey_yuv_plugin.la
-lib/vlc/video_chroma/libi420_rgb_mmx_plugin.la
 lib/vlc/video_chroma/libi420_rgb_plugin.la
-lib/vlc/video_chroma/libi420_ymga_mmx_plugin.la
 lib/vlc/video_chroma/libi420_ymga_plugin.la
-lib/vlc/video_chroma/libi420_yuy2_mmx_plugin.la
 lib/vlc/video_chroma/libi420_yuy2_plugin.la
 lib/vlc/video_chroma/libi422_i420_plugin.la
-lib/vlc/video_chroma/libi422_yuy2_mmx_plugin.la
 lib/vlc/video_chroma/libi422_yuy2_plugin.la
 lib/vlc/video_chroma/libyuy2_i420_plugin.la
 lib/vlc/video_chroma/libyuy2_i422_plugin.la