<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b8ea59e57d3a0e6fca21b134be4f0e6bd1e3105a">https://github.com/macports/macports-ports/commit/b8ea59e57d3a0e6fca21b134be4f0e6bd1e3105a</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 b8ea59e mlt: Fix crash on startup, avoid SDL dependency
</span>b8ea59e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b8ea59e57d3a0e6fca21b134be4f0e6bd1e3105a
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Sun Sep 17 16:05:58 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> mlt: Fix crash on startup, avoid SDL dependency
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Maintainer update
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/53445
</span>---
multimedia/mlt/Portfile | 91 ++++++++++++++++++--------
multimedia/mlt/files/patch-commit-a3188e3.diff | 11 ++++
multimedia/mlt/files/patch-no-sdl.diff | 16 +++++
3 files changed, 92 insertions(+), 26 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 54e8a9f..71add86 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;'>@@ -6,6 +6,7 @@ PortGroup muniversal 1.0
</span> name mlt
epoch 3
version 6.4.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories multimedia
maintainers dennedy.org:dan gmail.com:rjvbertin openmaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,38 +40,25 @@ if {${subport} eq "${name}"} {
</span> } else {
conflicts ${name}
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info procs qt5.depends_component] eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # A procedure to indicate dependencies on Qt components that are not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # included in the default dependency declared by the Qt5 PortGroup.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # It allows to specify those dependencies without having to handle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the appropriate path-style declarations that work against every Qt5 port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (currently port:qt5, port:qt55, "soon" port:qt5-kde too.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # A complete version of this procedure will be provided by the Qt5 PG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # after qt5-kde is introduced. Provide a simplified version in the meantime.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- proc qt5.depends_component {first args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global os.major
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # join ${first} and (the optional) ${args}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set args [linsert $args[set list {}] 0 ${first}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # select the Qt5 port prefix, depending on OS version and which Qt5 port is installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} == 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt5pprefix "qt55"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info procs qt5.active_version] eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc qt5.active_version {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${prefix}/bin/pkg-config]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set av [exec ${prefix}/bin/pkg-config --modversion Qt5Core]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${av}
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt5pprefix "qt5"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach comp ${args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${comp} eq "qt5"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # in case one needs an explicit dependency on the Qt5 main port itself:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${qt5pprefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portname "${qt5pprefix}-${comp}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${portname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0.0.0
</span> }
}
}
qt5.depends_component \
qtsvg
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [qt5.active_version] 5.7.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -stdlib=libc++ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
depends_build-append port:git \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,6 +75,19 @@ depends_lib-append port:atk \
</span> port:libxml2 \
port:libexif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset opencv]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants opencv qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants opencv qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# cherrypicked commit from the next release that fixes a crash-on-exit issue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# in recent Kkdenlive versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-commit-a3188e3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>@@ -96,7 +97,8 @@ configure.args-append \
</span> --disable-jackrack \
--disable-mmx \
--disable-gtk2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-swfdec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-swfdec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-opencv
</span>
platform darwin 10 {
if {${build_arch} eq "x86_64"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,6 +110,17 @@ configure.cflags-append "-I${prefix}/include"
</span> configure.cflags-append "-I${qt_includes_dir}"
configure.ldflags-delete "-L${prefix}/lib"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# make sure the build system actually sees our settings by amending the toplevel config.mak.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set config.mak [open ${worksrcpath}/config.mak "a"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${config.mak} "CC=${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${config.mak} "CXX=${configure.cxx}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${config.mak} "CFLAGS+=${configure.cflags} ${configure.cppflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${config.mak} "CXXFLAGS+=${configure.cxxflags} ${configure.cppflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${config.mak} "LDLAGS+=${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${config.mak}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.args-append CC="${configure.cc}" CXX="${configure.cxx}" CPP="${configure.cpp}"
if {[variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,6 +140,32 @@ variant gtk2 description {include the gtk2 module (for additional image and text
</span> depends_lib-append port:gtk2
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gpl3 description {enable GPLv3 components} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-gpl3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license GPL-3+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use an opencv variant to avoid opportunistic dependencies on this library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the opencv dependency must match our choice of Qt version, which is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# another reason why opencv support is provided through a variant.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant opencv description {enable OpenCV support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:opencv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-opencv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Allow building without SDL support, useful when used in dependents that themselves
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# depend on SDL2, to avoid (warnings about) runtime conflicts. It can be hoped that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# one day MLT will support SDL2 too.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant disable_sdl description {disable SDL support to avoid SDL vs. SDL2 conflicts} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-no-sdl.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-sdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMELT_NOSDL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl_image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url http://sourceforge.net/projects/${name}/files/
livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ec9f865
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mlt/files/patch-commit-a3188e3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/mlt++/orig.MltRepository.cpp 2016-11-16 07:53:11.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/mlt++/MltRepository.cpp 2017-04-30 11:32:31.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,8 +35,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Repository::~Repository( )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( instance )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mlt_repository_close( instance );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ instance = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..86de131
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mlt/files/patch-no-sdl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 46cdb6063fc4d308e25c4491949b099980d68d44..47bf2392931a4a0cc64b39a13d9f537b085903c3 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,9 +94,9 @@ build_config()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case $targetos in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "CFLAGS+=-fPIC `sdl-config --cflags`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "CFLAGS+=-fPIC"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "SHFLAGS=-dynamiclib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "LDFLAGS+=`sdl-config --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "LDFLAGS+=-framework AppKit -framework Cocoa"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Linux|GNU/kFreeBSD|GNU)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ "$optimisations" = "true" ] &&
</span></pre><pre style='margin:0'>
</pre>