<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/efb3b2f8f8b7b78cee455f532e48ca46ac61d627">https://github.com/macports/macports-ports/commit/efb3b2f8f8b7b78cee455f532e48ca46ac61d627</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit efb3b2f8f8b7b78cee455f532e48ca46ac61d627
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Fri Apr 3 10:30:55 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> gr-fosphor: support gnuradio 3.8 and create subport for GR 3.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - move the module to QT5
</span>---
science/gr-fosphor/Portfile | 181 ++++++++++++++++++++++++++------------------
1 file changed, 106 insertions(+), 75 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-fosphor/Portfile b/science/gr-fosphor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d704293bec..8c8976f57c9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-fosphor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-fosphor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,118 +1,149 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup active_variants 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# require C++11 for cppunit 1.14.0 as of April 13, 2017.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup osmocom gr-fosphor 7b6b9961bc2d9b84daeb42a5c8f8aeba293d207c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20160522
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b58669d4caa99a724eaa8ea44848bbea07715d96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 57b8e59b6861a867f4cb938ef654c7f753b53720d3b4b249dd8f398ba9c2998b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 254645
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# stealth update equivalent when moving to GitHub
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove on next update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${name}/${version}_1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {michaelld @michaelld} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name gr-fosphor
</span> categories science comms
homepage http://sdr.osmocom.org/trac/wiki/fosphor
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-3
</span> platforms darwin macosx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {michaelld @michaelld} {ra1nb0w @ra1nb0w} openmaintainer
</span> description gr-fosphor provides a GNU Radio block for RTSA-like spectrum visualization using GPU acceleration.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This port is kept up with the gr-fosphor GIT 'master' branch, which is \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typically updated weekly to monthly.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This port is kept up with the gr-fosphor GIT 'master' branch, which is typically updated weekly to monthly, providing compatibility with GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:boost \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:log4cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup osmocom gr-fosphor 2d4fe78b43bb67907722f998feeb4534ecb1efa8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20191208-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 730f3daf9775b1e106cf1e1cd0e822a5b17672e4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8e8cc6ce90706dd5bfa18e6fc482c1adfbfd864d97816c7092f527660ffd99e4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 243552
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# still require cppunit for testing; NOTE: cppunit is checked for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# during configure, so we need it to be in depends_lib or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_build to be used correctly. Choose the latter since it's
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# not required for runtime; just for build/test.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:cppunit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts gr37-fosphor
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# do VPATH (out of source tree) build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libgnuradio-runtime.dylib:gnuradio
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_versions { 3.6 3.7 3.8 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set default_python_variant +python37
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# temporary patch to fix using gr_log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build gr-fosphor
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-add_gr_log.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove top-level library path, such that internal libraries are used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# instead of any already-installed ones.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport gr37-fosphor {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-delete -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name gr37-fosphor
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# specify the Python dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup osmocom gr-fosphor fa6761afbf8c2658782e0c7fc5d51063679b7ae4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch gr3.7-qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20191202-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 a05bcc9ef655a1eef8dcd8e23938885e929d8855 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e760c46ba2bee24b7488940b107d776192296b39d78040a76cec0e393e63a2d2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 253973
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts gr-fosphor
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# specify the Python version to use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gnuradio37
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/2.7/Python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGR_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_versions { 2.7 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set default_python_variant +python27
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Define the available variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach py_ver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver_no_dot [join [split ${py_ver} "."] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set variant_line {variant python${py_ver_no_dot} description "Build with python ${py_ver} support"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach py_over ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${py_ver} == ${py_over} } { continue }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_over_no_dot [join [split ${py_over} "."] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append variant_line " conflicts python${py_over_no_dot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append variant_line { { } }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval $variant_line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${py_ver_no_dot}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${default_python_variant} != "+python${py_ver_no_dot}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set default_python_variant ""
</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;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set default python variant if not selected
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${default_python_variant} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append "${default_python_variant}"
</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 a python variant is enabled, activate it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set active_python_version ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set active_python_version_no_dot ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach py_ver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver_no_dot [join [split ${py_ver} "."] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${py_ver_no_dot}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set active_python_version ${py_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set active_python_version_no_dot ${py_ver_no_dot}
</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:#ffe0e0;'>-# require C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cppunit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:swig-python
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:boost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:log4cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${active_python_version_no_dot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# specify the Python version to use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_framework_dir ${frameworks_dir}/Python.framework/Versions/${active_python_version}
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_CXX_STANDARD=11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${python_framework_dir}/bin/python${active_python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${python_framework_dir}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_LIBRARY=${python_framework_dir}/Python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGR_PYTHON_DIR=${python_framework_dir}/lib/python${active_python_version}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# DISABLED temporary patch to fix using gr_log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#patchfiles-append patch-add_gr_log.diff
</span>
# disable the GLFW fosphor interface; see also
# https://trac.macports.org/ticket/54614
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append \
-DENABLE_GLFW=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# allow gr-forphor to work with both gnuradio and gnuradio-devel ...
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "gr37-fosphor"} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# ... but not with gnuradio-next
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant wx description "Install Fosphor for wx" {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gnuradio-next is installed; this version of gr-forphor does not work with gnuradio-next
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Invalid port dependency: gnuradio-next"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant wx description "Install Fosphor for wx" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset wx]} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset wx]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup wxWidgets 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxPython-3.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup wxWidgets 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.use wxPython-3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${wxWidgets.port} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${active_python_version_no_dot}-wxpython-3.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${wxWidgets.port} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-wxpython-3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_WX=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_WX=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_WX=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_WX=OFF
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
</pre><pre style='margin:0'>
</pre>