[144700] trunk/dports/science/gqrx
michaelld at macports.org
michaelld at macports.org
Fri Jan 15 12:36:19 PST 2016
Revision: 144700
https://trac.macports.org/changeset/144700
Author: michaelld at macports.org
Date: 2016-01-15 12:36:19 -0800 (Fri, 15 Jan 2016)
Log Message:
-----------
gqrx:
+ remove gqrx-legacy: it did not build, and as far as I can determine nobody was using or trying to use it;
+ move gqrx version 2.5.1, with an epoch bump;
+ create gqrx-devel port with latest GIT commit;
+ fix patch files accordingly.
Modified Paths:
--------------
trunk/dports/science/gqrx/Portfile
Added Paths:
-----------
trunk/dports/science/gqrx/files/patch-gqrx.pro.devel.diff
trunk/dports/science/gqrx/files/patch-gqrx.pro.release.diff
Removed Paths:
-------------
trunk/dports/science/gqrx/files/patch-fix-real-imag.diff
trunk/dports/science/gqrx/files/patch-gqrx.pro-legacy.diff
trunk/dports/science/gqrx/files/patch-gqrx.pro.diff
Modified: trunk/dports/science/gqrx/Portfile
===================================================================
--- trunk/dports/science/gqrx/Portfile 2016-01-15 20:27:41 UTC (rev 144699)
+++ trunk/dports/science/gqrx/Portfile 2016-01-15 20:36:19 UTC (rev 144700)
@@ -8,130 +8,97 @@
maintainers michaelld openmaintainer
description Gqrx is a software defined radio (SDR) receiver using GNU Radio, OSMOSDR, and Qt (4 or 5).
+long_description {Gqrx is a software defined radio receiver for Funcube Dongle (FCD), RTL2832U-based DVB-T devices (RTL-SDR), Universal Software Radio Peripherals (USRP) and Osmo SDR devices. Gqrx is powered by GNU Radio and the Qt GUI toolkit. Gqrx is free and open source software and anyone is invited to hack the source code to suit their needs.}
categories science comms
license GPL-3 BSD
platforms darwin macosx
-set description_common {Gqrx is a software defined radio receiver for Funcube Dongle (FCD), RTL2832U-based DVB-T devices (RTL-SDR), Universal Software Radio Peripherals (USRP) and Osmo SDR devices. Gqrx is powered by GNU Radio and the Qt GUI toolkit. Gqrx is free and open source software and anyone is invited to hack the source code to suit their needs.}
+# common directory for storing downloaded tarballs
+dist_subdir gqrx
if {${subport} eq ${name}} {
- long_description ${description} \
- This port is kept up with the Gqrx GIT 'master' branch, is typically updated weekly to monthly, and provides compatibility with the GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports. ${description_common}
+ github.setup csete gqrx 2.5.1 v
+ checksums \
+ rmd160 0bfa0aa6a9e1d1348daf0cbf7e4f87faafd2c8cc \
+ sha256 2214f2631b91f2c307ccab3c7d55b694fe1cd8a941dc8271bcf38234ab60fb05
- github.setup csete gqrx 7e4a45a7e160b80b4dfefa2a705ebcdfd4fad295
- version 20160113
- checksums rmd160 6d5673644b29c62d767c8cb51c1374b1498e18f9 \
- sha256 1125c339a264606953b33f5c8984f5ec44cf6f82ba7523952a8fc2ee06cea64f
+ patchfiles-append patch-gqrx.pro.release.diff
- conflicts gqrx-legacy
+ # bump the epoch because I moved the version from 20160113 to 2.5.1
+ epoch 1
- patchfiles-append patch-gqrx.pro.diff
+ long_description ${long_description} ${subport} \
+provides the release version, which is typically updated every month or so.
+ conflicts gqrx-devel
- # allow gqrx to work with both gnuradio and gnuradio-devel ...
-
- depends_lib-append port:gr-osmosdr \
- path:lib/libgnuradio-audio.dylib:gnuradio
-
- # ... but not with gnuradio-legacy or gnuradio-next
-
- pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-osmosdr does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
- if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
- # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-next"
- }
- }
-
- # this variant can be removed 2015-01-01
- variant portaudio description "Legacy variant" {}
}
-subport gqrx-legacy {
+subport gqrx-devel {
- long_description ${description} \
- This port is for the last Gqrx commit providing compatibility with GNU Radio release 3.6 API: the gnuradio-legacy port. ${description_common}
+ github.setup csete gqrx 7e4a45a7e160b80b4dfefa2a705ebcdfd4fad295
+ version 20160113
+ checksums rmd160 6d5673644b29c62d767c8cb51c1374b1498e18f9 \
+ sha256 1125c339a264606953b33f5c8984f5ec44cf6f82ba7523952a8fc2ee06cea64f
- github.setup csete gqrx 90ea4cfd685dffeac21cf1d860228f6eead1e4a5
+ patchfiles-append patch-gqrx.pro.devel.diff
- # fix port name set by github PortGroup
-
- name gqrx-legacy
-
- version 2.0_20130703
- revision 3
-
- checksums rmd160 eba005dfad221997a7d80a8d8cd132cfea209667 \
- sha256 83403f9d2c05d10a8d8df76a4282c41b9d3547ceccaebecc92c1d3f0835a6f59
-
+ long_description ${long_description} \
+ This port is kept up with the Gqrx GIT 'master' branch, is typically updated weekly to monthly, and provides compatibility with the GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports.
conflicts gqrx
- # gqrx-legacy works with *-legacy only
+}
- depends_lib-append port:gnuradio-legacy \
- port:gr-osmosdr-legacy
+# allow gqrx to work with both gnuradio and gnuradio-devel ...
- patchfiles-append patch-gqrx.pro-legacy.diff
+depends_lib-append port:gr-osmosdr \
+ path:lib/libgnuradio-audio.dylib:gnuradio
- # patch to fix usage of real and imag to be compatible with both
- # libstdc++ and libc++ runtimes; this patch is included upstream.
+# ... but not with gnuradio-next
- patchfiles-append patch-fix-real-imag.diff
-
- # no version checking for now
-
- livecheck.type none
-
+pre-fetch {
+ if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
+ # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
+ ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
+ return -code error "Invalid port dependency: gnuradio-next"
+ }
}
# override githib PortGroup homepage setting
homepage http://gqrx.dk/
-if {${subport} eq "gqrx"} {
+variant qt4 conflicts qt5 description {Build ${subport} using Qt4} {
+ PortGroup qmake 1.0
+}
- variant qt4 conflicts qt5 description {Build ${subport} using Qt4} {
- PortGroup qmake 1.0
- }
+variant qt5 conflicts qt4 description {Build ${subport} using Qt5} {
- variant qt5 conflicts qt4 description {Build ${subport} using Qt5} {
+ PortGroup qmake5 1.0
+ PortGroup active_variants 1.1
- PortGroup qmake5 1.0
- PortGroup active_variants 1.1
+ # make sure gnuradio* is installed with -qtgui, because we
+ # can't have Qt4 and Qt5 installed at the same time (yet),
+ # and gnuradio* does not (yet) support Qt5.
- # make sure gnuradio* is installed with -qtgui, because we
- # can't have Qt4 and Qt5 installed at the same time (yet),
- # and gnuradio* does not (yet) support Qt5.
+ require_active_variants path:lib/libgnuradio-audio.dylib:gnuradio "" qtgui
- require_active_variants path:lib/libgnuradio-audio.dylib:gnuradio "" qtgui
+}
- }
+# default to +qt4
- # default to +qt4
+if {![variant_isset qt4] && ![variant_isset qt5]} {
+ default_variants +qt4
+}
- if {![variant_isset qt4] && ![variant_isset qt5]} {
- default_variants +qt4
- }
+# make sure -qt4 is not used alone
- # make sure -qt4 is not used alone
+if {![variant_isset qt4] && ![variant_isset qt5]} {
- if {![variant_isset qt4] && ![variant_isset qt5]} {
+ ui_error "\n\nYou must select either the +qt4 or +qt5 variant.\n"
+ return -code error "Invalid variant selection"
- ui_error "\n\nYou must select either the +qt4 or +qt5 variant.\n"
- return -code error "Invalid variant selection"
-
- }
-} else {
-
- # gqrx-legacy uses Qt4 only
- PortGroup qmake 1.0
-
}
post-patch {
Deleted: trunk/dports/science/gqrx/files/patch-fix-real-imag.diff
===================================================================
--- trunk/dports/science/gqrx/files/patch-fix-real-imag.diff 2016-01-15 20:27:41 UTC (rev 144699)
+++ trunk/dports/science/gqrx/files/patch-fix-real-imag.diff 2016-01-15 20:36:19 UTC (rev 144700)
@@ -1,33 +0,0 @@
---- dsp/rx_agc_xx.cpp.orig 2013-11-25 21:47:44.000000000 -0500
-+++ dsp/rx_agc_xx.cpp 2013-11-26 09:38:29.000000000 -0500
-@@ -79,6 +79,7 @@
- boost::mutex::scoped_lock lock(d_mutex);
-
- for (i = 0; i < noutput_items; i++) {
-+ // implicit conversion from float to double
- ib[i].im = in[i].imag();
- ib[i].re = in[i].real();
- }
-@@ -86,8 +87,8 @@
- d_agc->ProcessData(noutput_items, &ib[0], &ob[0]);
-
- for (i = 0; i < noutput_items; i++) {
-- out[i].real() = ob[i].re;
-- out[i].imag() = ob[i].im;
-+ // implicit conversion from double to float
-+ out[i] = gr_complex(ob[i].re, ob[i].im);
- }
-
- return noutput_items;
---- dsp/rx_noise_blanker_cc.cpp.orig 2013-11-25 21:47:51.000000000 -0500
-+++ dsp/rx_noise_blanker_cc.cpp 2013-11-25 21:48:01.000000000 -0500
-@@ -77,8 +77,7 @@
- // copy data into output buffer then perform the processing on that buffer
- for (i = 0; i < noutput_items; i++)
- {
-- out[i].imag() = in[i].imag();
-- out[i].real() = in[i].real();
-+ out[i] = in[i];
- }
-
- if (d_nb1_on)
Deleted: trunk/dports/science/gqrx/files/patch-gqrx.pro-legacy.diff
===================================================================
--- trunk/dports/science/gqrx/files/patch-gqrx.pro-legacy.diff 2016-01-15 20:27:41 UTC (rev 144699)
+++ trunk/dports/science/gqrx/files/patch-gqrx.pro-legacy.diff 2016-01-15 20:36:19 UTC (rev 144700)
@@ -1,37 +0,0 @@
---- gqrx.pro.orig 2013-08-08 16:58:04.000000000 -0400
-+++ gqrx.pro 2013-08-08 17:01:33.000000000 -0400
-@@ -28,7 +28,12 @@
- # make clean target
- QMAKE_CLEAN += gqrx
-
--#CONFIG += debug
-+CONFIG -= debug
-+VER = @VERSION@
-+CONFIG += @ARCHES@
-+
-+target.path = @APPSDIR@
-+INSTALLS += target
-
- # disable debug messages in release
- CONFIG(debug, debug|release) {
-@@ -36,11 +41,9 @@
- #QMAKE_CFLAGS_DEBUG += '-g -O0'
-
- # Define version string (see below for releases)
-- VER = $$system(git describe --abbrev=8)
- } else {
- DEFINES += QT_NO_DEBUG
- DEFINES += QT_NO_DEBUG_OUTPUT
-- VER = 0.0
-
- # Release binaries with gr bundled
- # QMAKE_RPATH & co won't work with origin
-@@ -170,7 +173,7 @@
- LIBS += -lrt # need to include on some distros
- }
-
--macx-g++ {
-+macx {
- LIBS += -lboost_system-mt -lboost_program_options-mt
- # INCLUDEPATH += /usr/local/include
- # INCLUDEPATH += /usr/local/include/gnuradio
Copied: trunk/dports/science/gqrx/files/patch-gqrx.pro.devel.diff (from rev 144694, trunk/dports/science/gqrx/files/patch-gqrx.pro.diff)
===================================================================
--- trunk/dports/science/gqrx/files/patch-gqrx.pro.devel.diff (rev 0)
+++ trunk/dports/science/gqrx/files/patch-gqrx.pro.devel.diff 2016-01-15 20:36:19 UTC (rev 144700)
@@ -0,0 +1,33 @@
+--- gqrx.pro.orig 2016-01-14 09:00:55.000000000 -0500
++++ gqrx.pro 2016-01-14 09:01:42.000000000 -0500
+@@ -48,10 +48,12 @@
+ PREFIX=/usr/local
+ }
+
+-target.path = $$PREFIX/bin
++target.path = @APPSDIR@
+ INSTALLS += target
+
+-#CONFIG += debug
++CONFIG -= debug
++VER = @VERSION@
++CONFIG += @ARCHES@
+
+ # disable debug messages in release
+ CONFIG(debug, debug|release) {
+@@ -59,13 +61,13 @@
+ #QMAKE_CFLAGS_DEBUG += '-g -O0'
+
+ # Define version string (see below for releases)
+- VER = $$system(git describe --abbrev=8)
++ # VER = $$system(git describe --abbrev=8)
+ ##VER = 2.5
+
+ } else {
+ DEFINES += QT_NO_DEBUG
+ DEFINES += QT_NO_DEBUG_OUTPUT
+- VER = $$system(git describe --abbrev=1)
++ # VER = $$system(git describe --abbrev=1)
+ ##VER = 2.5
+
+ # Release binaries with gr bundled
Deleted: trunk/dports/science/gqrx/files/patch-gqrx.pro.diff
===================================================================
--- trunk/dports/science/gqrx/files/patch-gqrx.pro.diff 2016-01-15 20:27:41 UTC (rev 144699)
+++ trunk/dports/science/gqrx/files/patch-gqrx.pro.diff 2016-01-15 20:36:19 UTC (rev 144700)
@@ -1,33 +0,0 @@
---- gqrx.pro.orig 2016-01-14 09:00:55.000000000 -0500
-+++ gqrx.pro 2016-01-14 09:01:42.000000000 -0500
-@@ -48,10 +48,12 @@
- PREFIX=/usr/local
- }
-
--target.path = $$PREFIX/bin
-+target.path = @APPSDIR@
- INSTALLS += target
-
--#CONFIG += debug
-+CONFIG -= debug
-+VER = @VERSION@
-+CONFIG += @ARCHES@
-
- # disable debug messages in release
- CONFIG(debug, debug|release) {
-@@ -59,13 +61,13 @@
- #QMAKE_CFLAGS_DEBUG += '-g -O0'
-
- # Define version string (see below for releases)
-- VER = $$system(git describe --abbrev=8)
-+ # VER = $$system(git describe --abbrev=8)
- ##VER = 2.5
-
- } else {
- DEFINES += QT_NO_DEBUG
- DEFINES += QT_NO_DEBUG_OUTPUT
-- VER = $$system(git describe --abbrev=1)
-+ # VER = $$system(git describe --abbrev=1)
- ##VER = 2.5
-
- # Release binaries with gr bundled
Copied: trunk/dports/science/gqrx/files/patch-gqrx.pro.release.diff (from rev 144699, trunk/dports/science/gqrx/files/patch-gqrx.pro.diff)
===================================================================
--- trunk/dports/science/gqrx/files/patch-gqrx.pro.release.diff (rev 0)
+++ trunk/dports/science/gqrx/files/patch-gqrx.pro.release.diff 2016-01-15 20:36:19 UTC (rev 144700)
@@ -0,0 +1,33 @@
+--- gqrx.pro.orig 2016-01-15 15:12:02.000000000 -0500
++++ gqrx.pro 2016-01-15 15:13:05.000000000 -0500
+@@ -48,10 +48,12 @@
+ PREFIX=/usr/local
+ }
+
+-target.path = $$PREFIX/bin
++target.path = @APPSDIR@
+ INSTALLS += target
+
+-#CONFIG += debug
++CONFIG -= debug
++VER = @VERSION@
++CONFIG += @ARCHES@
+
+ # disable debug messages in release
+ CONFIG(debug, debug|release) {
+@@ -59,13 +61,13 @@
+ #QMAKE_CFLAGS_DEBUG += '-g -O0'
+
+ # Define version string (see below for releases)
+- VER = $$system(git describe --abbrev=8)
++ # VER = $$system(git describe --abbrev=8)
+ ##VER = 2.4
+
+ } else {
+ DEFINES += QT_NO_DEBUG
+ DEFINES += QT_NO_DEBUG_OUTPUT
+- VER = $$system(git describe --abbrev=1)
++ # VER = $$system(git describe --abbrev=1)
+ ##VER = 2.4
+
+ # Release binaries with gr bundled
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160115/ffccb460/attachment-0001.html>
More information about the macports-changes
mailing list