- Remove MMX, SSE and SSE2 options. It should be now safe to build on

  amd64 without disabling them.
- Bump PORTREVISION.

2 files changed, 35 insertions, 24 deletions

diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index 5f619d2fa6c9..a853c7afad97 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mlt
 PORTVERSION=	0.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
@@ -40,17 +40,36 @@ OPTIONS=	AVFORMAT	"Avformat module" on \
 		GTK2	"GTK2 module" on \
 		JACKRACK	"JACK Rack module" off \
 		KINO	"Kino module" on \
-		MMX	"MMX support (might cause problems on amd64)" off \
 		QIMAGE	"Qimage module" on \
 		RESAMPLE	"Secret Rabbit Code module" on \
 		SOX	"Sound eXchange module" on \
-		SSE	"SSE support (requires MMX)" off \
-		SSE2	"SSE2 support (requires SSE)" off \
 		SWFDEC	"Swfdec module" on \
 		VORBIS	"Vorbis module" on
 
+#MMX	"MMX support (might cause problems on amd64)" off \
+#SSE	"SSE support (requires MMX)" off \
+#SSE2	"SSE2 support (requires SSE)" off \
+
 .include <bsd.port.options.mk>
 
+#.ifdef(WITH_MMX)
+#CONFIGURE_ARGS+=	--enable-mmx
+#.else
+#CONFIGURE_ARGS+=	--disable-mmx
+#.endif
+
+#.ifdef(WITH_SSE)
+#CONFIGURE_ARGS+=	--enable-sse
+#.else
+#CONFIGURE_ARGS+=	--disable-sse
+#.endif
+
+#.ifdef(WITH_SSE2)
+#CONFIGURE_ARGS+=	--enable-sse2
+#.else
+#CONFIGURE_ARGS+=	--disable-sse2
+#.endif
+
 .ifndef(WITHOUT_AVFORMAT)
 LIB_DEPENDS+=	avformat.1:${PORTSDIR}/multimedia/ffmpeg
 CONFIGURE_ARGS+=	--enable-avformat \
@@ -109,12 +128,6 @@ CONFIGURE_ARGS+=	--disable-kino
 PLIST_SUB+=	KINO="@comment "
 .endif
 
-.ifdef(WITH_MMX)
-CONFIGURE_ARGS+=	--enable-mmx
-.else
-CONFIGURE_ARGS+=	--disable-mmx
-.endif
-
 .ifndef(WITHOUT_QIMAGE)
 LIB_DEPENDS+=	exif.12:${PORTSDIR}/graphics/libexif
 QT_COMPONENTS+=	gui svg xml
@@ -145,18 +158,6 @@ CONFIGURE_ARGS+=	--disable-sox
 PLIST_SUB+=	SOX="@comment "
 .endif
 
-.ifdef(WITH_SSE)
-CONFIGURE_ARGS+=	--enable-sse
-.else
-CONFIGURE_ARGS+=	--disable-sse
-.endif
-
-.ifdef(WITH_SSE2)
-CONFIGURE_ARGS+=	--enable-sse2
-.else
-CONFIGURE_ARGS+=	--disable-sse2
-.endif
-
 .ifndef(WITHOUT_SWFDEC)
 LIB_DEPENDS+=	swfdec-0.8.0:${PORTSDIR}/graphics/swfdec
 CONFIGURE_ARGS+=	--enable-swfdec
@@ -177,8 +178,7 @@ PLIST_SUB+=	VORBIS="@comment "
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/src/swig/*/build
+		${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/src/framework/Makefile \
 		${WRKSRC}/src/melt/Makefile \
diff --git a/multimedia/mlt/files/patch-configure b/multimedia/mlt/files/patch-configure
new file mode 100644
index 000000000000..803f18cad84f
--- /dev/null
+++ b/multimedia/mlt/files/patch-configure
@@ -0,0 +1,11 @@
+--- ./configure.orig	2011-03-08 15:06:10.939771052 +0100
++++ ./configure	2011-03-08 15:07:43.759770437 +0100
+@@ -90,7 +90,7 @@
+ 		echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
+ 		;;
+ 		FreeBSD)
+-		[ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
++		[ "$(uname -m)" = "amd64" -o "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
+ 		echo "OPTIMISATIONS+=-ffast-math"
+ 		echo "CFLAGS+=-pthread"
+ 		echo "SHFLAGS=-shared"