<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/745ebf602ab8d2b02ccb4eb5fef8b5580f62dca9">https://github.com/macports/macports-ports/commit/745ebf602ab8d2b02ccb4eb5fef8b5580f62dca9</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 745ebf6 mlt: update to 6.8.0
</span>745ebf6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 745ebf602ab8d2b02ccb4eb5fef8b5580f62dca9
</span>Author: Dan Dennedy <dan@dennedy.org>
AuthorDate: Tue May 15 12:08:13 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> mlt: update to 6.8.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * convert to github PortGroup
</span><span style='display:block; white-space:pre;color:#404040;'> * add my github handle
</span><span style='display:block; white-space:pre;color:#404040;'> * build only against sdl2 (not 1.2) if not disable_sdl variant
</span><span style='display:block; white-space:pre;color:#404040;'> * add dependencies on fftw-3 and libebur120 for new filters
</span><span style='display:block; white-space:pre;color:#404040;'> * supersedes patch in https://trac.macports.org/ticket/56414
</span><span style='display:block; white-space:pre;color:#404040;'> * resolves ffmpeg compile error reported in https://trac.macports.org/ticket/56412
</span>---
multimedia/mlt/Portfile | 43 ++++++++++----------------
multimedia/mlt/files/patch-commit-a3188e3.diff | 11 -------
multimedia/mlt/files/patch-no-sdl.diff | 16 ----------
3 files changed, 17 insertions(+), 53 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mlt/Portfile b/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f75449a..602e978 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,13 +2,14 @@
</span>
PortSystem 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup mltframework mlt 6.8.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name mlt
</span> epoch 3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.4.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span> categories multimedia
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers dennedy.org:dan {gmail.com:rjvbertin @RJVB} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {dennedy.org:dan @ddennedy} {gmail.com:rjvbertin @RJVB} openmaintainer
</span> license GPL-2+
description Open source multimedia framework - core libraries
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,11 +23,11 @@ long_description MLT is an open source multimedia framework, designed and dev
</span> This package contains the files necessary for running applications that use \
the MLT multimedia framework.
homepage http://www.mltframework.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/mlt/mlt
</span> platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 647cdad41974b93c5745a358e1129f2ed5f6e577 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d3a992f3e67463e68630cb0b455d408a2a12f4da7a19e46807fa08a79f09b2b6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5aa9892ea06b2bf0e9abced6d69cf9005f05fa49 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 54d6c28c8eae23b77c57bc59eec441ac073c56d029f59132cce647a8ace9b0dc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1380452
</span>
subport ${name}-qt5 {
description ${description} - Qt5 version
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,12 +72,13 @@ depends_lib-append port:atk \
</span> port:frei0r-plugins \
path:lib/libavcodec.dylib:ffmpeg \
port:libsamplerate \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl_image \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2 \
</span> port:libvorbis \
port:sox \
port:libxml2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libexif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libexif \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libebur128
</span>
if {[variant_isset opencv]} {
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,10 +89,6 @@ if {[variant_isset opencv]} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# cherrypicked commit from the next release that fixes a crash-on-exit issue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# in recent Kkdenlive versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-commit-a3188e3.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # NB: qt-includedir can and should be set to ${qt_includes_dir},
# not ${qt_includes_dir}/Qt !!
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +99,8 @@ configure.args-append \
</span> --disable-mmx \
--disable-gtk2 \
--disable-swfdec \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-opencv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-opencv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-sdl
</span>
platform darwin 10 {
if {${build_arch} eq "x86_64"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,18 +156,10 @@ variant opencv description {enable OpenCV support} {
</span> }
# Allow building without SDL support, useful when used in dependents that themselves
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# depend on SDL2, to avoid (warnings about) runtime conflicts. It can be hoped that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# one day MLT will support SDL2 too.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# depend on SDL 1.2, to avoid (warnings about) runtime conflicts.
</span> variant disable_sdl description {disable SDL support to avoid SDL vs. SDL2 conflicts} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-no-sdl.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-sdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-sdl2
</span> configure.cppflags-append \
-DMELT_NOSDL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl_image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:libsdl2
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://sourceforge.net/projects/${name}/files/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mlt/files/patch-commit-a3188e3.diff b/multimedia/mlt/files/patch-commit-a3188e3.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ec9f865..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mlt/files/patch-commit-a3188e3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/mlt++/orig.MltRepository.cpp 2016-11-16 07:53:11.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/mlt++/MltRepository.cpp 2017-04-30 11:32:31.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,8 +35,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Repository::~Repository( )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( instance )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mlt_repository_close( instance );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- instance = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mlt/files/patch-no-sdl.diff b/multimedia/mlt/files/patch-no-sdl.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 86de131..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mlt/files/patch-no-sdl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 46cdb6063fc4d308e25c4491949b099980d68d44..47bf2392931a4a0cc64b39a13d9f537b085903c3 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,9 +94,9 @@ build_config()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $targetos in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "CFLAGS+=-fPIC `sdl-config --cflags`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo "CFLAGS+=-fPIC"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "SHFLAGS=-dynamiclib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "LDFLAGS+=`sdl-config --libs`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo "LDFLAGS+=-framework AppKit -framework Cocoa"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Linux|GNU/kFreeBSD|GNU)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ "$optimisations" = "true" ] &&
</span></pre><pre style='margin:0'>
</pre>