12 files changed, 53 insertions, 233 deletions

diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index ab5f339480a2..b13951ea91d2 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	mlt
-PORTVERSION=	0.3.8
+PORTVERSION=	0.4.2
 CATEGORIES=	multimedia
 MASTER_SITES=	SFE
 
@@ -18,15 +18,16 @@ USE_SDL=	image
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug \
-		--enable-gpl \
-		--enable-sdl \
-		--enable-westley
+		--enable-gpl
 USE_GMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/mlt
 
+NOT_FOR_ARCHS=	sparc64
+NOT_FOR_ARCHS_REASON_sparc64=	does not compile on sparc64 (invokes i386 asm)
+
 PORTDOCS=	AUTHORS ChangeLog COPYING \
-		GPL NEWS README docs demo
+		NEWS README docs demo
 
 OPTIONS=	AVFORMAT	"Avformat module" on \
 		DV	"Quasar DV Codec module" on \
@@ -34,19 +35,15 @@ OPTIONS=	AVFORMAT	"Avformat module" on \
 		GTK2	"GTK2 module" on \
 		JACKRACK	"JACK Rack module" on \
 		KINO	"Kino module" on \
-		MMX	"MMX support (ignored on x86-64)" on \
 		QIMAGE	"Qimage module" on \
 		RESAMPLE	"Secret Rabbit Code module" on \
 		SOX	"Sound eXchange module" on \
-		SSE	"SSE support (requires MMX)" on \
 		VORBIS	"Vorbis module" on
 
 .include <bsd.port.pre.mk>
 
 .ifdef(WITH_AVFORMAT)
-# one of them could be disabled
-LIB_DEPENDS+=	avformat.1:${PORTSDIR}/multimedia/ffmpeg \
-		swscale.1:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	avformat.1:${PORTSDIR}/multimedia/ffmpeg
 CONFIGURE_ARGS+=	--enable-avformat \
 			--avformat-swscale
 PLIST_SUB+=	AVFORMAT=""
@@ -102,12 +99,6 @@ CONFIGURE+ARGS+=	--disable-kino
 PLIST_SUB+=	KINO="@comment "
 .endif
 
-.if defined(WITH_MMX) && ${MACHINE_CPU:Mmmx} != ""
-CONFIGURE_ARGS+=	--enable-mmx
-.else
-CONFIGURE_ARGS+=	--disable-mmx
-.endif
-
 .ifdef(WITH_QIMAGE)
 CONFIGURE_ARGS+=	--enable-qimage \
 			--qimage-includedir="${QT_INCDIR}" \
@@ -137,15 +128,6 @@ CONFIGURE_ARGS+=	--disable-sox
 PLIST_SUB+=	SOX="@comment "
 .endif
 
-# sse can be enabled only with mmx
-.if defined(WITH_MMX) && ${MACHINE_CPU:Mmmx} != ""
-.if defined(WITH_SSE) && ${MACHINE_CPU:Msse} != ""
-CONFIGURE_ARGS+=	--enable-sse
-.else
-CONFIGURE_ARGS+=	--disable-sse
-.endif
-.endif
-
 .ifdef(WITH_VORBIS)
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=	--enable-vorbis
@@ -155,15 +137,14 @@ CONFIGURE_ARGS+=	--disable-vorbis
 PLIST_SUB+=	VORBIS="@comment "
 .endif
 
-.if ${ARCH} == "sparc64"
-IGNORE=		does not compile on sparc64 (invokes i386 asm)
-.endif
-
 pre-configure:
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
+		${WRKSRC}/configure \
+		${WRKSRC}/src/swig/*/build
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/src/*/Makefile
+		${WRKSRC}/src/framework/Makefile \
+		${WRKSRC}/src/melt/Makefile \
+		${WRKSRC}/src/modules/*/Makefile
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
 
diff --git a/multimedia/mlt/distinfo b/multimedia/mlt/distinfo
index 4699e0d5a4c0..888e8417140d 100644
--- a/multimedia/mlt/distinfo
+++ b/multimedia/mlt/distinfo
@@ -1,3 +1,3 @@
-MD5 (mlt-0.3.8.tar.gz) = 5d7f8d4ecda0d57da35e3ff333073d12
-SHA256 (mlt-0.3.8.tar.gz) = cea314c08cf2a9256ef50f9cd09202f1c8c778ad278c324112e3c8a9d3b28e24
-SIZE (mlt-0.3.8.tar.gz) = 765811
+MD5 (mlt-0.4.2.tar.gz) = e1f3d89989571d0c5efccfb3d96f345c
+SHA256 (mlt-0.4.2.tar.gz) = 069abee48f9400ad8af0b63a55811d666a2e049221523e434b59d53908619b04
+SIZE (mlt-0.4.2.tar.gz) = 734746
diff --git a/multimedia/mlt/files/patch-src-modules-avformat-Makefile b/multimedia/mlt/files/patch-src-modules-avformat-Makefile
deleted file mode 100644
index 68e02d8a139a..000000000000
--- a/multimedia/mlt/files/patch-src-modules-avformat-Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/modules/avformat/Makefile.orig	2009-04-22 11:12:04.000000000 +0200
-+++ src/modules/avformat/Makefile	2009-04-22 11:15:13.000000000 +0200
-@@ -1,6 +1,13 @@
- include ../../../config.mak
-+
-+CFLAGS += -I../..
-+
-+LDFLAGS += -L../../framework -lmlt
-+
- include config.mak
- 
-+LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS)
-+
- ifndef CODECS
- TARGET = ../libmltffmpeg$(LIBSUF)
- else
-@@ -25,12 +32,6 @@
- CFLAGS += -DCODECS
- endif
- 
--CFLAGS+=-I../..
--
--LDFLAGS+=-L../../framework
--
--LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
--
- ifdef SWSCALE
- 	CFLAGS+=-DSWSCALE
- 	LDFLAGS+=-lswscale$(AVFORMAT_SUFFIX)
diff --git a/multimedia/mlt/files/patch-src-modules-dv-Makefile b/multimedia/mlt/files/patch-src-modules-dv-Makefile
deleted file mode 100644
index bdc0264fb24e..000000000000
--- a/multimedia/mlt/files/patch-src-modules-dv-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/modules/dv/Makefile.orig	2009-04-22 11:18:29.000000000 +0200
-+++ src/modules/dv/Makefile	2009-04-22 11:18:48.000000000 +0200
-@@ -8,9 +8,9 @@
- 
- CFLAGS += `pkg-config --cflags libdv` -I../..
- 
-+LDFLAGS+=-L../../framework -lmlt
- LDFLAGS += `pkg-config --libs libdv`
- 
--LDFLAGS+=-L../../framework -lmlt
- 
- SRCS := $(OBJS:.o=.c)
- 
diff --git a/multimedia/mlt/files/patch-src-modules-gtk2-Makefile b/multimedia/mlt/files/patch-src-modules-gtk2-Makefile
deleted file mode 100644
index 1f22d9f5ca53..000000000000
--- a/multimedia/mlt/files/patch-src-modules-gtk2-Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/modules/gtk2/Makefile.orig	2009-04-22 11:19:10.000000000 +0200
-+++ src/modules/gtk2/Makefile	2009-04-22 11:19:34.000000000 +0200
-@@ -5,6 +5,9 @@
- 
- OBJS = factory.o
- 
-+CFLAGS += -I../..
-+LDFLAGS+=-L../../framework -lmlt
-+
- ifdef USE_GTK2
- OBJS += consumer_gtk2.o
- CFLAGS += `pkg-config gtk+-2.0 --cflags`
-@@ -29,9 +32,6 @@
- LDFLAGS += `pkg-config pangoft2 --libs`
- endif
- 
--CFLAGS += -I../..
--LDFLAGS+=-L../../framework -lmlt
--
- SRCS := $(OBJS:.o=.c)
- 
- all: 	$(TARGET)
diff --git a/multimedia/mlt/files/patch-src-modules-jackrack-Makefile b/multimedia/mlt/files/patch-src-modules-jackrack-Makefile
deleted file mode 100644
index 535cb709de21..000000000000
--- a/multimedia/mlt/files/patch-src-modules-jackrack-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/modules/jackrack/Makefile.orig	2009-04-22 11:19:54.000000000 +0200
-+++ src/modules/jackrack/Makefile	2009-04-22 11:20:06.000000000 +0200
-@@ -17,11 +17,11 @@
- CFLAGS += `xml2-config --cflags`
- CFLAGS += `pkg-config glib-2.0 --cflags` 
- 
-+LDFLAGS+=-L../../framework -lmlt
- LDFLAGS += `pkg-config --libs jack`
- LDFLAGS += `xml2-config --libs`
- LDFLAGS += `pkg-config glib-2.0 --libs`
- 
--LDFLAGS+=-L../../framework -lmlt
- 
- SRCS := $(OBJS:.o=.c)
- 
diff --git a/multimedia/mlt/files/patch-src-modules-resample-Makefile b/multimedia/mlt/files/patch-src-modules-resample-Makefile
deleted file mode 100644
index 4c1f7035d5b9..000000000000
--- a/multimedia/mlt/files/patch-src-modules-resample-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/modules/resample/Makefile.orig	2009-04-22 11:02:49.000000000 +0200
-+++ src/modules/resample/Makefile	2009-04-22 11:04:43.000000000 +0200
-@@ -6,10 +6,10 @@
- 	   filter_resample.o 
- 
- CFLAGS += -I../..
-+CFLAGS += `pkg-config --cflags samplerate`
- 
--LDFLAGS += -lsamplerate
--
--LDFLAGS+=-L../../framework -lmlt
-+LDFLAGS += -L../../framework -lmlt
-+LDFLAGS += `pkg-config --libs samplerate`
- 
- SRCS := $(OBJS:.o=.c)
- 
diff --git a/multimedia/mlt/files/patch-src-modules-sdl-Makefile b/multimedia/mlt/files/patch-src-modules-sdl-Makefile
deleted file mode 100644
index b2ef64e2ec97..000000000000
--- a/multimedia/mlt/files/patch-src-modules-sdl-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/modules/sdl/Makefile.orig	2009-04-22 11:21:20.000000000 +0200
-+++ src/modules/sdl/Makefile	2009-04-22 11:21:35.000000000 +0200
-@@ -18,9 +18,9 @@
- 
- CFLAGS +=-I../.. `sdl-config --cflags`
- 
-+LDFLAGS +=-L../../framework -lmlt
- LDFLAGS +=`sdl-config --libs`
- 
--LDFLAGS +=-L../../framework -lmlt
- 
- ifeq ($(WITH_SDL_IMAGE),1)
- OBJS += producer_sdl_image.o
diff --git a/multimedia/mlt/files/patch-src-modules-sox-Makefile b/multimedia/mlt/files/patch-src-modules-sox-Makefile
deleted file mode 100644
index f8aad39014d4..000000000000
--- a/multimedia/mlt/files/patch-src-modules-sox-Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/modules/sox/Makefile.orig	2009-04-22 11:21:46.000000000 +0200
-+++ src/modules/sox/Makefile	2009-04-22 11:22:11.000000000 +0200
-@@ -1,4 +1,9 @@
- include ../../../config.mak
-+
-+CFLAGS += -I../../
-+
-+LDFLAGS += -L../../framework -lmlt
-+
- include config.mak
- 
- TARGET = ../libmltsox$(LIBSUF)
-@@ -6,10 +11,6 @@
- OBJS = factory.o \
- 	   filter_sox.o 
- 
--CFLAGS += -I../../
--
--LDFLAGS += -L../../framework -lmlt
--
- SRCS := $(OBJS:.o=.c)
- 
- all: 	$(TARGET)
diff --git a/multimedia/mlt/files/patch-src-modules-vorbis-Makefile b/multimedia/mlt/files/patch-src-modules-vorbis-Makefile
deleted file mode 100644
index 8681e65bbef1..000000000000
--- a/multimedia/mlt/files/patch-src-modules-vorbis-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/modules/vorbis/Makefile.orig	2009-04-22 11:04:56.000000000 +0200
-+++ src/modules/vorbis/Makefile	2009-04-22 11:06:14.000000000 +0200
-@@ -6,10 +6,12 @@
- 	   producer_vorbis.o
- 
- CFLAGS += -I../..
-+CFLAGS += `pkg-config --cflags vorbis`
-+CFLAGS += `pkg-config --cflags vorbisfile`
- 
--LDFLAGS += -lvorbisfile -lvorbis
--
--LDFLAGS+=-L../../framework -lmlt
-+LDFLAGS += -L../../framework -lmlt
-+LDFLAGS += `pkg-config --libs vorbis`
-+LDFLAGS += `pkg-config --libs vorbisfile`
- 
- SRCS := $(OBJS:.o=.c)
- 
diff --git a/multimedia/mlt/files/patch-src-modules-westley-Makefile b/multimedia/mlt/files/patch-src-modules-westley-Makefile
deleted file mode 100644
index 3dbe1449c702..000000000000
--- a/multimedia/mlt/files/patch-src-modules-westley-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/modules/westley/Makefile.orig	2009-04-22 11:22:27.000000000 +0200
-+++ src/modules/westley/Makefile	2009-04-22 11:22:41.000000000 +0200
-@@ -8,9 +8,9 @@
- 
- CFLAGS += -I../../ `xml2-config --cflags`
- 
-+LDFLAGS+=-L../../framework -lmlt
- LDFLAGS += `xml2-config --libs`
- 
--LDFLAGS+=-L../../framework -lmlt
- 
- SRCS := $(OBJS:.o=.c)
- 
diff --git a/multimedia/mlt/pkg-plist b/multimedia/mlt/pkg-plist
index 966e8b3616a3..3644531dd8cc 100644
--- a/multimedia/mlt/pkg-plist
+++ b/multimedia/mlt/pkg-plist
@@ -1,8 +1,27 @@
-bin/albino
-bin/humperdink
-bin/inigo
-bin/miracle
-bin/mlt-config
+bin/melt
+include/mlt++/Mlt.h
+include/mlt++/MltConsumer.h
+include/mlt++/MltDeque.h
+include/mlt++/MltEvent.h
+include/mlt++/MltFactory.h
+include/mlt++/MltField.h
+include/mlt++/MltFilter.h
+include/mlt++/MltFilteredConsumer.h
+include/mlt++/MltFrame.h
+include/mlt++/MltGeometry.h
+include/mlt++/MltMultitrack.h
+include/mlt++/MltParser.h
+include/mlt++/MltPlaylist.h
+include/mlt++/MltProducer.h
+include/mlt++/MltProfile.h
+include/mlt++/MltProperties.h
+include/mlt++/MltPushConsumer.h
+include/mlt++/MltRepository.h
+include/mlt++/MltService.h
+include/mlt++/MltTokeniser.h
+include/mlt++/MltTractor.h
+include/mlt++/MltTransition.h
+include/mlt++/config.h
 include/mlt/framework/mlt.h
 include/mlt/framework/mlt_cache.h
 include/mlt/framework/mlt_consumer.h
@@ -28,39 +47,23 @@ include/mlt/framework/mlt_tokeniser.h
 include/mlt/framework/mlt_tractor.h
 include/mlt/framework/mlt_transition.h
 include/mlt/framework/mlt_types.h
-include/mlt/miracle/miracle_local.h
-include/mlt/miracle/miracle_log.h
-include/mlt/miracle/miracle_server.h
-include/mlt/valerie/valerie.h
-include/mlt/valerie/valerie_notifier.h
-include/mlt/valerie/valerie_parser.h
-include/mlt/valerie/valerie_remote.h
-include/mlt/valerie/valerie_response.h
-include/mlt/valerie/valerie_socket.h
-include/mlt/valerie/valerie_status.h
-include/mlt/valerie/valerie_tokeniser.h
-include/mlt/valerie/valerie_util.h
-lib/libmiracle.so
-lib/libmiracle.so.0.3.8
-lib/libmiracle.so.1
+lib/libmlt++.so
+lib/libmlt++.so.0.4.2
+lib/libmlt++.so.2
 lib/libmlt.so
-lib/libmlt.so.0.3.8
+lib/libmlt.so.0.4.2
 lib/libmlt.so.1
-lib/libvalerie.so
-lib/libvalerie.so.0.3.8
-lib/libvalerie.so.1
 %%AVFORMAT%%lib/mlt/libmltavformat.so
 lib/mlt/libmltcore.so
 lib/mlt/libmltdgraft.so
 %%DV%%lib/mlt/libmltdv.so
 lib/mlt/libmlteffectv.so
-lib/mlt/libmltfezzik.so
 %%FREI0R%%lib/mlt/libmltfrei0r.so
 %%GTK2%%lib/mlt/libmltgtk2.so
-lib/mlt/libmltinigo.so
 %%JACKRACK%%lib/mlt/libmltjackrack.so
 lib/mlt/libmltkdenlive.so
 %%KINO%%lib/mlt/libmltkino.so
+lib/mlt/libmltmelt.so
 lib/mlt/libmltmotion_est.so
 lib/mlt/libmltnormalize.so
 lib/mlt/libmltoldfilm.so
@@ -69,16 +72,16 @@ lib/mlt/libmltplus.so
 %%RESAMPLE%%lib/mlt/libmltresample.so
 lib/mlt/libmltsdl.so
 %%SOX%%lib/mlt/libmltsox.so
-lib/mlt/libmltvalerie.so
 lib/mlt/libmltvmfx.so
 %%VORBIS%%lib/mlt/libmltvorbis.so
-lib/mlt/libmltwestley.so
 lib/mlt/libmltxine.so
+lib/mlt/libmltxml.so
+libdata/pkgconfig/mlt++.pc
 libdata/pkgconfig/mlt-framework.pc
-libdata/pkgconfig/mlt-miracle.pc
-libdata/pkgconfig/mlt-valerie.pc
 %%AVFORMAT%%%%DATADIR%%/avformat/producer_avformat.yml
-%%DATADIR%%/data_fx.properties
+%%DATADIR%%/core/data_fx.properties
+%%DATADIR%%/core/loader.dict
+%%DATADIR%%/core/loader.ini
 %%DATADIR%%/feeds/NTSC/data_fx.properties
 %%DATADIR%%/feeds/NTSC/obscure.properties
 %%DATADIR%%/feeds/PAL/border.properties
@@ -86,8 +89,6 @@ libdata/pkgconfig/mlt-valerie.pc
 %%DATADIR%%/feeds/PAL/etv.properties
 %%DATADIR%%/feeds/PAL/example.properties
 %%DATADIR%%/feeds/PAL/obscure.properties
-%%DATADIR%%/fezzik.dict
-%%DATADIR%%/fezzik.ini
 %%DATADIR%%/lumas/NTSC/luma01.pgm
 %%DATADIR%%/lumas/NTSC/luma02.pgm
 %%DATADIR%%/lumas/NTSC/luma03.pgm
@@ -150,7 +151,6 @@ libdata/pkgconfig/mlt-valerie.pc
 %%DATADIR%%/oldfilm/oldfilm.svg
 %%DATADIR%%/oldfilm/tcolor.svg
 %%DATADIR%%/oldfilm/vignette.svg
-%%DATADIR%%/packages.dat
 %%DATADIR%%/profiles/atsc_1080i_50
 %%DATADIR%%/profiles/atsc_1080i_60
 %%DATADIR%%/profiles/atsc_1080p_2398
@@ -194,7 +194,8 @@ libdata/pkgconfig/mlt-valerie.pc
 %%DATADIR%%/profiles/svcd_pal_wide
 %%DATADIR%%/profiles/vcd_ntsc
 %%DATADIR%%/profiles/vcd_pal
-%%DATADIR%%/westley.dtd
+%%DATADIR%%/xml/mlt-xml.dtd
+@dirrm %%DATADIR%%/xml
 @dirrm %%DATADIR%%/profiles
 @dirrm %%DATADIR%%/oldfilm
 @dirrm %%DATADIR%%/lumas/PAL
@@ -203,10 +204,10 @@ libdata/pkgconfig/mlt-valerie.pc
 @dirrm %%DATADIR%%/feeds/PAL
 @dirrm %%DATADIR%%/feeds/NTSC
 @dirrm %%DATADIR%%/feeds
+@dirrm %%DATADIR%%/core
 %%AVFORMAT%%@dirrm %%DATADIR%%/avformat
 @dirrm %%DATADIR%%
 @dirrm lib/mlt
-@dirrm include/mlt/valerie
-@dirrm include/mlt/miracle
 @dirrm include/mlt/framework
+@dirrm include/mlt++
 @dirrm include/mlt