From db73166da7481bd93d896dadf31d3db6174cd769 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Tue, 11 Feb 2025 22:15:34 -0500 Subject: [PATCH] Cygwin SH File Tweaks; --- download-and-install-cygwin.sh | 12 ++------ examples/Install_Notes.md | 54 +++++++++++++--------------------- 2 files changed, 23 insertions(+), 43 deletions(-) diff --git a/download-and-install-cygwin.sh b/download-and-install-cygwin.sh index b482536..a2bcd4d 100644 --- a/download-and-install-cygwin.sh +++ b/download-and-install-cygwin.sh @@ -1,11 +1,5 @@ #! /bin/bash # -#run cygwin installer with this to get all the packages -#use http://www.gtlib.gatech.edu mirror (seems relatively fast) -#.\setup-x86-64.exe --packages nano,libpulse-devel,libpulse-mainloop-glib0,libpulse-simple0,libpulse0,pulseaudio,pulseaudio-debuginfo,pulseaudio-equalizer,pulseaudio-module-x11,pulseaudio-module-zeroconf,pulseaudio-utils,sox-fmt-pulseaudio,libusb0,libusb1.0,libusb1.0-debuginfo,libusb1.0-devel,libncurses++w10,libncurses-devel,libncursesw10,ncurses,cmake,gcc-core,gcc-debuginfo,gcc-objc,git,make,socat,sox,sox-fmt-ao,unzip,wget,gcc-g++,libsndfile-devel -#Nurse the installer by clicking next and waiting for it to finish, etc -#Ignore the warning popup telling you to install libusb from sourceforge, it is NOT NEEDED and actually makes the dongle not work with DSD-FME - cdir=$(pwd) clear printf "Digital Speech Decoder: Florida Man Edition - Auto Installer For Cygwin\n @@ -36,8 +30,6 @@ if [ "$ANSWER" = "y" ]; then cmake .. make make install - #can't remember if copying this to /bin is required or not - #cp cygitpp-8.dll /bin #MBELIB cd $cdir @@ -53,7 +45,7 @@ if [ "$ANSWER" = "y" ]; then #CODEC2 cd $cdir - printf "Installing CODEC2\n Please wait!\n" + printf "Installing codec2\n Please wait!\n" git clone https://github.com/drowe67/codec2.git cd codec2 mkdir build @@ -78,7 +70,7 @@ if [ "$ANSWER" = "y" ]; then printf "Installing RTL-SDR\n Please wait!\n" git clone https://github.com/lwvmobile/dsd-fme.git cd dsd-fme - git checkout cygwin_fixes + #git checkout cygwin_fixes mkdir build cd build cmake .. diff --git a/examples/Install_Notes.md b/examples/Install_Notes.md index 213f584..bbec024 100644 --- a/examples/Install_Notes.md +++ b/examples/Install_Notes.md @@ -105,22 +105,6 @@ cd .. cd .. ``` -Note: Some environment/distro users (Cygwin, Arch, and others) may need to manually copy any libmbe files found in the build folder to the /usr/lib folder on root. - -``` -cp libmbe* /usr/lib -cp cygmbe* /usr/lib -cp cygmbe* /bin -``` - -or - -``` -sudo cp libmbe* /usr/lib -sudo cp cygmbe* /usr/lib -sudo cp cygmbe* /bin -``` - Finish by running these steps to clone and build DSD-FME. ``` @@ -135,30 +119,34 @@ sudo ldconfig ``` +### LD_PATH + +Some environments may require an LD path to be set to /usr/local/lib, similar to: +``` +LD_LIBRARY_PATH=/usr/local/lib +export LD_LIBRARY_PATH +``` + ### Windows Cygwin Builds -If using RTL input support, you must install libusb-win32 before proceeding with Cygwin installation. You will also need to build and compile a version of librtlsdr, but this can be tricky, and personally, I had to resort to using a much older version of the source code to get it to build at all with the rtl support in the precompiled 'Aero' builds. +Cygwin builds now have an experimental semi-automatic installer, to run, follow steps below: -Then install all dependencies available in the repo prior to building, either directly selecting them during setup with the setup-x86.exe or setup-x64.exe or by issuing a command similar to this: +Open Windows PowerShell (not Command Prompt) and copy and paste all of this in all at once. ``` -setup-x64.exe --packages libpulse-devel,libpulse-mainloop-glib0,libpulse-simple0,libpulse0,pulseaudio,pulseaudio-debuginfo,pulseaudio-equalizer,pulseaudio-module-x11,pulseaudio-module-zeroconf,pulseaudio-utils,sox-fmt-pulseaudio,xfce-pulseaudio-plugin,libusb0,libusb1.0,libusb1.0-debuginfo,libusb1.0-devel,libncurses++w10,libncurses-devel,libncursesw10,ncurses,cmake,gcc-core,gcc-debuginfo,gcc-objc,git,make,socat,sox,sox-fmt-ao,unzip,wget,gcc-g++,libsndfile-devel -``` - -Then manually install ITPP and MBElib, see above install notes. Be sure to run `cp libmbe* /usr/lib` after compiling MBElib. - -Then you can build and install using +Invoke-WebRequest https://cygwin.com/setup-x86_64.exe -OutFile setup-x86_64.exe +.\setup-x86_64.exe --packages nano,libpulse-devel,libpulse-mainloop-glib0,libpulse-simple0,libpulse0,pulseaudio,pulseaudio-debuginfo,pulseaudio-equalizer,pulseaudio-module-x11,pulseaudio-module-zeroconf,pulseaudio-utils,sox-fmt-pulseaudio,libusb0,libusb1.0,libusb1.0-debuginfo,libusb1.0-devel,libncurses++w10,libncurses-devel,libncursesw10,ncurses,cmake,gcc-core,gcc-debuginfo,gcc-objc,git,make,socat,sox,sox-fmt-ao,unzip,wget,gcc-g++,libsndfile-devel +C:\cygwin64\bin\mintty.exe /bin/bash -l -c "exit" +C:\cygwin64\bin\mintty.exe /bin/bash -l -c "wget https://raw.githubusercontent.com/lwvmobile/dsd-fme/refs/heads/cygwin_fixes/download-and-install-cygwin.sh; sh download-and-install-cygwin.sh;" +C:\cygwin64\bin\mintty.exe /bin/bash -l -c "dsd-fme;" ``` -git clone https://github.com/lwvmobile/dsd-fme -cd dsd-fme -mkdir build -cd build -# -DAERO=ON is optional, but recommended if you want the older OSS support as well -cmake -DAERO=ON .. -make -make install -``` + +Pick a Mirror. http://www.gtlib.gatech.edu mirror seems relatively fast. +Nurse the Cygwin installer by clicking next and waiting for it to finish, etc +Ignore the warning popup telling you to install libusb from sourceforge, it is NOT NEEDED and actually makes the dongle not work with DSD-FME. +After Cygwin finishes installing, the installer sh script will download and run, be patient, it may also take a little while. +After the sh script finishes, dsd-fme should open. If not, then double click on the Cygwin Terminal desktop shortcut, and try running `dsd-fme` ### Virtual Sinks