<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/35f556252df1e24beffe8d38f3109b60b07a9768">https://github.com/macports/macports-ports/commit/35f556252df1e24beffe8d38f3109b60b07a9768</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 35f556252df1e24beffe8d38f3109b60b07a9768
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Fri Jan 14 09:37:15 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> gr-fcdproplus: update commit to 575fcafbb8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Build fails with errors like:
</span><span style='display:block; white-space:pre;color:#404040;'> error: a space is required between consecutive right angle brackets (use'> >')
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> adding -std=c++11 and requesting in c++11 compatible compiler resolves it
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> CPATH now contains multiple directories. Use CMAKE_INSTALL_PREFIX
</span>---
science/gr-fcdproplus/Portfile | 16 +++++++++-------
science/gr-fcdproplus/files/cmakelists.txt.patch | 18 +++++++++++++++++-
2 files changed, 26 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-fcdproplus/Portfile b/science/gr-fcdproplus/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d5964658633..47299f8deda 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-fcdproplus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-fcdproplus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,23 +12,25 @@ license GPL-3
</span>
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup dl1ksv gr-fcdproplus f1154db33e7c22ff6456cf3385586832fff413f0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190817-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d4cb7da467b9a9264e184d437088e253fde45ba6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ade328aeaec50882f87041a88b1baa62b1edb5fb213da1c0ec48812a0c1a5b1b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 49706
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup dl1ksv gr-fcdproplus 575fcafbb8f36dc11d95a305f331660612a44596
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20200811-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 81616bfcd52a2c0fc0aabb0ab413a4cb540b0b9d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2d360d367794290df802dadce984ddd28e150a9042b9d1301a661475634fbb21 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 49717
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
# force c++11 standard (strange)
# and enable system hidapi
patchfiles-append \
cmakelists.txt.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> conflicts gr37-fcdproplus
depends_lib-append \
port:hidapi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
subport gr37-fcdproplus {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-fcdproplus/files/cmakelists.txt.patch b/science/gr-fcdproplus/files/cmakelists.txt.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 832d33df96f..06c4b12e59b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-fcdproplus/files/cmakelists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-fcdproplus/files/cmakelists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,24 @@ index 4d1a64c..a40b6cc 100644
</span> find_package(Gnuradio "3.8" REQUIRED audio blocks PATHS ${CMAKE_INSTALL_PREFIX} )
list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/cmake/Modules")
-FIND_LIBRARY(HIDAPI_LIBRARY hidapi-libusb)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+FIND_PATH(HIDAPI_INCLUDES hidapi.h PATH $ENV{CPATH}/hidapi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FIND_PATH(HIDAPI_INCLUDES hidapi.h PATH ${CMAKE_INSTALL_PREFIX}/include/hidapi)
</span> +FIND_LIBRARY(HIDAPI_LIBRARY hidapi)
include(GrVersion)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2022-01-14 09:23:39.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2022-01-14 09:24:54.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,12 +135,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Setup doxygen option
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_package(Doxygen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(DOXYGEN_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- option(ENABLE_DOXYGEN "Build docs using Doxygen" ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else(DOXYGEN_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- option(ENABLE_DOXYGEN "Build docs using Doxygen" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif(DOXYGEN_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(ENABLE_DOXYGEN FALSE CACHE BOOL "disable doxygen" FORCE)
</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;'>+ # Create uninstall target
</span></pre><pre style='margin:0'>
</pre>