<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[138693] trunk/dports/science/uhd/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/138693">138693</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-07-16 07:45:02 -0700 (Thu, 16 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>uhd:
+ update devel to 012381d9 (20150714);
+ devel now uses mako instead of cheetah;
+ add patch to fix uhd_images_downloader to work with Python 2.7 and 3.4, which requires using py*-requests;
+ release still requires Python 2.7;
+ add python selection variants to devel, and means for easily moving this to overall usage with the next release.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceuhdPortfile">trunk/dports/science/uhd/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceuhdPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/uhd/Portfile (138692 => 138693)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/uhd/Portfile 2015-07-16 13:58:20 UTC (rev 138692)
+++ trunk/dports/science/uhd/Portfile 2015-07-16 14:45:02 UTC (rev 138693)
</span><span class="lines">@@ -47,10 +47,10 @@
</span><span class="cx">
</span><span class="cx"> name uhd-devel
</span><span class="cx"> conflicts uhd
</span><del>- github.setup EttusResearch uhd d9656de88f7af77b39bfe9985f0ac7c623932d71
- version 20150708
- checksums rmd160 13387ce1a29fb78fecf992d16ec52a36cf721a14 \
- sha256 46ab3eb22f30c5f7ffd3cb6539186fb7ef55be24c0620c881e7df9150b47b143
</del><ins>+ github.setup EttusResearch uhd 012381d999c4a895593412aaf06e73432b458810
+ version 20150714
+ checksums rmd160 450a9619d127533574f8848de6e7ce17beefb1cf \
+ sha256 d3f26e8cfa7147df99f383a53f41340ff646bd202d748aa487da2a1befac0292
</ins><span class="cx">
</span><span class="cx"> # overload the github livecheck URL with the maint branch,
</span><span class="cx"> # when it is more advanced; comment out for master.
</span><span class="lines">@@ -116,9 +116,13 @@
</span><span class="cx">
</span><span class="cx"> default_variants +docs +examples +libusb +manual +test +manpages
</span><span class="cx">
</span><ins>+set PythonVersionNoDot ""
+
</ins><span class="cx"> if {${subport} eq "uhd"} {
</span><span class="cx">
</span><del>- # for release until 3.8.5+, keep +orc around. it has been
</del><ins>+ # for release until 3.8.5+:
+ #
+ # 1) keep +orc around. it has been
</ins><span class="cx"> # deprecated and removed as of 2015-07-01, commit 41812aa2.
</span><span class="cx">
</span><span class="cx"> default_variants +orc
</span><span class="lines">@@ -131,17 +135,59 @@
</span><span class="cx"> if {![variant_isset orc]} {
</span><span class="cx"> configure.args-append -DENABLE_ORC=OFF
</span><span class="cx"> }
</span><ins>+
+ # 2) use Python 2.7 only, and cheetah for templates
+
+ set PythonVersionNoDot "27"
+ depends_lib-append \
+ port:py27-cheetah
+
+} else {
+
+ # as of 2015-07-14, commit 4b1034b2: uhd-devel uses mako for
+ # templates, which means it can use Python 2.7 or 3.4.
+
+ variant python27 conflicts python34 description {Build using Python 2.7} {}
+ variant python34 conflicts python27 description {Build using Python 3.4} {}
+
+ if {![variant_isset python27] && ![variant_isset python34]} {
+ default_variants +python27
+ }
+
+ if {![variant_isset python27] && ![variant_isset python34]} {
+ ui_error "\n\nYou must select either the +python27 or +python34 variant.\n"
+ return -code error "Invalid variant selection"
+ }
+
+ if {[variant_isset python27]} {
+ set PythonVersionNoDot "27"
+ } else {
+ set PythonVersionNoDot "34"
+ }
+
+ depends_lib-append \
+ port:py${PythonVersionNoDot}-mako
+
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-# require Python 2.7
</del><ins>+# patch the UHD images downloader to work with both Python 2.7 & 3.4.
</ins><span class="cx">
</span><ins>+patchfiles-append patch-host_utils_uhd_images_downloader.py.in.diff
+
+set PythonVersionWithDot [join [split ${PythonVersionNoDot} ""] "."]
+
+# required Python
+
</ins><span class="cx"> depends_lib-append \
</span><del>- port:python27 \
- port:py27-cheetah
</del><ins>+ port:python${PythonVersionNoDot} \
+ port:py${PythonVersionNoDot}-requests
</ins><span class="cx">
</span><span class="cx"> # specify that Python version to use
</span><ins>+
+set PythonExe "${prefix}/bin/python${PythonVersionWithDot}"
+
</ins><span class="cx"> configure.args-append \
</span><del>- -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7
</del><ins>+ -DPYTHON_EXECUTABLE=${PythonExe}
</ins><span class="cx">
</span><span class="cx"> # after destroot, have uhd fetch its images into the
</span><span class="cx"> # destroot area, so that they are also tracked by MacPorts
</span><span class="lines">@@ -149,8 +195,8 @@
</span><span class="cx"> post-destroot {
</span><span class="cx">
</span><span class="cx"> ui_debug "Fetching images:"
</span><del>- ui_debug "${prefix}/bin/python2.7 ${destroot}${prefix}/share/uhd/utils/uhd_images_downloader.py --install-location=${destroot}${prefix}/share/uhd/images"
- system "${prefix}/bin/python2.7 ${destroot}${prefix}/share/uhd/utils/uhd_images_downloader.py --verbose --install-location=${destroot}${prefix}/share/uhd/images"
</del><ins>+ ui_debug "${PythonExe} ${destroot}${prefix}/share/uhd/utils/uhd_images_downloader.py --install-location=${destroot}${prefix}/share/uhd/images"
+ system "${PythonExe} ${destroot}${prefix}/share/uhd/utils/uhd_images_downloader.py --verbose --install-location=${destroot}${prefix}/share/uhd/images"
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -195,7 +241,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant manual description {build manual} {
</span><del>- depends_lib-append port:py27-docutils
</del><ins>+ depends_lib-append port:py${PythonVersionNoDot}-docutils
</ins><span class="cx"> configure.args-append -DENABLE_MANUAL=ON
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>