update to wsjt-x 2.5.1
This commit is contained in:
		@@ -1,6 +1,6 @@
 | 
			
		||||
diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
 | 
			
		||||
--- wsjtx-orig/CMakeLists.txt	2021-09-28 14:36:01.731488130 +0200
 | 
			
		||||
+++ wsjtx/CMakeLists.txt	2021-09-28 15:51:30.136197625 +0200
 | 
			
		||||
--- wsjtx-orig/CMakeLists.txt	2021-11-02 16:34:09.361811689 +0100
 | 
			
		||||
+++ wsjtx/CMakeLists.txt	2021-11-02 16:38:36.696088115 +0100
 | 
			
		||||
@@ -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)
 | 
			
		||||
@@ -87,16 +87,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
 | 
			
		||||
   )
 | 
			
		||||
 
 | 
			
		||||
 set (wsjt_qtmm_CXXSRCS
 | 
			
		||||
@@ -884,8 +815,6 @@
 | 
			
		||||
 check_type_size (CACHE_ALL HAMLIB_OLD_CACHING)
 | 
			
		||||
 check_symbol_exists (rig_set_cache_timeout_ms "hamlib/rig.h" HAVE_HAMLIB_CACHING)
 | 
			
		||||
 
 | 
			
		||||
-find_package (Portaudio REQUIRED)
 | 
			
		||||
-
 | 
			
		||||
 find_package (Usb REQUIRED)
 | 
			
		||||
 
 | 
			
		||||
 #
 | 
			
		||||
@@ -1081,9 +1010,6 @@
 | 
			
		||||
@@ -1079,9 +1010,6 @@
 | 
			
		||||
 if (WSJT_GENERATE_DOCS)
 | 
			
		||||
   add_subdirectory (doc)
 | 
			
		||||
 endif (WSJT_GENERATE_DOCS)
 | 
			
		||||
@@ -106,7 +97,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
 | 
			
		||||
 
 | 
			
		||||
 # build a library of package functionality (without and optionally with OpenMP support)
 | 
			
		||||
 add_library (wsjt_cxx STATIC ${wsjt_CSRCS} ${wsjt_CXXSRCS})
 | 
			
		||||
@@ -1341,10 +1267,7 @@
 | 
			
		||||
@@ -1340,10 +1268,7 @@
 | 
			
		||||
 add_library (wsjt_qt STATIC ${wsjt_qt_CXXSRCS} ${wsjt_qt_GENUISRCS} ${GENAXSRCS})
 | 
			
		||||
 # set wsjtx_udp exports to static variants
 | 
			
		||||
 target_compile_definitions (wsjt_qt PUBLIC UDP_STATIC_DEFINE)
 | 
			
		||||
@@ -118,7 +109,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
 | 
			
		||||
 
 | 
			
		||||
 # build a library of package Qt functionality used in Fortran utilities
 | 
			
		||||
 add_library (fort_qt STATIC ${fort_qt_CXXSRCS})
 | 
			
		||||
@@ -1408,60 +1331,6 @@
 | 
			
		||||
@@ -1408,60 +1333,6 @@
 | 
			
		||||
   add_subdirectory (map65)
 | 
			
		||||
 endif ()
 | 
			
		||||
 
 | 
			
		||||
@@ -179,7 +170,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
 | 
			
		||||
 # 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})
 | 
			
		||||
@@ -1501,47 +1370,9 @@
 | 
			
		||||
@@ -1501,47 +1372,9 @@
 | 
			
		||||
 add_executable (wsjtx_app_version AppVersion/AppVersion.cpp ${wsjtx_app_version_VERSION_RESOURCES})
 | 
			
		||||
 target_link_libraries (wsjtx_app_version wsjt_qt)
 | 
			
		||||
 
 | 
			
		||||
@@ -227,7 +218,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
 | 
			
		||||
 
 | 
			
		||||
 # install (TARGETS wsjtx_udp EXPORT udp
 | 
			
		||||
 #   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 | 
			
		||||
@@ -1560,12 +1391,7 @@
 | 
			
		||||
@@ -1560,12 +1393,7 @@
 | 
			
		||||
 #   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wsjtx
 | 
			
		||||
 #   )
 | 
			
		||||
 
 | 
			
		||||
@@ -241,7 +232,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
 | 
			
		||||
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
 | 
			
		||||
   BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
 | 
			
		||||
   )
 | 
			
		||||
@@ -1578,38 +1404,6 @@
 | 
			
		||||
@@ -1578,38 +1406,6 @@
 | 
			
		||||
   )
 | 
			
		||||
 endif(WSJT_BUILD_UTILS)  
 | 
			
		||||
 
 | 
			
		||||
@@ -280,7 +271,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
 | 
			
		||||
 install (FILES
 | 
			
		||||
   cty.dat
 | 
			
		||||
   cty.dat_copyright.txt
 | 
			
		||||
@@ -1618,13 +1412,6 @@
 | 
			
		||||
@@ -1618,13 +1414,6 @@
 | 
			
		||||
   #COMPONENT runtime
 | 
			
		||||
   )
 | 
			
		||||
 
 | 
			
		||||
@@ -294,7 +285,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
 | 
			
		||||
 #
 | 
			
		||||
 # Mac installer files
 | 
			
		||||
 #
 | 
			
		||||
@@ -1676,22 +1463,6 @@
 | 
			
		||||
@@ -1676,22 +1465,6 @@
 | 
			
		||||
   "${CMAKE_CURRENT_BINARY_DIR}/wsjtx_config.h"
 | 
			
		||||
   )
 | 
			
		||||
 
 | 
			
		||||
@@ -317,4 +308,3 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
 | 
			
		||||
 if (APPLE)
 | 
			
		||||
   set (CMAKE_POSTFLIGHT_SCRIPT
 | 
			
		||||
     "${wsjtx_BINARY_DIR}/postflight.sh")
 | 
			
		||||
Only in wsjtx: .idea
 | 
			
		||||
 
 | 
			
		||||
@@ -51,7 +51,7 @@ rm /js8call-hamlib.patch
 | 
			
		||||
cmakebuild ${JS8CALL_DIR}
 | 
			
		||||
rm ${JS8CALL_TGZ}
 | 
			
		||||
 | 
			
		||||
WSJT_DIR=wsjtx-2.5.0
 | 
			
		||||
WSJT_DIR=wsjtx-2.5.1
 | 
			
		||||
WSJT_TGZ=${WSJT_DIR}.tgz
 | 
			
		||||
wget http://physics.princeton.edu/pulsar/k1jt/${WSJT_TGZ}
 | 
			
		||||
tar xfz ${WSJT_TGZ}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user