<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/45282c02722da9ef5217bbc0362b570b866a8276">https://github.com/macports/macports-ports/commit/45282c02722da9ef5217bbc0362b570b866a8276</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 45282c0 uhd-devel: update to c2145830 (20180619).
</span>45282c0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 45282c02722da9ef5217bbc0362b570b866a8276
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Jun 22 15:50:41 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> uhd-devel: update to c2145830 (20180619).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + add "python_api" variant, enabled by default;
</span><span style='display:block; white-space:pre;color:#404040;'> + fix PYTHON_EXECUTABLE path;
</span><span style='display:block; white-space:pre;color:#404040;'> + split patch into release and devel versions.
</span>---
science/uhd/Portfile | 43 ++++++++++++++++------
...t.diff => patch-host_CMakeLists.txt.devel.diff} | 8 ++--
...diff => patch-host_CMakeLists.txt.release.diff} | 2 +-
3 files changed, 37 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/Portfile b/science/uhd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b7497fa..38fb404 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,11 @@ Provides the release version, which is typically updated every month or so.
</span>
github.livecheck.regex {([0-9.]+)}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to disable Boost DIRS before internal DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-host_CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
subport uhd-devel {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,11 +48,11 @@ Provides the UHD GIT maint or master branch, depending on which is more advanced
</span>
name uhd-devel
conflicts uhd
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup EttusResearch uhd f473df0a0bc563d76d9d806ca6671c51638a5dd2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180613
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 29fc1273e879cecfaa9043af591ee9057f130946\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fe7d3ff66948abc1a1ae66cbd1f62908a9a533b4e258edf68fbe1a97fdfad057\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9321488
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup EttusResearch uhd c21458305392483e1884fcca15e1ea4b67628fbd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180619
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 2bbd21f33b4484ca4d148a82ad429bf5e9dac89e\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cdf9d7d0c9f023911d95426471b7aa2f13fa251f8d476c9deb74b5d7cf0ebd44\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9343338
</span>
# overload the github livecheck branch.
# when master is more advanced, comment this out.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,6 +63,27 @@ Provides the UHD GIT maint or master branch, depending on which is more advanced
</span>
set UHD_VERSION_INFO "git-[string range ${github.version} 0 7](${version})"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to disable Boost DIRS before internal DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-host_CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # move this to global scope with next release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python_api \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {enable Python API support (experimental)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${PythonVersionNoDot}-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_PYTHON_API=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/${PythonVersionWithDot}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/${PythonVersionWithDot}/Python
</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;'>+ if {![variant_isset python_api]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_PYTHON_API=OFF
</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;'>+ default_variants +python_api
</span> }
# override the github Portgroup's homepage setting
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,11 +104,6 @@ depends_build-append port:pkgconfig
</span>
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# temporary patch to disable Boost DIRS before internal DIRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-host_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # remove top-level library path, such that internal libraries are used
# instead of any already-installed ones.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,7 +197,7 @@ depends_lib-append \
</span>
# specify the Python version to use
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set PythonExe "${prefix}/bin/python${PythonVersionWithDot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set PythonExe "${frameworks_dir}/Python.framework/Versions/${PythonVersionWithDot}/bin/python${PythonVersionWithDot}"
</span>
configure.args-append \
-DPYTHON_EXECUTABLE=${PythonExe}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-host_CMakeLists.txt.diff b/science/uhd/files/patch-host_CMakeLists.txt.devel.diff
</span>similarity index 67%
copy from science/uhd/files/patch-host_CMakeLists.txt.diff
copy to science/uhd/files/patch-host_CMakeLists.txt.devel.diff
<span style='display:block; white-space:pre;color:#808080;'>index f7c0f10..dee5744 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/files/patch-host_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/files/patch-host_CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,8 +2,8 @@ diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
</span> index ab7f41f..06cd1af 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -324,8 +324,8 @@ SET(Boost_ADDITIONAL_VERSIONS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -342,8 +342,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(STATUS "Looking for required Boost components...")
</span> FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
-INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,5 +11,5 @@ index ab7f41f..06cd1af 100644
</span> +# INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+# LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(STATUS "Boost include directories: ${Boost_INCLUDE_DIRS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(STATUS "Boost library directories: ${Boost_LIBRARY_DIRS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Check to see if the Python version we're looking for exists
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(BOOST_PYTHON_FOUND ${Boost_PYTHON_FOUND})
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-host_CMakeLists.txt.diff b/science/uhd/files/patch-host_CMakeLists.txt.release.diff
</span>similarity index 91%
rename from science/uhd/files/patch-host_CMakeLists.txt.diff
rename to science/uhd/files/patch-host_CMakeLists.txt.release.diff
<span style='display:block; white-space:pre;color:#808080;'>index f7c0f10..517dce0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/files/patch-host_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/files/patch-host_CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
</span> index ab7f41f..06cd1af 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -324,8 +324,8 @@ SET(Boost_ADDITIONAL_VERSIONS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -324,8 +324,8 @@
</span> )
FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
</pre><pre style='margin:0'>
</pre>