diff --git a/CMakeLists.txt b/CMakeLists.txt index ba08f1c09..33f59f311 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -884,8 +884,6 @@ find_program (RIGCTLCOM_EXE rigctlcom) 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) # @@ -1405,6 +1403,7 @@ endif (${OPENMP_FOUND} OR APPLE) if (WIN32) # build map65 + find_package (Portaudio REQUIRED) add_subdirectory (map65) endif () diff --git a/doc/user_guide/en/install-linux.adoc b/doc/user_guide/en/install-linux.adoc index c34baaaa1..fc8ab68c2 100644 --- a/doc/user_guide/en/install-linux.adoc +++ b/doc/user_guide/en/install-linux.adoc @@ -10,12 +10,6 @@ with the release for details of the targeted Linux distributions and versions. If the binary package is not compatible with your Linux distribution or version, you must build the application from sources. -* 32-bit Intel/AMD: {debian32} -- To install: -+ -[example] -sudo dpkg -i wsjtx_{VERSION}_i386.deb - * 64-bit Intel/AMD: {debian64} - To install: + @@ -45,24 +39,18 @@ You may also need to execute the following command in a terminal: sudo apt install libgfortran5 libqt5widgets5 libqt5network5 \ libqt5printsupport5 libqt5multimedia5-plugins libqt5serialport5 \ libqt5sql5-sqlite libfftw3-single3 libgomp1 libboost-all-dev \ - libusb-1.0-0 + libusb-1.0-0 libportaudio2 .... Fedora, CentOS, Red Hat, and other rpm-based systems: -* 32-bit: {fedora32} -- To install: -+ -[example] -sudo rpm -i wsjtx-{VERSION}-i686.rpm - * 64-bit: {fedora64} - To install: + [example] sudo rpm -i wsjtx-{VERSION}-x86_64.rpm -* Uninstall for either of the above platforms: +* Uninstall: + [example] sudo rpm -e wsjtx @@ -72,5 +60,5 @@ You may also need to execute the following command in a terminal: .... sudo dnf install libgfortran fftw-libs-single qt5-qtbase \ qt5-qtmultimedia qt5-qtserialport qt5-qtsvg \ - qt5-qtserialport libgomp boost libusbx + qt5-qtserialport libgomp boost libusbx portaudio ....