Skip to content

/ macports-ports

Permalink
Browse files
Loading status checks…

uhd: update to 3.14.0.0 

- bump version to 3.14.0.0
- patch-fix-clang-match.release.diff is not needed on current release
- rebase patch-fix-boost-python.release.diff and
  patch-host_CMakeLists.txt.release.diff
- add python37 variant
- remove python34 and python35 variants
- bump revision of gnuradio and gr-osmosdr

Closes: https://trac.macports.org/ticket/58225
  • Loading branch information
@ra1nb0w @mf2k
ra1nb0w authored and mf2k committed Apr 2, 2019
1 parent da61163 commit 61b3a7009b98d4e459ea22b4522067e45872682c
6 science/gnuradio/Portfile
View file
@@ -23,7 +23,7 @@ dist_subdir gnuradio
if {${subport} eq ${name}} {

github.setup gnuradio gnuradio 3.7.13.4 v
revision 3
revision 4
checksums \
rmd160 150f8ccb6f724e2bdced377f56d36c3810649992 \
sha256 44c987c941b69fcf77d4e9fa7f8039eb8bf82591e8184c431f44351abe6bba3e \
@@ -55,7 +55,7 @@ subport gnuradio-devel {

github.setup gnuradio gnuradio 896d1c9da31963ecf5b0d90942c2af51ca998a69
version 20180824
revision 1
revision 2
checksums rmd160 8ad7fccef7e21ea96356253432f5f13ad61660ed \
sha256 51080fad6f776f8aec1a6c557320c6c64b4c3c3fde3615ca4d43802de65f324f \
size 4425148
@@ -83,7 +83,7 @@ subport gnuradio-next {
checksums rmd160 e108e3a6da22301cb8ea1f7414b98eb57ef3844e \
sha256 0adf8f6c4fae5fa8513f248fc7d35abd59920a310e073c709d4850a32bad315c \
size 3430840
revision 0
revision 1

# set the version override string

2 science/gr-osmosdr/Portfile
View file
@@ -11,7 +11,7 @@ maintainers {michaelld @michaelld} openmaintainer

github.setup osmocom gr-osmosdr 4d83c6067f059b0c5015c3f59f8117bbd361e877
version 20170704
revision 3
revision 4
checksums rmd160 7be1f9f0663066ffdb04f7f3378aef007b6c00d9 \
sha256 77eb39c4f19f27fac9e3029a01030b9a64168e15adcda7ad3ad9a7b0ecbfdd00 \
size 278330
42 science/uhd/Portfile
View file
@@ -20,12 +20,12 @@ if {${subport} eq ${name}} {
long_description ${description}: \
Provides the release version, which is typically updated every month or so.

github.setup EttusResearch uhd 3.13.0.2 v
revision 1
github.setup EttusResearch uhd 3.14.0.0 v
revision 0
conflicts uhd-devel uhd-39lts
checksums rmd160 0bfeca743efa675241625531b7cada6bdf763a64 \
sha256 6ea0ca6229fcf18ea0ce1269dffcf8cc4b385037cdd65b5d282a8179d3eea916 \
size 9419596
checksums rmd160 cf250374c2b1e5eaee0493945b20a4110d1724f5 \
sha256 033021dc43a5a22b045a6fa826a6529af923501ffc72d8692f0cc6e6f9ada497 \
size 12935507

# set the version override string

@@ -41,11 +41,6 @@ Provides the release version, which is typically updated every month or so.
patchfiles-append patch-host_CMakeLists.txt.release.diff
patch.pre_args -p1

# temporary patch to use "MATCHES" for "Clang" instead of
# "STREQUAL", since Clang can be "Clang" or "AppleClang".

patchfiles-append patch-fix-clang-match.release.diff

# temporary patch to fix searching for Boost::Python, which
# depends on the version of Boost & which Python. 2 parts: a patch
# and then reinplace. This is part 1.
@@ -234,35 +229,30 @@ default_variants +docs +examples +libusb +manual +test +manpages +gpsd

# select Python to use; default to 2.7

variant python27 conflicts python34 python35 python36 description {Build using Python 2.7} {}
variant python34 conflicts python27 python35 python36 description {Build using Python 3.4} {}
variant python35 conflicts python27 python34 python36 description {Build using Python 3.5} {}
variant python36 conflicts python27 python34 python35 description {Build using Python 3.6} {}
variant python27 conflicts python36 python37 description {Build using Python 2.7} {}
variant python36 conflicts python27 python37 description {Build using Python 3.6} {}
variant python37 conflicts python27 python36 description {Build using Python 3.7} {}

if {![variant_isset python27] &&
![variant_isset python34] &&
![variant_isset python35] &&
![variant_isset python36]} {
![variant_isset python36] &&
![variant_isset python37]} {
default_variants +python27
}

if {![variant_isset python27] &&
![variant_isset python34] &&
![variant_isset python35] &&
![variant_isset python36]} {
ui_error "\n\nYou must select one of the variants +python27 , +python34 , +python35, or +python36 .\n"
![variant_isset python36] &&
![variant_isset python37]} {
ui_error "\n\nYou must select one of the variants +python27 , +python36, or +python37 .\n"
return -code error "Invalid variant selection"
}

set PythonVersionNoDot ""
if {[variant_isset python27]} {
set PythonVersionNoDot "27"
} elseif {[variant_isset python34]} {
set PythonVersionNoDot "34"
} elseif {[variant_isset python35]} {
set PythonVersionNoDot "35"
} else {
} elseif {[variant_isset python36]} {
set PythonVersionNoDot "36"
} else {
set PythonVersionNoDot "37"
}
set PythonVersionWithDot [join [split ${PythonVersionNoDot} ""] "."]

64 science/uhd/files/patch-fix-boost-python.release.diff
View file
@@ -1,16 +1,14 @@
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index f25fa1f..3b4260c 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -286,15 +286,40 @@ ENDIF(WIN32)
@@ -284,15 +284,40 @@
# Choose a version of Python
########################################################################
OPTION(ENABLE_PYTHON3 "Enable Python 3. Default is Python 2" OFF)
-SET(BOOST_PYTHON_COMPONENT python)
-SET(BOOST_PYTHON_VERSION 2.7)
-IF(${ENABLE_PYTHON3})
- SET(BOOST_PYTHON_COMPONENT python3)
- SET(BOOST_PYTHON_VERSION 3)
option(ENABLE_PYTHON3 "Enable Python 3. Default is Python 2" OFF)
-set(BOOST_PYTHON_COMPONENT python)
-set(BOOST_PYTHON_VERSION 2.7)
-if(${ENABLE_PYTHON3})
- set(BOOST_PYTHON_COMPONENT python3)
- set(BOOST_PYTHON_VERSION 3)
+
+########################################################################
+# Find Boost Version
@@ -39,36 +37,36 @@ index f25fa1f..3b4260c 100644
+ SET(BOOST_PYTHON_COMPONENT python27)
+ SET(BOOST_PYTHON_VERSION 2.7)
+ ENDIF()
ENDIF()
endif()

+SET(BOOST_OPTIONAL_COMPONENTS ${BOOST_PYTHON_COMPONENT})
+
########################################################################
-# Setup Boost
+# Setup Boost : Required Components
########################################################################
MESSAGE(STATUS "")
MESSAGE(STATUS "Configuring Boost C++ Libraries...")
@@ -309,7 +334,6 @@ SET(BOOST_REQUIRED_COMPONENTS
message(STATUS "")
message(STATUS "Configuring Boost C++ Libraries...")
@@ -307,7 +332,6 @@
serialization
)

-SET(BOOST_OPTIONAL_COMPONENTS ${BOOST_PYTHON_COMPONENT})
IF(MINGW)
LIST(APPEND BOOST_REQUIRED_COMPONENTS thread_win32)
ELSE()
@@ -339,20 +363,25 @@ SET(Boost_ADDITIONAL_VERSIONS
MESSAGE(STATUS "Looking for optional Boost components...")
FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS})
-set(BOOST_OPTIONAL_COMPONENTS ${BOOST_PYTHON_COMPONENT})
if(MINGW)
list(APPEND BOOST_REQUIRED_COMPONENTS thread_win32)
else()
@@ -338,20 +362,25 @@
message(STATUS "Looking for optional Boost components...")
find_package(Boost ${BOOST_MIN_VERSION} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS})

+# NOTE: The next "FIND_PACKAGE" will overwrite certain Boost
+# variables, but we don't care because their info is already saved in
+# various variables that are not overwritten. Also, we want to keep
+# the required Boost libraries separate from the optional ones, which
+# is accompished via separate calls to "FIND_PACKAGE".
+
MESSAGE(STATUS "Looking for required Boost components...")
FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
message(STATUS "Looking for required Boost components...")
find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS})

+#Check to see if the Python version we're looking for exists
+STRING(TOUPPER ${BOOST_PYTHON_COMPONENT} BOOST_PYTHON_COMPONENT_VAR)
@@ -77,17 +75,17 @@ index f25fa1f..3b4260c 100644
+SET(BOOST_PYTHON_FOUND ${${BOOST_PYTHON_COMPONENT_FOUND}})
+SET(BOOST_PYTHON_LIBRARY ${${BOOST_PYTHON_COMPONENT_LIBRARY}})
+
# INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
# LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
# include_directories(${Boost_INCLUDE_DIRS})
# link_directories(${Boost_LIBRARY_DIRS})

-#Check to see if the Python version we're looking for exists
-SET(BOOST_PYTHON_FOUND ${Boost_PYTHON_FOUND})
-SET(BOOST_PYTHON_LIBRARY ${Boost_PYTHON_LIBRARY})
-IF(${ENABLE_PYTHON3})
- SET(BOOST_PYTHON_FOUND ${Boost_PYTHON3_FOUND})
- SET(BOOST_PYTHON_LIBRARY ${Boost_PYTHON3_LIBRARY})
-ENDIF()
-set(BOOST_PYTHON_FOUND ${Boost_PYTHON_FOUND})
-set(BOOST_PYTHON_LIBRARY ${Boost_PYTHON_LIBRARY})
-if(${ENABLE_PYTHON3})
- set(BOOST_PYTHON_FOUND ${Boost_PYTHON3_FOUND})
- set(BOOST_PYTHON_LIBRARY ${Boost_PYTHON3_LIBRARY})
-endif()
-
MESSAGE(STATUS "Boost include directories: ${Boost_INCLUDE_DIRS}")
MESSAGE(STATUS "Boost library directories: ${Boost_LIBRARY_DIRS}")
MESSAGE(STATUS "Boost libraries: ${Boost_LIBRARIES}")
message(STATUS "Boost include directories: ${Boost_INCLUDE_DIRS}")
message(STATUS "Boost library directories: ${Boost_LIBRARY_DIRS}")
message(STATUS "Boost libraries: ${Boost_LIBRARIES}")
31 science/uhd/files/patch-fix-clang-match.release.diff
View file

This file was deleted.

18 science/uhd/files/patch-host_CMakeLists.txt.release.diff
View file
@@ -1,15 +1,13 @@
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index ab7f41f..06cd1af 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -342,8 +342,8 @@
MESSAGE(STATUS "Looking for required Boost components...")
FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
@@ -341,8 +341,8 @@
message(STATUS "Looking for required Boost components...")
find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS})

-INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+# INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+# LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
+# include_directories(${Boost_INCLUDE_DIRS})
+# link_directories(${Boost_LIBRARY_DIRS})

#Check to see if the Python version we're looking for exists
SET(BOOST_PYTHON_FOUND ${Boost_PYTHON_FOUND})
set(BOOST_PYTHON_FOUND ${Boost_PYTHON_FOUND})

0 comments on commit 61b3a70

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