diff --git a/docker/files/wsjtx/wsjtx-hamlib.patch b/docker/files/wsjtx/wsjtx-hamlib.patch index 84f7861..09a8a88 100644 --- a/docker/files/wsjtx/wsjtx-hamlib.patch +++ b/docker/files/wsjtx/wsjtx-hamlib.patch @@ -1,6 +1,6 @@ ---- CMakeLists.txt 2020-05-25 19:26:41.423517236 +0200 -+++ CMakeLists.txt 2020-05-25 19:11:36.116236231 +0200 -@@ -79,24 +79,6 @@ +--- CMakeLists.txt.orig 2020-07-21 20:59:55.982026645 +0200 ++++ CMakeLists.txt 2020-07-21 21:01:25.444836112 +0200 +@@ -80,24 +80,6 @@ include (ExternalProject) @@ -12,9 +12,9 @@ -ExternalProject_Add (hamlib - GIT_REPOSITORY ${hamlib_repo} - GIT_TAG ${hamlib_TAG} -- URL ${CMAKE_CURRENT_SOURCE_DIR}/src/hamlib.tgz +- URL ${CMAKE_CURRENT_SOURCE_DIR}/src/${__hamlib_upstream} - URL_HASH MD5=${hamlib_md5sum} -- UPDATE_COMMAND ./bootstrap +- #UPDATE_COMMAND ${CMAKE_COMMAND} -E env "[ -f ./bootstrap ] && ./bootstrap" - PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 -N < ${CMAKE_CURRENT_SOURCE_DIR}/hamlib.patch - CONFIGURE_COMMAND /configure --prefix= --disable-shared --enable-static --without-cxx-binding ${EXTRA_FLAGS} # LIBUSB_LIBS=${USB_LIBRARY} - BUILD_COMMAND $(MAKE) all V=1 # $(MAKE) is ExternalProject_Add() magic to do recursive make @@ -25,7 +25,7 @@ # # custom target to make a hamlib source tarball # -@@ -128,7 +110,6 @@ +@@ -136,7 +118,6 @@ # build and optionally install WSJT-X using the hamlib package built # above # @@ -33,7 +33,7 @@ ExternalProject_Add (wsjtx GIT_REPOSITORY ${wsjtx_repo} GIT_TAG ${WSJTX_TAG} -@@ -152,7 +133,6 @@ +@@ -160,7 +141,6 @@ DEPENDEES build ) diff --git a/docker/files/wsjtx/wsjtx.patch b/docker/files/wsjtx/wsjtx.patch index b7854bb..59ac6b7 100644 --- a/docker/files/wsjtx/wsjtx.patch +++ b/docker/files/wsjtx/wsjtx.patch @@ -1,6 +1,6 @@ diff -ur wsjtx-orig/CMake/Modules/Findhamlib.cmake wsjtx/CMake/Modules/Findhamlib.cmake ---- wsjtx-orig/CMake/Modules/Findhamlib.cmake 2020-05-27 22:41:57.774855748 +0200 -+++ wsjtx/CMake/Modules/Findhamlib.cmake 2020-05-27 22:42:35.267939882 +0200 +--- wsjtx-orig/CMake/Modules/Findhamlib.cmake 2020-07-21 21:10:43.124810140 +0200 ++++ wsjtx/CMake/Modules/Findhamlib.cmake 2020-07-21 21:11:03.368019114 +0200 @@ -85,4 +85,4 @@ # Handle the QUIETLY and REQUIRED arguments and set HAMLIB_FOUND to # TRUE if all listed variables are TRUE @@ -8,9 +8,9 @@ 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) diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt ---- wsjtx-orig/CMakeLists.txt 2020-05-27 22:41:57.774855748 +0200 -+++ wsjtx/CMakeLists.txt 2020-05-27 22:58:18.905001618 +0200 -@@ -869,7 +869,7 @@ +--- wsjtx-orig/CMakeLists.txt 2020-07-21 21:10:43.124810140 +0200 ++++ wsjtx/CMakeLists.txt 2020-07-21 22:14:04.454639589 +0200 +@@ -871,7 +871,7 @@ # # libhamlib setup # @@ -19,7 +19,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt find_package (hamlib 3 REQUIRED) find_program (RIGCTL_EXE rigctl) find_program (RIGCTLD_EXE rigctld) -@@ -1326,54 +1326,10 @@ +@@ -1348,53 +1348,10 @@ endif(WSJT_BUILD_UTILS) @@ -51,9 +51,9 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt - -target_include_directories (wsjtx PRIVATE ${FFTW3_INCLUDE_DIRS}) -if (APPLE) -- target_link_libraries (wsjtx wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES}) +- target_link_libraries (wsjtx Qt5::SerialPort wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES}) -else () -- target_link_libraries (wsjtx wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES}) +- target_link_libraries (wsjtx Qt5::SerialPort wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES}) - if (OpenMP_C_FLAGS) - set_target_properties (wsjtx PROPERTIES - COMPILE_FLAGS "${OpenMP_C_FLAGS}" @@ -69,12 +69,11 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt - ) - endif () -endif () --qt5_use_modules (wsjtx SerialPort) # not sure why the interface link library syntax above doesn't work - # make a library for WSJT-X UDP servers # add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS}) add_library (wsjtx_udp-static STATIC ${UDP_library_CXXSRCS}) -@@ -1417,24 +1373,9 @@ +@@ -1437,24 +1394,9 @@ set_target_properties (message_aggregator PROPERTIES WIN32_EXECUTABLE ON) endif (WSJT_CREATE_WINMAIN) @@ -99,7 +98,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt # install (TARGETS wsjtx_udp EXPORT udp # RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -@@ -1453,12 +1394,7 @@ +@@ -1473,12 +1415,7 @@ # DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wsjtx # ) @@ -113,7 +112,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime ) -@@ -1471,39 +1407,6 @@ +@@ -1491,39 +1428,6 @@ ) endif(WSJT_BUILD_UTILS) diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh index fc76cfa..cf7bbb8 100755 --- a/docker/scripts/install-dependencies.sh +++ b/docker/scripts/install-dependencies.sh @@ -18,7 +18,7 @@ function cmakebuild() { 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" +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" BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapack-dev autoconf automake libtool texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev pkg-config libudev-dev libhamlib-dev patch xsltproc" apt-get update @@ -83,7 +83,7 @@ rm /js8call-hamlib.patch CMAKE_ARGS="-D CMAKE_CXX_FLAGS=-DJS8_USE_LEGACY_HAMLIB" cmakebuild ${JS8CALL_DIR} rm ${JS8CALL_TGZ} -WSJT_DIR=wsjtx-2.1.2 +WSJT_DIR=wsjtx-2.2.2 WSJT_TGZ=${WSJT_DIR}.tgz wget http://physics.princeton.edu/pulsar/k1jt/${WSJT_TGZ} tar xfz ${WSJT_TGZ}