diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base index a62f998..811a2f2 100644 --- a/docker/Dockerfiles/Dockerfile-base +++ b/docker/Dockerfiles/Dockerfile-base @@ -2,6 +2,7 @@ FROM debian:buster-slim COPY docker/files/js8call/js8call-hamlib.patch \ docker/files/wsjtx/*.patch \ + docker/files/dream/*.patch \ docker/scripts/install-dependencies.sh \ docker/scripts/install-owrx-tools.sh / RUN /install-dependencies.sh && \ diff --git a/docker/files/dream/dream.patch b/docker/files/dream/dream.patch new file mode 100644 index 0000000..58de6c4 --- /dev/null +++ b/docker/files/dream/dream.patch @@ -0,0 +1,96 @@ +--- dream.pro.org 2020-09-04 22:51:51.579926191 +0200 ++++ dream.pro 2020-09-04 22:52:57.609434707 +0200 +@@ -70,9 +70,6 @@ + exists(/opt/local/include/speex/speex_preprocess.h) { + CONFIG += speexdsp + } +- exists(/opt/local/include/hamlib/rig.h) { +- CONFIG += hamlib +- } + contains(QT_VERSION, ^4\\.7.*) { + QT += phonon opengl svg + DEFINES -= QWT_NO_SVG +@@ -138,12 +135,6 @@ + packagesExist(sndfile) { + CONFIG += sndfile + } +- packagesExist(hamlib) { +- CONFIG += hamlib +- } +- packagesExist(gpsd) { +- CONFIG += gps +- } + packagesExist(pcap) { + CONFIG += pcap + } +@@ -159,14 +150,6 @@ + exists(/usr/local/include/sndfile.h) { + CONFIG += sndfile + } +- exists(/usr/include/hamlib/rig.h) | \ +- exists(/usr/local/include/hamlib/rig.h) { +- CONFIG += hamlib +- } +- exists(/usr/include/gps.h) | \ +- exists(/usr/local/include/gps.h) { +- CONFIG += gps +- } + exists(/usr/include/pcap.h) | \ + exists(/usr/local/include/pcap.h) { + CONFIG += pcap +@@ -194,9 +177,6 @@ + exists($$OUT_PWD/include/speex/speex_preprocess.h) { + CONFIG += speexdsp + } +- exists($$OUT_PWD/include/hamlib/rig.h) { +- CONFIG += hamlib +- } + exists($$OUT_PWD/include/pcap.h) { + CONFIG += pcap + } +@@ -225,7 +205,7 @@ + LIBS += -lz + } + } +-exists($$OUT_PWD/include/neaacdec.h) { ++exists(/usr/include/neaacdec.h) { + DEFINES += HAVE_LIBFAAD \ + USE_FAAD2_LIBRARY + LIBS += -lfaad_drm +@@ -257,11 +237,6 @@ + win32:LIBS += libspeexdsp.lib + message("with libspeexdsp") + } +-gps { +- DEFINES += HAVE_LIBGPS +- unix:LIBS += -lgps +- message("with gps") +-} + pcap { + DEFINES += HAVE_LIBPCAP + unix:LIBS += -lpcap +@@ -269,24 +244,6 @@ + win32-g++:LIBS += -lwpcap -lpacket + message("with pcap") + } +-hamlib { +- DEFINES += HAVE_LIBHAMLIB +- macx:LIBS += -framework IOKit +- unix:LIBS += -lhamlib +- win32:LIBS += libhamlib-2.lib +- HEADERS += src/util/Hamlib.h +- SOURCES += src/util/Hamlib.cpp +- qt { +- HEADERS += src/util-QT/Rig.h +- SOURCES += src/util-QT/Rig.cpp +- } +- gui { +- HEADERS += src/GUI-QT/RigDlg.h +- SOURCES += src/GUI-QT/RigDlg.cpp +- FORMS += RigDlg.ui +- } +- message("with hamlib") +-} + qwt { + DEFINES += QWT_NO_SVG + macx { diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh index 303d792..1ce9f2e 100755 --- a/docker/scripts/install-dependencies.sh +++ b/docker/scripts/install-dependencies.sh @@ -18,8 +18,8 @@ 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 libqt5gui5 libqt5sql5 libqt5printsupport5" -BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapack-dev texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev libudev-dev libhamlib-dev patch xsltproc qt5-default" +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 libpulse0 libfaad2 libopus0" +BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapack-dev texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev libudev-dev libhamlib-dev patch xsltproc qt5-default libfaad-dev libopus-dev" apt-get update apt-get -y install auto-apt-proxy apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES @@ -94,6 +94,7 @@ rm -rf codec2 wget https://downloads.sourceforge.net/project/drm/dream/2.1.1/dream-2.1.1-svn808.tar.gz tar xvfz dream-2.1.1-svn808.tar.gz pushd dream +patch -Np0 < /dream.patch qmake CONFIG+=console make make install