1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-30 20:52:26 -04:00

Removed dependency on liblz4

This commit is contained in:
f4exb 2017-06-10 19:20:58 +02:00
parent 23b792ef9d
commit ac345bbe97
9 changed files with 5 additions and 14 deletions

View File

@ -265,7 +265,7 @@ Install cmake version 3:
<h3>With newer versions just do:</h3> <h3>With newer versions just do:</h3>
- `sudo apt-get install cmake g++ pkg-config libfftw3-dev libqt5multimedia5-plugins qtmultimedia5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtbase5-dev libusb-1.0 librtlsdr-dev libboost-all-dev libasound2-dev pulseaudio liblz4-dev libnanomsg-dev libopencv-dev libsqlite3-dev` - `sudo apt-get install cmake g++ pkg-config libfftw3-dev libqt5multimedia5-plugins qtmultimedia5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtbase5-dev libusb-1.0 librtlsdr-dev libboost-all-dev libasound2-dev pulseaudio libnanomsg-dev libopencv-dev libsqlite3-dev`
- `mkdir build && cd build && cmake ../ && make` - `mkdir build && cd build && cmake ../ && make`
`librtlsdr-dev` is in the `universe` repo. (utopic 14.10 amd64.) `librtlsdr-dev` is in the `universe` repo. (utopic 14.10 amd64.)
@ -290,7 +290,7 @@ For Debian Jessie or Stretch:
This has been tested with the bleeding edge "Thumbleweed" distribution: This has been tested with the bleeding edge "Thumbleweed" distribution:
`sudo zypper install cmake fftw3-devel gcc-c++ libusb-1_0-devel libqt5-qtbase-devel libQt5OpenGL-devel libqt5-qtmultimedia-devel libqt5-qttools-devel libQt5Network-devel libQt5Widgets-devel boost-devel alsa-devel pulseaudio liblz4 liblz4-devel` `sudo zypper install cmake fftw3-devel gcc-c++ libusb-1_0-devel libqt5-qtbase-devel libQt5OpenGL-devel libqt5-qtmultimedia-devel libqt5-qttools-devel libQt5Network-devel libQt5Widgets-devel boost-devel alsa-devel pulseaudio`
Then you should be all set to build the software with `cmake` and `make` as discussed earlier. Then you should be all set to build the software with `cmake` and `make` as discussed earlier.
@ -303,7 +303,7 @@ This has been tested with Fedora 23 and 22:
- `sudo dnf groupinstall "C Development Tools and Libraries"` - `sudo dnf groupinstall "C Development Tools and Libraries"`
- `sudo dnf install mesa-libGL-devel` - `sudo dnf install mesa-libGL-devel`
- `sudo dnf install cmake gcc-c++ pkgconfig fftw-devel libusb-devel qt5-qtbase-devel qt5-qtmultimedia-devel qt5-qttools-devel boost-devel pulseaudio alsa-lib-devel liblz4 liblz4-devel` - `sudo dnf install cmake gcc-c++ pkgconfig fftw-devel libusb-devel qt5-qtbase-devel qt5-qtmultimedia-devel qt5-qttools-devel boost-devel pulseaudio alsa-lib-devel`
Then you should be all set to build the software with `cmake` and `make` as discussed earlier. Then you should be all set to build the software with `cmake` and `make` as discussed earlier.
@ -313,7 +313,7 @@ Then you should be all set to build the software with `cmake` and `make` as disc
Tested with the 15.09 version with LXDE desktop (community supported). The exact desktop environment should not matter anyway. Since Manjaro is Arch Linux based prerequisites should be similar for Arch and all derivatives. Tested with the 15.09 version with LXDE desktop (community supported). The exact desktop environment should not matter anyway. Since Manjaro is Arch Linux based prerequisites should be similar for Arch and all derivatives.
`sudo pacman -S cmake pkg-config fftw qt5-multimedia qt5-tools qt5-base libusb boost boost-libs pulseaudio lz4` `sudo pacman -S cmake pkg-config fftw qt5-multimedia qt5-tools qt5-base libusb boost boost-libs pulseaudio`
Then you should be all set to build the software with `cmake` and `make` as discussed earlier. Then you should be all set to build the software with `cmake` and `make` as discussed earlier.

View File

@ -13,7 +13,6 @@ mkdir -p "${APP_PLUGINS}/samplesource"
cp -v fcdhid/libfcdhid.dylib $APP_LIB cp -v fcdhid/libfcdhid.dylib $APP_LIB
cp -v fcdlib/libfcdlib.dylib $APP_LIB cp -v fcdlib/libfcdlib.dylib $APP_LIB
cp -v lz4/liblz4.dylib $APP_LIB
cp -v mbelib/libmbelib.dylib $APP_LIB cp -v mbelib/libmbelib.dylib $APP_LIB
cp -v sdrbase/libsdrbase.dylib $APP_LIB cp -v sdrbase/libsdrbase.dylib $APP_LIB
cp -v devices/libdevices.dylib $APP_LIB cp -v devices/libdevices.dylib $APP_LIB
@ -28,6 +27,5 @@ cd $APP_LIB
cp /opt/local/lib/libnanomsg.5.0.0.dylib . cp /opt/local/lib/libnanomsg.5.0.0.dylib .
ln -s libdsdcc.dylib libdsdcc.1.dylib ln -s libdsdcc.dylib libdsdcc.1.dylib
ln -s libdevices.dylib libdevices.1.dylib ln -s libdevices.dylib libdevices.1.dylib
ln -s liblz4.dylib liblz4.1.dylib
ln -s libsdrbase.dylib libsdrbase.1.dylib ln -s libsdrbase.dylib libsdrbase.1.dylib
ln -s libmbelib.dylib libmbelib.1.dylib ln -s libmbelib.dylib libmbelib.1.dylib

2
debian/control vendored
View File

@ -10,7 +10,7 @@ Homepage: https://github.com/f4exb/sdrangel
Package: sdrangel Package: sdrangel
Architecture: any Architecture: any
Depends: libc6, libasound2, libfftw3-single3, libgcc1, libgl1-mesa-glx, liblz4-1, libnanomsg0, libqt5core5a, libqt5gui5, libqt5multimedia5, libqt5network5, libqt5opengl5, libqt5widgets5, libstdc++6, libusb-1.0-0, libopencv-dev, libsqlite3-dev, ${shlibs:Depends}, ${misc:Depends} Depends: libc6, libasound2, libfftw3-single3, libgcc1, libgl1-mesa-glx, libnanomsg0, libqt5core5a, libqt5gui5, libqt5multimedia5, libqt5network5, libqt5opengl5, libqt5widgets5, libstdc++6, libusb-1.0-0, libopencv-dev, libsqlite3-dev, ${shlibs:Depends}, ${misc:Depends}
Description: SDR/Analyzer/Generator front-end for various hardware Description: SDR/Analyzer/Generator front-end for various hardware
SDR/Analyzer/Generator front-end for Airspy, BladeRF (Rx), HackRF (Rx), RTL-SDR and FunCube. SDR/Analyzer/Generator front-end for Airspy, BladeRF (Rx), HackRF (Rx), RTL-SDR and FunCube.
Also File source and sink for I/Q samples, network I/Q sources with SDRDaemon. Also File source and sink for I/Q samples, network I/Q sources with SDRDaemon.

View File

@ -19,7 +19,6 @@ CONFIG(MINGW64):LIBCM256CCSRC = "D:\softs\cm256cc"
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../lz4
INCLUDEPATH += $$LIBNANOMSGSRC/src INCLUDEPATH += $$LIBNANOMSGSRC/src
INCLUDEPATH += $$LIBCM256CCSRC INCLUDEPATH += $$LIBCM256CCSRC
@ -53,7 +52,6 @@ sdrdaemonsourceudphandler.h
FORMS += sdrdaemonsourcegui.ui FORMS += sdrdaemonsourcegui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../lz4/$${build_subdir} -llz4
LIBS += -L../../../nanomsg/$${build_subdir} -lnanomsg LIBS += -L../../../nanomsg/$${build_subdir} -lnanomsg
LIBS += -L../../../cm256cc/$${build_subdir} -lcm256cc LIBS += -L../../../cm256cc/$${build_subdir} -lcm256cc

View File

@ -18,7 +18,6 @@
#include <cassert> #include <cassert>
#include <cstring> #include <cstring>
#include <cmath> #include <cmath>
#include <lz4.h>
#include <boost/crc.hpp> #include <boost/crc.hpp>
#include <boost/cstdint.hpp> #include <boost/cstdint.hpp>
#include "sdrdaemonsourcebuffer.h" #include "sdrdaemonsourcebuffer.h"

View File

@ -6,7 +6,6 @@
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = sdrbase SUBDIRS = sdrbase
SUBDIRS += lz4
#SUBDIRS += librtlsdr #SUBDIRS += librtlsdr
#SUBDIRS += libhackrf #SUBDIRS += libhackrf
#SUBDIRS += libairspy #SUBDIRS += libairspy

View File

@ -7,7 +7,6 @@
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = sdrbase SUBDIRS = sdrbase
SUBDIRS += devices SUBDIRS += devices
SUBDIRS += lz4
SUBDIRS += fcdhid SUBDIRS += fcdhid
SUBDIRS += fcdlib SUBDIRS += fcdlib
SUBDIRS += mbelib SUBDIRS += mbelib

View File

@ -7,7 +7,6 @@
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = sdrbase SUBDIRS = sdrbase
SUBDIRS += devices SUBDIRS += devices
SUBDIRS += lz4
CONFIG(MINGW64)SUBDIRS += nanomsg CONFIG(MINGW64)SUBDIRS += nanomsg
SUBDIRS += fcdhid SUBDIRS += fcdhid
SUBDIRS += fcdlib SUBDIRS += fcdlib

View File

@ -4,7 +4,6 @@ SET opencvdir="D:\softs\opencv\build\mw32\install\x86\mingw\bin"
copy app\%1\sdrangel.exe %2 copy app\%1\sdrangel.exe %2
copy sdrbase\%1\sdrbase.dll %2 copy sdrbase\%1\sdrbase.dll %2
copy devices\%1\devices.dll %2 copy devices\%1\devices.dll %2
copy lz4\%1\lz4.dll %2
copy mbelib\%1\mbelib.dll %2 copy mbelib\%1\mbelib.dll %2
copy dsdcc\%1\dsdcc.dll %2 copy dsdcc\%1\dsdcc.dll %2
copy serialdv\%1\serialdv.dll %2 copy serialdv\%1\serialdv.dll %2