[110113] trunk/dports/science/gqrx
michaelld at macports.org
michaelld at macports.org
Mon Aug 26 07:21:30 PDT 2013
Revision: 110113
https://trac.macports.org/changeset/110113
Author: michaelld at macports.org
Date: 2013-08-26 07:21:30 -0700 (Mon, 26 Aug 2013)
Log Message:
-----------
gqrx:
* update devel to 12c0f558 (20130825);
* fix descriptions to be more correct;
* add +portaudio variant for non-legacy;
* remove extra patchfiles-append;
* fix devel patchfile name.
Modified Paths:
--------------
trunk/dports/science/gqrx/Portfile
trunk/dports/science/gqrx/files/patch-gqrx.pro-devel.diff
trunk/dports/science/gqrx/files/patch-gqrx.pro.diff
Modified: trunk/dports/science/gqrx/Portfile
===================================================================
--- trunk/dports/science/gqrx/Portfile 2013-08-26 12:11:28 UTC (rev 110112)
+++ trunk/dports/science/gqrx/Portfile 2013-08-26 14:21:30 UTC (rev 110113)
@@ -48,7 +48,7 @@
if {${subport} == ${name}} {
long_description ${description} \
- This port is kept up with the Gqrx GIT 'master' branch, which is typically updated weekly to monthly, providing compatibility with GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports. ${description_common}
+ This port is kept up with the latest Gqrx tagged release, is typically updated every few months, and provides compatibility with the GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports. ${description_common}
set full_commit 796ca0b077ef864185dc1ebf475dbbd2ed317a1a
github.setup csete gqrx [string range ${full_commit} 0 7]
@@ -67,23 +67,23 @@
subport gqrx-devel {
long_description ${description} \
- This port is kept up with the Gqrx GIT 'master' branch, which is typically updated weekly to monthly, providing compatibility with GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports. ${description_common}
+ 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}
- set full_commit 796ca0b077ef864185dc1ebf475dbbd2ed317a1a
+ set full_commit 12c0f5581056c6fb5b4b19eefe8eb5ceb1f6ed97
github.setup csete gqrx [string range ${full_commit} 0 7]
# fix port name set by github PortGroup
name gqrx-devel
- version 2.2.1_20130808
+ version 2.2.1_20130825
- checksums rmd160 e832f384f2760ed23d4d640adb288130a5e3af80 \
- sha256 9612e8e421613078c2ce4dbec7b9b05e47a2be45df704ac0dbf899651860718c
+ checksums rmd160 38ac4ba5d7dc609adf7c2ad93318283f0ca9d33e \
+ sha256 3916bcdf8771d89a4820ca9e7a7493d573322966b738547fb3462b6573a528d8
conflicts gqrx-legacy gqrx
- patchfiles patch-gqrx.pro.devel.diff
+ patchfiles patch-gqrx.pro-devel.diff
}
@@ -120,10 +120,6 @@
if {${subport} != "gqrx-legacy"} {
- # disable debug for now
-
- patchfiles patch-gqrx.pro.diff
-
# allow gqrx to work with both gnuradio and gnuradio-devel ...
depends_lib-append port:gr-osmosdr \
@@ -144,6 +140,11 @@
}
}
+ variant portaudio description "Use PortAudio 2.0 for the audio interface" {
+ depends_lib-append port:portaudio
+ configure.args-append AUDIO_BACKEND=portaudio
+ }
+
# fix livecheck to look for commits, not tags
livecheck.url https://github.com/csete/gqrx/commits/master
Modified: trunk/dports/science/gqrx/files/patch-gqrx.pro-devel.diff
===================================================================
--- trunk/dports/science/gqrx/files/patch-gqrx.pro-devel.diff 2013-08-26 12:11:28 UTC (rev 110112)
+++ trunk/dports/science/gqrx/files/patch-gqrx.pro-devel.diff 2013-08-26 14:21:30 UTC (rev 110113)
@@ -1,6 +1,6 @@
---- gqrx.pro.orig 2013-08-08 16:32:53.000000000 -0400
-+++ gqrx.pro 2013-08-08 16:38:08.000000000 -0400
-@@ -45,31 +45,27 @@
+--- gqrx.pro.orig 2013-08-26 10:02:32.000000000 -0400
++++ gqrx.pro 2013-08-26 10:03:14.000000000 -0400
+@@ -45,23 +45,21 @@
PREFIX=/usr/local
}
@@ -28,25 +28,38 @@
# Release binaries with gr bundled
# QMAKE_RPATH & co won't work with origin
- ## QMAKE_LFLAGS += '-Wl,-rpath,\'\$$ORIGIN/lib\''
+@@ -203,21 +201,23 @@
}
--VER = '2.2'
--
- # Tip from: http://www.qtcentre.org/wiki/index.php?title=Version_numbering_using_QMake
- VERSTR = '\\"$${VER}\\"' # place quotes around the version string
- DEFINES += VERSION=\"$${VERSTR}\" # create a VERSION macro containing the version string
-@@ -204,12 +200,7 @@
- }
-
macx {
- # macports
- INCLUDEPATH += /opt/local/include
--
++ INCLUDEPATH += $$PREFIX/include
++
++ CONFIG += link_pkgconfig
+
- # local stuff
- INCLUDEPATH += /Users/alexc/gqrx/runtime/include
- LIBS += -L/opt/local/lib -L/Users/alexc/gqrx/runtime/lib
-+ INCLUDEPATH += $$PREFIX/include
++ contains(AUDIO_BACKEND, portaudio) {
++ PKGCONFIG += portaudio-2.0
++ }
++
++ PKGCONFIG += gnuradio-analog \
++ gnuradio-audio \
++ gnuradio-blocks \
++ gnuradio-filter \
++ gnuradio-fft \
++ gnuradio-osmosdr
LIBS += -lboost_system-mt -lboost_program_options-mt
- LIBS += -lgnuradio-runtime -lgnuradio-pmt -lgnuradio-audio -lgnuradio-analog
+- LIBS += -lgnuradio-runtime -lgnuradio-pmt -lgnuradio-audio -lgnuradio-analog
+- LIBS += -lgnuradio-blocks -lgnuradio-filter -lgnuradio-fft -lgnuradio-osmosdr
+
+- # portaudio
+- contains(AUDIO_BACKEND, portaudio): {
+- LIBS += -lportaudio
+- }
+ }
+
+ OTHER_FILES += \
Modified: trunk/dports/science/gqrx/files/patch-gqrx.pro.diff
===================================================================
--- trunk/dports/science/gqrx/files/patch-gqrx.pro.diff 2013-08-26 12:11:28 UTC (rev 110112)
+++ trunk/dports/science/gqrx/files/patch-gqrx.pro.diff 2013-08-26 14:21:30 UTC (rev 110113)
@@ -1,5 +1,5 @@
---- gqrx.pro.orig 2013-08-08 16:32:53.000000000 -0400
-+++ gqrx.pro 2013-08-08 16:38:08.000000000 -0400
+--- gqrx.pro.orig 2013-08-26 10:06:59.000000000 -0400
++++ gqrx.pro 2013-08-26 10:09:17.000000000 -0400
@@ -45,31 +45,27 @@
PREFIX=/usr/local
}
@@ -36,7 +36,7 @@
# Tip from: http://www.qtcentre.org/wiki/index.php?title=Version_numbering_using_QMake
VERSTR = '\\"$${VER}\\"' # place quotes around the version string
DEFINES += VERSION=\"$${VERSTR}\" # create a VERSION macro containing the version string
-@@ -204,12 +200,7 @@
+@@ -204,21 +200,22 @@
}
macx {
@@ -48,5 +48,26 @@
- LIBS += -L/opt/local/lib -L/Users/alexc/gqrx/runtime/lib
+ INCLUDEPATH += $$PREFIX/include
- LIBS += -lboost_system-mt -lboost_program_options-mt
- LIBS += -lgnuradio-runtime -lgnuradio-pmt -lgnuradio-audio -lgnuradio-analog
+- LIBS += -lboost_system-mt -lboost_program_options-mt
+- LIBS += -lgnuradio-runtime -lgnuradio-pmt -lgnuradio-audio -lgnuradio-analog
+- LIBS += -lgnuradio-blocks -lgnuradio-filter -lgnuradio-fft -lgnuradio-osmosdr
++ CONFIG += link_pkgconfig
+
+- # portaudio
+- contains(AUDIO_BACKEND, portaudio): {
+- LIBS += -lportaudio
++ contains(AUDIO_BACKEND, portaudio) {
++ PKGCONFIG += portaudio-2.0
+ }
++
++ PKGCONFIG += gnuradio-analog \
++ gnuradio-audio \
++ gnuradio-blocks \
++ gnuradio-filter \
++ gnuradio-fft \
++ gnuradio-osmosdr
++
++ LIBS += -lboost_system-mt -lboost_program_options-mt
+ }
+
+ OTHER_FILES += \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130826/27d226ca/attachment.html>
More information about the macports-changes
mailing list