- Upgrade to latest version and fix compilation on freebsd 6.4

(patches accepted in upstream).
- pet portlint

PR:		ports/13186
Submitted by:	Alberto Villa (maintainer)

8 files changed, 66 insertions, 22 deletions

diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index 686400c16715..e3f9ca5f1cb3 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	mlt
-PORTVERSION=	0.3.2
+PORTVERSION=	0.3.6
 CATEGORIES=	multimedia
 MASTER_SITES=	SFE
 
@@ -35,10 +35,11 @@ OPTIONS=	AVFORMAT	"Avformat module" on \
 		GTK2	"GTK2 module" on \
 		JACKRACK	"JACK Rack module" on \
 		KINO	"Kino module" on \
-		MMX	"MMX support (could have problems on 64 bits CPUs)" 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>
@@ -137,6 +138,15 @@ 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
@@ -147,15 +157,14 @@ PLIST_SUB+=	VORBIS="@comment "
 .endif
 
 .if ${ARCH} == "sparc64"
-IGNORE=		Does not compile on sparc64 (invokes i386 asm)
+IGNORE=		does not compile on sparc64 (invokes i386 asm)
 .endif
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/src/framework/Makefile \
-		${WRKSRC}/src/valerie/Makefile
+		${WRKSRC}/src/*/Makefile
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
 
diff --git a/multimedia/mlt/distinfo b/multimedia/mlt/distinfo
index 7d4036477519..3a423e4201fc 100644
--- a/multimedia/mlt/distinfo
+++ b/multimedia/mlt/distinfo
@@ -1,3 +1,3 @@
-MD5 (mlt-0.3.2.tar.gz) = 0b463e1cef1d03fd06742eb3303b0dd4
-SHA256 (mlt-0.3.2.tar.gz) = b04cb4bf34d27a990e41ff2cf7649602c2124a9db1d1155f422f999292591a8a
-SIZE (mlt-0.3.2.tar.gz) = 706318
+MD5 (mlt-0.3.6.tar.gz) = 70c8b9bf4593c37d2258670fc4fe1913
+SHA256 (mlt-0.3.6.tar.gz) = da82437e3a03f6ef835c3546aa2c8c0fb16a0d47925c3c7d56db3db90d2ecfc5
+SIZE (mlt-0.3.6.tar.gz) = 755211
diff --git a/multimedia/mlt/files/patch-src-albino-Makefile b/multimedia/mlt/files/patch-src-albino-Makefile
new file mode 100644
index 000000000000..29b837b3726f
--- /dev/null
+++ b/multimedia/mlt/files/patch-src-albino-Makefile
@@ -0,0 +1,11 @@
+--- src/albino/Makefile.orig	2009-02-16 18:36:06.000000000 +0000
++++ src/albino/Makefile	2009-02-16 18:36:28.000000000 +0000
+@@ -6,7 +6,7 @@
+ 
+ CFLAGS += -I.. $(RDYNAMIC)
+ 
+-LDFLAGS += -L../miracle -lmiracle -L../valerie -lvalerie -L../miracle -lmiracle -L../framework -lmlt
++LDFLAGS += -L../miracle -lmiracle -L../valerie -lvalerie -L../miracle -lmiracle -L../framework -lmlt -lpthread
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
diff --git a/multimedia/mlt/files/patch-src-humperdink-Makefile b/multimedia/mlt/files/patch-src-humperdink-Makefile
new file mode 100644
index 000000000000..5ae2da2539cb
--- /dev/null
+++ b/multimedia/mlt/files/patch-src-humperdink-Makefile
@@ -0,0 +1,11 @@
+--- src/humperdink/Makefile.orig	2009-02-16 18:32:56.000000000 +0000
++++ src/humperdink/Makefile	2009-02-16 18:33:04.000000000 +0000
+@@ -8,7 +8,7 @@
+ 
+ CFLAGS += -I.. $(RDYNAMIC)
+ 
+-LDFLAGS += -L../valerie -L../framework -lvalerie -lmlt
++LDFLAGS += -L../valerie -L../framework -lvalerie -lmlt -lpthread
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
diff --git a/multimedia/mlt/files/patch-src-inigo-Makefile b/multimedia/mlt/files/patch-src-inigo-Makefile
new file mode 100644
index 000000000000..21118dac6dfb
--- /dev/null
+++ b/multimedia/mlt/files/patch-src-inigo-Makefile
@@ -0,0 +1,11 @@
+--- src/inigo/Makefile.orig	2009-02-16 18:26:08.000000000 +0000
++++ src/inigo/Makefile	2009-02-16 18:26:18.000000000 +0000
+@@ -7,7 +7,7 @@
+ 
+ CFLAGS += -I.. $(RDYNAMIC) -DVERSION=\"$(version)\"
+ 
+-LDFLAGS += -L../framework -lmlt 
++LDFLAGS += -L../framework -lmlt -lpthread
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
diff --git a/multimedia/mlt/files/patch-src-miracle-Makefile b/multimedia/mlt/files/patch-src-miracle-Makefile
new file mode 100644
index 000000000000..3d495dca7a88
--- /dev/null
+++ b/multimedia/mlt/files/patch-src-miracle-Makefile
@@ -0,0 +1,11 @@
+--- src/miracle/Makefile.orig	2009-02-16 18:29:23.000000000 +0000
++++ src/miracle/Makefile	2009-02-16 18:29:43.000000000 +0000
+@@ -32,7 +32,7 @@
+ 
+ CFLAGS += -I.. $(RDYNAMIC)
+ 
+-LDFLAGS += -L../valerie -lvalerie -L../framework -lmlt 
++LDFLAGS += -L../valerie -lvalerie -L../framework -lmlt -lpthread
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
diff --git a/multimedia/mlt/files/patch-src-modules-sox-filter_sox.c b/multimedia/mlt/files/patch-src-modules-sox-filter_sox.c
deleted file mode 100644
index ff8b95e5be18..000000000000
--- a/multimedia/mlt/files/patch-src-modules-sox-filter_sox.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/sox/filter_sox.c.orig	2008-12-20 13:29:19.000000000 +0100
-+++ src/modules/sox/filter_sox.c	2008-12-20 13:29:28.000000000 +0100
-@@ -35,7 +35,7 @@
- #	define ST_SUCCESS SOX_SUCCESS
- #	define st_sample_t sox_sample_t
- #	define eff_t sox_effect_t*
--#	define st_size_t sox_size_t
-+#	define st_size_t size_t
- #	define ST_LIB_VERSION_CODE SOX_LIB_VERSION_CODE
- #	define ST_LIB_VERSION SOX_LIB_VERSION
- #	define ST_SIGNED_WORD_TO_SAMPLE(d,clips) SOX_SIGNED_16BIT_TO_SAMPLE(d,clips)
diff --git a/multimedia/mlt/pkg-plist b/multimedia/mlt/pkg-plist
index 3d61cf38e963..f06250eca21e 100644
--- a/multimedia/mlt/pkg-plist
+++ b/multimedia/mlt/pkg-plist
@@ -12,6 +12,7 @@ include/mlt/framework/mlt_field.h
 include/mlt/framework/mlt_filter.h
 include/mlt/framework/mlt_frame.h
 include/mlt/framework/mlt_geometry.h
+include/mlt/framework/mlt_log.h
 include/mlt/framework/mlt_multitrack.h
 include/mlt/framework/mlt_parser.h
 include/mlt/framework/mlt_playlist.h
@@ -39,13 +40,13 @@ 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.2
+lib/libmiracle.so.0.3.6
 lib/libmiracle.so.1
 lib/libmlt.so
-lib/libmlt.so.0.3.2
+lib/libmlt.so.0.3.6
 lib/libmlt.so.1
 lib/libvalerie.so
-lib/libvalerie.so.0.3.2
+lib/libvalerie.so.0.3.6
 lib/libvalerie.so.1
 %%AVFORMAT%%lib/mlt/libmltavformat.so
 lib/mlt/libmltcore.so
@@ -149,6 +150,7 @@ libdata/pkgconfig/mlt-valerie.pc
 %%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
 %%DATADIR%%/profiles/atsc_1080p_24