Skip to content
Permalink
Browse files

SDRangel: update to 4.14.6

  • Loading branch information
michaelld committed May 17, 2020
1 parent 3c4c55b commit 39d237f3d7c0b6176cf001f9a3ad20eeb827b94a
Showing with 13 additions and 20 deletions.
  1. +4 −4 science/SDRangel/Portfile
  2. +9 −16 science/SDRangel/files/revert_cm256cc.patch
@@ -16,10 +16,10 @@ description SDRangel is an Open Source Qt5 / OpenGL 3.0+ SDR \
and signal analyzer frontend to various hardware.
long_description ${description}

github.setup f4exb sdrangel 4.14.5 v
checksums rmd160 2751962891e590fc45b7c1267c8bc3a345008d95 \
sha256 6d411cd5300525f1b3c6fbc411a7a567816aaabdac0d4ef7ae662c9dacc40fa1 \
size 24465895
github.setup f4exb sdrangel 4.14.6 v
checksums rmd160 4aafcf5c0919eb6116d7f5a2bbbf9c4ec6ac2976 \
sha256 3ec5b360ac74885aa20ee9186288020fba70d53b93b38cb9064465362782e742 \
size 24474508
revision 0

compiler.c_standard 2011
@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7838343ed..55bb7298c 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -362,9 +362,7 @@ if(ENABLE_EXTERNAL_LIBRARIES)
@@ -366,9 +366,7 @@
add_subdirectory(external)
else()
find_package(Codec2)
@@ -14,22 +14,15 @@ index 7838343ed..55bb7298c 100644
find_package(SerialDV REQUIRED)
find_package(LibDSDcc)
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 768da8fc6..a065cb029 100644
index 34a0ac2..b547df6 100644
--- external/CMakeLists.txt
+++ external/CMakeLists.txt
@@ -161,7 +161,6 @@ if(NOT WIN32)
endif()
@@ -177,7 +177,7 @@
endif ()
endif (NOT WIN32 AND (NOT CODEC2_FOUND OR CODEC2_EXTERNAL))

# needs boost
-if(NOT APPLE)
-if (NOT APPLE AND (NOT CM256CC_FOUND OR CM256CC_EXTERNAL))
+if (NOT CM256CC_FOUND OR CM256CC_EXTERNAL)
# needs boost
ExternalProject_Add(cm256cc
GIT_REPOSITORY https://github.com/f4exb/cm256cc.git
GIT_TAG ${CM256CC_TAG}
@@ -190,7 +189,6 @@ if(NOT APPLE)
FILES_MATCHING PATTERN "libcm256cc*${CMAKE_SHARED_LIBRARY_SUFFIX}")
set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}")
endif()
-endif() # NOT APPLE

set(USE_MBELIB OFF)
ExternalProject_Add(mbelib
GIT_REPOSITORY https://github.com/f4exb/cm256cc.git

0 comments on commit 39d237f

Please sign in to comment.
You can’t perform that action at this time.