<pre style='margin:0'>
Craig Treleaven (ctreleaven) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cdba581528a27f8bf56d0e37023155b7c82308eb">https://github.com/macports/macports-ports/commit/cdba581528a27f8bf56d0e37023155b7c82308eb</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 cdba581 mythtv-[core,plugins].28: avoid build conflicts
</span>cdba581 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cdba581528a27f8bf56d0e37023155b7c82308eb
</span>Author: Craig Treleaven <ctreleaven@macports.org>
AuthorDate: Sat May 6 20:44:16 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> mythtv-[core,plugins].28: avoid build conflicts
</span>---
multimedia/mythtv.28/Portfile | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mythtv.28/Portfile b/multimedia/mythtv.28/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a36bcdd..8a8d6bf 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mythtv.28/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mythtv.28/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,14 +4,15 @@ PortSystem 1.0
</span> PortGroup qt5 1.0
PortGroup github 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span>
set shorthash 0bd47303
# set fullhash 0bd473036fdb132c6f094eff360de3e444256aeb
set majorversion .28
set minorversion .1
set lastcommit 20170315
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set corerev 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pluginsrev 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set corerev 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pluginsrev 1
</span> set metarev 0
github.setup MythTV mythtv ${shorthash}
checksums rmd160 0e3665b02757340eebd1bcf126b772f6c5aec273 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,7 +64,6 @@ subport mythtv-pkg${majorversion} { }
</span>
if {$subport eq "mythtv-core${majorversion}"} {
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup conflicts_build 1.0
</span> revision ${corerev}
name mythtv-core${majorversion}
version 0${majorversion}${minorversion}-Fixes-${lastcommit}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,6 +108,7 @@ if {$subport eq "mythtv-core${majorversion}"} {
</span> port:yasm
conflicts mythtv-core.25 mythtv-core.26 mythtv-core.27
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build hdhomerun
</span>
depends_run port:logrotate \
port:dejavu-fonts
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -262,6 +263,7 @@ if {$subport eq "mythtv-core${majorversion}"} {
</span> --disable-audio-jack --disable-indev=jack \
--disable-audio-pulseoutput \
--disable-gnutls \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libcec \
</span> --disable-libpulse \
--disable-libvpx \
--disable-libxcb \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -540,6 +542,9 @@ if {$subport eq "mythtv-plugins${majorversion}"} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build ffmpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ metaio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:mythtv-core${majorversion} \
path:lib/libssl.dylib:openssl
# NB mythplugins/configure reads ${prefix}/include/mythtv/mythconfig.mak
</pre><pre style='margin:0'>
</pre>