<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/8f6ac86aba2a8bd748f09c7d34b8e72cbac91354">https://github.com/macports/macports-ports/commit/8f6ac86aba2a8bd748f09c7d34b8e72cbac91354</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 8f6ac86 gnuradio-next: update to 20190717-4d8d8d29 (3.8.0.0-rc1)
</span>8f6ac86 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8f6ac86aba2a8bd748f09c7d34b8e72cbac91354
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Jul 18 15:08:39 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> gnuradio-next: update to 20190717-4d8d8d29 (3.8.0.0-rc1)
</span>---
science/gnuradio/Portfile | 22 +++++++++++++++++-----
.../gnuradio/files/patch-C_CXX_STANDARD.next.diff | 6 +++---
.../patch-fix-runtime-swig-install-dir.next.diff | 11 +++++++++++
3 files changed, 31 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/Portfile b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c11a2a1..7145eb7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,11 +77,11 @@ subport gnuradio-next {
</span> name gnuradio-next
conflicts gnuradio gnuradio-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio gnuradio 469954226349be36f1b056163f543fca2eadd0fd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190621-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 70144cb9bf04a4c80d9b4f0047d07c8dcaf383ac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 48cc658dfe369fbd7c21020e593f65839f45d56692fddd5021281fc890883e3a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3401527
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio gnuradio 4d8d8d2923e52d6a6f97aaaa46fdda8a6581b02a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190717-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 465378e7c02b3bba5e2bc625786c3c351114c55c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4dc3ebde27cecb852148c2989a48887a3519ce2a6d645fac7260696e48722818 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3398562
</span> revision 0
# set the version override string
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,6 +180,11 @@ if {${subport} eq "gnuradio"} {
</span> patchfiles-append \
patch-C_CXX_STANDARD.next.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix the install directory for _runtime_swig.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-runtime-swig-install-dir.next.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
# override githib PortGroup homepage setting
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -338,6 +343,13 @@ depends_run-append \
</span> port:py${PythonVersionNoDot}-opengl \
port:py${PythonVersionNoDot}-scipy
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# for next only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "gnuradio-next"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Require Py-click and Py-click-plugins; checked for at configure time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${PythonVersionNoDot}-click \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-click-plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # specify the Python version to use
configure.args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-C_CXX_STANDARD.next.diff b/science/gnuradio/files/patch-C_CXX_STANDARD.next.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3197b3b..e1e28c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-C_CXX_STANDARD.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-C_CXX_STANDARD.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,12 +135,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,12 +138,16 @@
</span> MESSAGE(status "Skipping compiler version check.")
ENDIF()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@
</span>
IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
SET(CMAKE_CXX_STANDARD 11)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -149,9 +153,60 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -152,9 +156,60 @@
</span> ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
SET(CMAKE_CXX_STANDARD 11)
ELSE()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +84,7 @@
</span> IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
SET(CMAKE_C_STANDARD 11)
ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -159,7 +214,58 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,7 +217,58 @@
</span> ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
SET(CMAKE_C_STANDARD 11)
ELSE()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix-runtime-swig-install-dir.next.diff b/science/gnuradio/files/patch-fix-runtime-swig-install-dir.next.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6e72435
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix-runtime-swig-install-dir.next.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;'>+--- gnuradio-runtime/swig/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/swig/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,7 +62,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGETS runtime_swig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXPORT runtime_swig-export
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION ${GR_PYTHON_RELATIVE}/gnuradio/gr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION ${GR_PYTHON_DIR}/gnuradio/gr
</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;'>+ include(GrPython)
</span></pre><pre style='margin:0'>
</pre>