joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to wsjtx 2.3.0

Browse Source
This commit is contained in:
Jakob Ketterl 2021-02-01 23:56:09 +01:00
parent 5e1c4391c6
commit 1ee75295e5
3 changed files with 78 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
docker/files/wsjtx/wsjtx-hamlib.patch
View File

@ -1,17 +1,16 @@
--- CMakeLists.txt.orig 2020-07-21 20:59:55.982026645 +0200 --- CMakeLists.txt.orig 2021-02-01 21:00:44.879969236 +0100
+++ CMakeLists.txt 2020-07-21 21:01:25.444836112 +0200 +++ CMakeLists.txt 2021-02-01 21:04:58.184642042 +0100
@@ -80,24 +80,6 @@ @@ -106,24 +106,6 @@
include (ExternalProject)
- #
-#
-# build and install hamlib locally so it can be referenced by the -# build and install hamlib locally so it can be referenced by the
-# WSJT-X build -# WSJT-X build
-# -#
-ExternalProject_Add (hamlib -ExternalProject_Add (hamlib
- GIT_REPOSITORY ${hamlib_repo} - GIT_REPOSITORY ${hamlib_repo}
- GIT_TAG ${hamlib_TAG} - GIT_TAG ${hamlib_TAG}
- GIT_SHALLOW False
- URL ${CMAKE_CURRENT_SOURCE_DIR}/src/${__hamlib_upstream} - URL ${CMAKE_CURRENT_SOURCE_DIR}/src/${__hamlib_upstream}
- URL_HASH MD5=${hamlib_md5sum} - URL_HASH MD5=${hamlib_md5sum}
- #UPDATE_COMMAND ${CMAKE_COMMAND} -E env "[ -f ./bootstrap ] && ./bootstrap" - #UPDATE_COMMAND ${CMAKE_COMMAND} -E env "[ -f ./bootstrap ] && ./bootstrap"
@ -22,10 +21,11 @@
- STEP_TARGETS update install - STEP_TARGETS update install
- ) - )
- -
# -#
# custom target to make a hamlib source tarball # custom target to make a hamlib source tarball
# #
@@ -136,7 +118,6 @@ add_custom_target (hamlib_sources
@@ -161,7 +143,6 @@
# build and optionally install WSJT-X using the hamlib package built # build and optionally install WSJT-X using the hamlib package built
# above # above
# #
@ -33,11 +33,18 @@
ExternalProject_Add (wsjtx ExternalProject_Add (wsjtx
GIT_REPOSITORY ${wsjtx_repo} GIT_REPOSITORY ${wsjtx_repo}
GIT_TAG ${WSJTX_TAG} GIT_TAG ${WSJTX_TAG}
@@ -160,7 +141,6 @@ @@ -186,14 +167,8 @@
DEPENDEES build DEPENDEES build
) )
-set_target_properties (hamlib PROPERTIES EXCLUDE_FROM_ALL 1) -set_target_properties (hamlib PROPERTIES EXCLUDE_FROM_ALL 1)
set_target_properties (wsjtx PROPERTIES EXCLUDE_FROM_ALL 1) set_target_properties (wsjtx PROPERTIES EXCLUDE_FROM_ALL 1)
add_dependencies (wsjtx-configure hamlib-install) -add_dependencies (wsjtx-configure hamlib-install)
-add_dependencies (wsjtx-build hamlib-install)
-add_dependencies (wsjtx-install hamlib-install)
-add_dependencies (wsjtx-package hamlib-install)
-
# export traditional targets
add_custom_target (build ALL DEPENDS wsjtx-build)
add_custom_target (install DEPENDS wsjtx-install)

88
docker/files/wsjtx/wsjtx.patch
View File

@ -1,6 +1,6 @@
diff -ur wsjtx-orig/CMake/Modules/Findhamlib.cmake wsjtx/CMake/Modules/Findhamlib.cmake diff -ur wsjtx-orig/CMake/Modules/Findhamlib.cmake wsjtx/CMake/Modules/Findhamlib.cmake
--- wsjtx-orig/CMake/Modules/Findhamlib.cmake 2020-07-21 21:10:43.124810140 +0200 --- wsjtx-orig/CMake/Modules/Findhamlib.cmake 2021-02-01 20:38:00.947536514 +0100
+++ wsjtx/CMake/Modules/Findhamlib.cmake 2020-07-21 21:11:03.368019114 +0200 +++ wsjtx/CMake/Modules/Findhamlib.cmake 2021-02-01 20:39:06.273680932 +0100
@@ -85,4 +85,4 @@ @@ -85,4 +85,4 @@
# Handle the QUIETLY and REQUIRED arguments and set HAMLIB_FOUND to # Handle the QUIETLY and REQUIRED arguments and set HAMLIB_FOUND to
# TRUE if all listed variables are TRUE # TRUE if all listed variables are TRUE
@ -8,9 +8,18 @@ diff -ur wsjtx-orig/CMake/Modules/Findhamlib.cmake wsjtx/CMake/Modules/Findhamli
-find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES hamlib_LIBRARY_DIRS) -find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES hamlib_LIBRARY_DIRS)
+find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES) +find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES)
diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
--- wsjtx-orig/CMakeLists.txt 2020-07-21 21:10:43.124810140 +0200 --- wsjtx-orig/CMakeLists.txt 2021-02-01 20:38:00.947536514 +0100
+++ wsjtx/CMakeLists.txt 2020-07-21 22:14:04.454639589 +0200 +++ wsjtx/CMakeLists.txt 2021-02-01 23:02:22.503027275 +0100
@@ -871,7 +871,7 @@ @@ -122,7 +122,7 @@
option (WSJT_QDEBUG_TO_FILE "Redirect Qt debuging messages to a trace file.")
option (WSJT_SOFT_KEYING "Apply a ramp to CW keying envelope to reduce transients." ON)
option (WSJT_SKIP_MANPAGES "Skip *nix manpage generation.")
-option (WSJT_GENERATE_DOCS "Generate documentation files." ON)
+option (WSJT_GENERATE_DOCS "Generate documentation files.")
option (WSJT_RIG_NONE_CAN_SPLIT "Allow split operation with \"None\" as rig.")
option (WSJT_TRACE_UDP "Debugging option that turns on UDP message protocol diagnostics.")
option (WSJT_BUILD_UTILS "Build simulators and code demonstrators." ON)
@@ -856,7 +856,7 @@
# #
# libhamlib setup # libhamlib setup
# #
@ -19,31 +28,37 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
find_package (hamlib 3 REQUIRED) find_package (hamlib 3 REQUIRED)
find_program (RIGCTL_EXE rigctl) find_program (RIGCTL_EXE rigctl)
find_program (RIGCTLD_EXE rigctld) find_program (RIGCTLD_EXE rigctld)
@@ -1348,53 +1348,10 @@ @@ -1376,60 +1376,6 @@
target_link_libraries (jt9 wsjt_fort wsjt_cxx fort_qt)
endif(WSJT_BUILD_UTILS) endif (${OPENMP_FOUND} OR APPLE)
-# build the main application -# build the main application
-generate_version_info (wsjtx_VERSION_RESOURCES
- NAME wsjtx
- BUNDLE ${PROJECT_BUNDLE_NAME}
- ICON ${WSJTX_ICON_FILE}
- )
-
-add_executable (wsjtx MACOSX_BUNDLE -add_executable (wsjtx MACOSX_BUNDLE
- ${wsjtx_CXXSRCS} - ${wsjtx_CXXSRCS}
- ${wsjtx_GENUISRCS} - ${wsjtx_GENUISRCS}
- wsjtx.rc
- ${WSJTX_ICON_FILE} - ${WSJTX_ICON_FILE}
- ${wsjtx_RESOURCES_RCC} - ${wsjtx_RESOURCES_RCC}
- ${wsjtx_VERSION_RESOURCES}
- ) - )
- -
if (WSJT_CREATE_WINMAIN) -if (WSJT_CREATE_WINMAIN)
set_target_properties (wsjtx PROPERTIES WIN32_EXECUTABLE ON) - set_target_properties (wsjtx PROPERTIES WIN32_EXECUTABLE ON)
endif (WSJT_CREATE_WINMAIN) -endif (WSJT_CREATE_WINMAIN)
-
-set_target_properties (wsjtx PROPERTIES -set_target_properties (wsjtx PROPERTIES
- MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Darwin/Info.plist.in" - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Darwin/Info.plist.in"
- MACOSX_BUNDLE_INFO_STRING "${WSJTX_DESCRIPTION_SUMMARY}" - MACOSX_BUNDLE_INFO_STRING "${PROJECT_DESCRIPTION}"
- MACOSX_BUNDLE_ICON_FILE "${WSJTX_ICON_FILE}" - MACOSX_BUNDLE_ICON_FILE "${WSJTX_ICON_FILE}"
- MACOSX_BUNDLE_BUNDLE_VERSION ${wsjtx_VERSION} - MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
- MACOSX_BUNDLE_SHORT_VERSION_STRING "v${wsjtx_VERSION}" - MACOSX_BUNDLE_SHORT_VERSION_STRING "v${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
- MACOSX_BUNDLE_LONG_VERSION_STRING "Version ${wsjtx_VERSION}" - MACOSX_BUNDLE_LONG_VERSION_STRING "Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${SCS_VERSION_STR}"
- MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}" - MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_BUNDLE_NAME}"
- MACOSX_BUNDLE_BUNDLE_EXECUTABLE_NAME "${PROJECT_NAME}" - MACOSX_BUNDLE_BUNDLE_EXECUTABLE_NAME "${PROJECT_NAME}"
- MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT}" - MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT}"
- MACOSX_BUNDLE_GUI_IDENTIFIER "org.k1jt.wsjtx" - MACOSX_BUNDLE_GUI_IDENTIFIER "org.k1jt.wsjtx"
@ -51,9 +66,9 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
- -
-target_include_directories (wsjtx PRIVATE ${FFTW3_INCLUDE_DIRS}) -target_include_directories (wsjtx PRIVATE ${FFTW3_INCLUDE_DIRS})
-if (APPLE) -if (APPLE)
- target_link_libraries (wsjtx Qt5::SerialPort wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES}) - target_link_libraries (wsjtx wsjt_fort)
-else () -else ()
- target_link_libraries (wsjtx Qt5::SerialPort wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES}) - target_link_libraries (wsjtx wsjt_fort_omp)
- if (OpenMP_C_FLAGS) - if (OpenMP_C_FLAGS)
- set_target_properties (wsjtx PROPERTIES - set_target_properties (wsjtx PROPERTIES
- COMPILE_FLAGS "${OpenMP_C_FLAGS}" - COMPILE_FLAGS "${OpenMP_C_FLAGS}"
@ -65,15 +80,16 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
- ) - )
- if (WIN32) - if (WIN32)
- set_target_properties (wsjtx PROPERTIES - set_target_properties (wsjtx PROPERTIES
- LINK_FLAGS -Wl,--stack,16777216 - LINK_FLAGS -Wl,--stack,0x1000000,--heap,0x20000000
- ) - )
- endif () - endif ()
-endif () -endif ()
-target_link_libraries (wsjtx Qt5::SerialPort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES} ${LIBM_LIBRARIES})
- -
# make a library for WSJT-X UDP servers # make a library for WSJT-X UDP servers
# add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS}) # add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS})
add_library (wsjtx_udp-static STATIC ${UDP_library_CXXSRCS}) add_library (wsjtx_udp-static STATIC ${UDP_library_CXXSRCS})
@@ -1437,24 +1394,9 @@ @@ -1492,24 +1438,9 @@
set_target_properties (message_aggregator PROPERTIES WIN32_EXECUTABLE ON) set_target_properties (message_aggregator PROPERTIES WIN32_EXECUTABLE ON)
endif (WSJT_CREATE_WINMAIN) endif (WSJT_CREATE_WINMAIN)
@ -98,21 +114,21 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
# install (TARGETS wsjtx_udp EXPORT udp # install (TARGETS wsjtx_udp EXPORT udp
# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} # RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -1473,12 +1415,7 @@ @@ -1528,12 +1459,7 @@
# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wsjtx # DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wsjtx
# ) # )
-install (TARGETS udp_daemon message_aggregator -install (TARGETS udp_daemon message_aggregator wsjtx_app_version
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
- BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime - BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
- ) - )
- -
-install (TARGETS jt9 wsprd fmtave fcal fmeasure -install (TARGETS jt9 wsprd fmtave fcal fmeasure
+install (TARGETS jt9 wsprd +install (TARGETS wsjtx_app_version jt9 wsprd
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
) )
@@ -1491,39 +1428,6 @@ @@ -1546,38 +1472,6 @@
) )
endif(WSJT_BUILD_UTILS) endif(WSJT_BUILD_UTILS)
@ -143,13 +159,25 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
- AUTHORS - AUTHORS
- THANKS - THANKS
- NEWS - NEWS
- INSTALL
- BUGS - BUGS
- DESTINATION ${CMAKE_INSTALL_DOCDIR} - DESTINATION ${CMAKE_INSTALL_DOCDIR}
- #COMPONENT runtime - #COMPONENT runtime
- ) - )
- -
install (FILES install (FILES
contrib/Ephemeris/JPLEPH cty.dat
DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME} cty.dat_copyright.txt
Only in wsjtx: .idea @@ -1586,13 +1480,6 @@
#COMPONENT runtime
)
-install (DIRECTORY
- example_log_configurations
- DESTINATION ${CMAKE_INSTALL_DOCDIR}
- FILES_MATCHING REGEX "^.*[^~]$"
- #COMPONENT runtime
- )
-
#
# Mac installer files
#

6
docker/scripts/install-dependencies.sh
View File

@ -18,8 +18,8 @@ function cmakebuild() {
cd /tmp cd /tmp
STATIC_PACKAGES="sox libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5core5a libreadline7 libgfortran4 libgomp1 libasound2 libudev1 ca-certificates libqt5gui5 libqt5sql5 libqt5printsupport5 libpulse0 libfaad2 libopus0 libboost-program-options1.67.0" STATIC_PACKAGES="sox libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5core5a libreadline7 libgfortran4 libgomp1 libasound2 libudev1 ca-certificates libqt5gui5 libqt5sql5 libqt5printsupport5 libpulse0 libfaad2 libopus0 libboost-program-options1.67.0 libboost-log1.67.0"
BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapack-dev texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev libudev-dev libhamlib-dev patch xsltproc qt5-default libfaad-dev libopus-dev libgtest-dev libboost-dev libboost-program-options-dev" BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapack-dev texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev libudev-dev libhamlib-dev patch xsltproc qt5-default libfaad-dev libopus-dev libgtest-dev libboost-dev libboost-program-options-dev libboost-log-dev libboost-regex-dev"
apt-get update apt-get update
apt-get -y install auto-apt-proxy apt-get -y install auto-apt-proxy
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
@ -60,7 +60,7 @@ rm /js8call-hamlib.patch
CMAKE_ARGS="-D CMAKE_CXX_FLAGS=-DJS8_USE_HAMLIB_THREE" cmakebuild ${JS8CALL_DIR} CMAKE_ARGS="-D CMAKE_CXX_FLAGS=-DJS8_USE_HAMLIB_THREE" cmakebuild ${JS8CALL_DIR}
rm ${JS8CALL_TGZ} rm ${JS8CALL_TGZ}
WSJT_DIR=wsjtx-2.2.2 WSJT_DIR=wsjtx-2.3.0
WSJT_TGZ=${WSJT_DIR}.tgz WSJT_TGZ=${WSJT_DIR}.tgz
wget http://physics.princeton.edu/pulsar/k1jt/${WSJT_TGZ} wget http://physics.princeton.edu/pulsar/k1jt/${WSJT_TGZ}
tar xfz ${WSJT_TGZ} tar xfz ${WSJT_TGZ}