<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e4d0bbdf5a31db88dd6d602129130d4dceebfeed">https://github.com/macports/macports-ports/commit/e4d0bbdf5a31db88dd6d602129130d4dceebfeed</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e4d0bbdf5a31db88dd6d602129130d4dceebfeed
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Sep 30 05:48:51 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5: do not use MacPorts OpenAL
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/54592
</span>---
aqua/qt5/Portfile | 10 +++++++++-
aqua/qt5/files/patch-qtmultimedia_no_macports_openal.diff | 11 +++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f6b484d..ca940b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -285,7 +285,7 @@ array set modules {
</span> {"Qt Multimedia" "Qt Multimedia Widgets"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtnetworkauth {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1347,6 +1347,14 @@ foreach {module module_info} [array get modules] {
</span> # special case
if { ${module} eq "qtmultimedia" } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # In the file config.tests/openal/openal.pro, defining HEADER_OPENAL_PREFIX means
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include directives use macOS OpenAL Framework.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # In src/multimedia/configure.json, pkgconfg is relied upon, which finds MacPorts openal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for linking.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We must choose one or the other.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/54592
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtmultimedia_no_macports_openal.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant pulseaudio description {Compile PulseAudio support} {
depends_lib-append port:pulseaudio
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtmultimedia_no_macports_openal.diff b/aqua/qt5/files/patch-qtmultimedia_no_macports_openal.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..930bd27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtmultimedia_no_macports_openal.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/multimedia/configure.json.orig 2017-06-22 23:32:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/multimedia/configure.json 2017-08-28 05:37:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,7 +109,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "label": "OpenAL",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "test": "openal",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "sources": [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { "type": "pkgConfig", "args": "openal" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { "type": "pkgConfig", "args": "openal", "condition": "!config.darwin" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { "libs": "-lOpenAL32", "condition": "config.win32" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { "libs": "-framework OpenAL", "condition": "config.darwin" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { "libs": "-lopenal", "condition": "config.unix && !config.darwin" }
</span></pre><pre style='margin:0'>
</pre>