Ticket #50294: mlt.diff

multimedia/mlt/Portfile

@@ -3 +3 @@
 
 PortSystem          1.0
 PortGroup           muniversal 1.0
-PortGroup           qt4 1.0
 
 name                mlt
 epoch               3
-version             0.9.6
-revision            2
+version             0.9.8
 categories          multimedia
 maintainers         dennedy.org:dan
 license             GPL-2+
@@ -27 +25 @@
 master_sites        sourceforge:project/mlt/mlt
 platforms           darwin
 
-checksums           rmd160  c678a40b0fa362043d2a867152702cd8375d7bc7 \
-                    sha256 ab999992828a03dadbf62f6a131aada776cfd7afe63a94d994877fdba31a3000 
+checksums           rmd160  e08e7c29fd4525a9454acfb76e21efb8fe890143 \
+                    sha256  7fa57d818dfd1a85e76a4c746a1deb71501232706eb89400c976bcf48f9cb966
+
+subport qt5-${name} {
+    description     ${description} - Qt5 version
+    long_description \
+                    ${long_description} It is built against the Qt5 libraries.
+}
+
+if {${subport} eq "${name}"} {
+    conflicts       qt5-${name}
+    PortGroup       qt4 1.0
+} else {
+    conflicts       ${name}
+    PortGroup       qt5 1.0
+}
 
 depends_build-append port:git \
                     port:doxygen
@@ -44 +56 @@
                     port:libxml2 \
                     port:libexif
 
-configure.args      --enable-gpl \
+# NB: qt-includedir can and should be set to ${qt_includes_dir},
+# not ${qt_includes_dir}/Qt !!
+configure.args-append \
+                    --enable-gpl \
                     --qt-libdir=${qt_frameworks_dir} \
-                    --qt-includedir=${qt_includes_dir}/Qt \
+                    --qt-includedir=${qt_includes_dir} \
                     --disable-jackrack \
                     --disable-mmx \
                     --disable-gtk2 \
@@ -62 +77 @@
 configure.cflags-append     "-I${qt_includes_dir}"
 configure.ldflags-delete    "-L${prefix}/lib"
 
+post-patch {
+    reinplace -W ${worksrcpath}/src "s|__DARWIN__|__APPLE__|g" \
+                            framework/mlt_factory.c \
+                            framework/mlt_properties.c \
+                            framework/mlt_property.c \
+                            framework/mlt_property.h \
+                            melt/melt.c \
+                            mlt++/MltProperties.cpp \
+                            mlt++/MltProperties.h \
+                            modules/decklink/common.cpp \
+                            modules/decklink/common.h \
+                            modules/frei0r/factory.c \
+                            modules/jackrack/plugin.c \
+                            modules/jackrack/plugin_mgr.c \
+                            modules/opengl/factory.c \
+                            modules/opengl/filter_glsl_manager.cpp \
+                            modules/plusgpl/utils.c \
+                            modules/plusgpl/utils.h \
+                            modules/sdl/consumer_sdl.c \
+                            modules/sdl/consumer_sdl_audio.c \
+                            modules/sdl/consumer_sdl_osx.h \
+                            modules/sdl/consumer_sdl_still.c \
+                            modules/videostab/stab/estimate.c \
+                            tests/test_filter/test_filter.cpp \
+                            tests/test_properties/test_properties.cpp
+}
+
 build.args-append           CC="${configure.cc}" CXX="${configure.cxx}" CPP="${configure.cpp}"
 
 if {[variant_isset universal]} {