pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gqrx: Adjust dependencies

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <>
Pushed By:	gdt
Date:		Tue Jul 26 23:32:05 2016 +0000
Changeset:	cf51865ed7a6e1a6dc328c310ed927eaaaafa26e

Modified Files:

Log Message:
gqrx: Adjust dependencies

Drop gnuradio-utils.  List which gnuradio blocks are in which packages.
Add all 6 upstream-recommended hardware-support packages.
Add pulseaudio.
Give up on qt4, following upstream's editing of and
recommendation to use qt5.

To see a diff of this commit:;a=commitdiff;h=cf51865ed7a6e1a6dc328c310ed927eaaaafa26e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

 gqrx/Makefile | 34 ++++++++++++++++++++++++++++++----
 gqrx/TODO     |  8 +-------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/gqrx/Makefile b/gqrx/Makefile
index d86ddee..48a9c1c 100644
--- a/gqrx/Makefile
+++ b/gqrx/Makefile
@@ -19,16 +19,42 @@ WRKSRC=		${WRKDIR}/gqrx-sdr-${VERSION}
+## These dependencies are organized according to upstream's README
+## at rather than alphabetically.
+# upstream's does not document a dependency on boost libraries,
+# probably because gnuradio-core depends on boost, but there is one.
 .include "../../devel/boost-libs/"
+# Upstream documents needing multiple gnuradio blocks.  These do not
+# obviously correspond to pkgsrc split package names, so we list the
+# required blocks ahead of each gnuradio split package.
+# core has runtime, analog, audio, blocks, fft, filter, pmt
 .include "../../ham/gnuradio-core/"
+# digital has digital
 .include "../../ham/gnuradio-digital/"
-.include "../../ham/gnuradio-utils/"
+# gr-iqbalance (optional) - not in pkgsrc
+# These are drivers for particular hardware.  They are smallish and
+# therefore not optional.  (Also, gr-osmosdr depends on them, so
+# avoiding dependencies would not save space.)
+.include "../../ham/gnuradio-fcd/"
+.include "../../ham/gnuradio-uhd/"
+.include "../../ham/gr-fcdproplus/"
+.include "../../ham/rtl-sdr/"
+.include "../../ham/osmo-sdr/"
+.include "../../ham/hackrf/"
 .include "../../ham/gr-osmosdr/"
-#.include "../../ham/rtl-sdr/"
+.include "../../audio/pulseaudio/"
-# Upstream documents >=4.7, but with qt4-libs CMake complains that qt5
-# is not found.
+# Upstream documents that with qmake, 4.8 is needed, but the cmake
+# build requires qt5.  Upstream also outright recommends qt5.
 .include "../../x11/qt5-qtbase/"
 .include "../../x11/qt5-qtsvg/"
 .include "../../mk/"
+# Pointers to other packaging systems:
diff --git a/gqrx/TODO b/gqrx/TODO
index 380d8d6..9e6ffd4 100644
--- a/gqrx/TODO
+++ b/gqrx/TODO
@@ -1,9 +1,3 @@
-* Figure out why qt5 is required but the says that 4.7+ is
-  sufficient.  File bug upstream.
-* Figure out why boost is required and file bug upstream.
-* Figure out if this should depend on multiple hardware backends
-  directly, or if there should be more.
+* File bug upstream (or fix the README) about the boost requirement.
 * test

Home | Main Index | Thread Index | Old Index