<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[123189] trunk/dports/science/gqrx</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/123189">123189</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-08-06 13:12:20 -0700 (Wed, 06 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gqrx:
+ update release to 2.3.0;
+ update devel to 75ac9cf3 (20140805);
+ rename release patch to contain "release";
+ fix patches for updates.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegqrxPortfile">trunk/dports/science/gqrx/Portfile</a></li>
<li><a href="#trunkdportssciencegqrxfilespatchgqrxprodeveldiff">trunk/dports/science/gqrx/files/patch-gqrx.pro-devel.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencegqrxfilespatchgqrxproreleasediff">trunk/dports/science/gqrx/files/patch-gqrx.pro-release.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencegqrxfilespatchgqrxprodiff">trunk/dports/science/gqrx/files/patch-gqrx.pro.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegqrxPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gqrx/Portfile (123188 => 123189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gqrx/Portfile 2014-08-06 19:47:06 UTC (rev 123188)
+++ trunk/dports/science/gqrx/Portfile 2014-08-06 20:12:20 UTC (rev 123189)
</span><span class="lines">@@ -17,11 +17,11 @@
</span><span class="cx">
</span><span class="cx"> 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.}
</span><span class="cx">
</span><del>-if {${subport} ne "gqrx-devel"} {
</del><ins>+if {${subport} eq "gqrx-legacy"} {
</ins><span class="cx">
</span><span class="cx"> # patch to fix usage of real and imag to be compatible with both
</span><span class="cx"> # libstdc++ and libc++ runtimes; this patch is included with the
</span><del>- # devel from upstream.
</del><ins>+ # release and devel from upstream.
</ins><span class="cx">
</span><span class="cx"> patchfiles-append patch-fix-real-imag.diff
</span><span class="cx"> }
</span><span class="lines">@@ -58,15 +58,14 @@
</span><span class="cx"> long_description ${description} \
</span><span class="cx"> 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}
</span><span class="cx">
</span><del>- github.setup csete gqrx 2.2.0 v
- revision 3
</del><ins>+ github.setup csete gqrx 2.3.0 v
</ins><span class="cx">
</span><del>- checksums rmd160 f8fc0f253734ad5dbe15155fe4e3de8b0c9bac72 \
- sha256 6f3114a7476cd1deaaaa37d08669ae44bdc387ce49f24a1db6ca2cf054467c45
</del><ins>+ checksums rmd160 ff09c0d2badd00740bfd83925a4d0477f8cb16d3 \
+ sha256 3cfa0a522883b2f702d923b777fbf3060ffa023a0b0dd3d27122a7b6624fcb62
</ins><span class="cx">
</span><span class="cx"> conflicts gqrx-legacy gqrx-devel
</span><span class="cx">
</span><del>- patchfiles-append patch-gqrx.pro.diff
</del><ins>+ patchfiles-append patch-gqrx.pro-release.diff
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -75,11 +74,11 @@
</span><span class="cx"> long_description ${description} \
</span><span class="cx"> 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}
</span><span class="cx">
</span><del>- github.setup csete gqrx 17dda9221e5d21bdbba23dca12598bcf3424c216
- version 2.2.1_20140804
</del><ins>+ github.setup csete gqrx 75ac9cf38fa2c61d7b564adb3598abb038a44aba
+ version 2.3_20140805
</ins><span class="cx">
</span><del>- checksums rmd160 83e696e47a7a672b9a9038556361863af6fa2878 \
- sha256 413c0ca4b51acc2ee3cc6e3a159cf649e694f2978c709d5e6de9283c2db85c0f
</del><ins>+ checksums rmd160 30fe72461711ad1a56b73695469257ab227553f5 \
+ sha256 c8a196a76b7577adff738f4f78942fd12db5f52128a97d6187041f6cd4bf90f4
</ins><span class="cx">
</span><span class="cx"> # fix port name set by github PortGroup
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportssciencegqrxfilespatchgqrxprodeveldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gqrx/files/patch-gqrx.pro-devel.diff (123188 => 123189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gqrx/files/patch-gqrx.pro-devel.diff 2014-08-06 19:47:06 UTC (rev 123188)
+++ trunk/dports/science/gqrx/files/patch-gqrx.pro-devel.diff 2014-08-06 20:12:20 UTC (rev 123189)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>---- gqrx.pro.orig 2014-04-03 17:59:46.000000000 -0400
-+++ gqrx.pro 2014-04-04 09:46:54.000000000 -0400
-@@ -47,23 +47,21 @@
- 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) {
- # Use for valgrind
- #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 = $$system(git describe --abbrev=1)
-
- # Release binaries with gr bundled
- # QMAKE_RPATH & co won't work with origin
</del></span></pre></div>
<a id="trunkdportssciencegqrxfilespatchgqrxproreleasedifffromrev123186trunkdportssciencegqrxfilespatchgqrxprodiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/science/gqrx/files/patch-gqrx.pro-release.diff (from rev 123186, trunk/dports/science/gqrx/files/patch-gqrx.pro.diff) (0 => 123189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gqrx/files/patch-gqrx.pro-release.diff (rev 0)
+++ trunk/dports/science/gqrx/files/patch-gqrx.pro-release.diff 2014-08-06 20:12:20 UTC (rev 123189)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+--- gqrx.pro.orig 2014-08-06 15:20:40.000000000 -0400
++++ gqrx.pro 2014-08-06 15:21:03.000000000 -0400
+@@ -47,24 +47,21 @@
+ 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) {
+ # Use for valgrind
+ #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 = $$system(git describe --abbrev=1)
+- VER = 2.3.0
+
+ # Release binaries with gr bundled
+ # QMAKE_RPATH & co won't work with origin
</ins></span></pre></div>
<a id="trunkdportssciencegqrxfilespatchgqrxprodiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/gqrx/files/patch-gqrx.pro.diff (123188 => 123189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gqrx/files/patch-gqrx.pro.diff 2014-08-06 19:47:06 UTC (rev 123188)
+++ trunk/dports/science/gqrx/files/patch-gqrx.pro.diff 2014-08-06 20:12:20 UTC (rev 123189)
</span><span class="lines">@@ -1,73 +0,0 @@
</span><del>---- 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
- }
-
--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) {
- # Use for valgrind
- #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 = $$system(git describe --abbrev=1)
-
- # Release binaries with gr bundled
- # QMAKE_RPATH & co won't work with origin
- ## QMAKE_LFLAGS += '-Wl,-rpath,\'\$$ORIGIN/lib\''
- }
-
--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,21 +200,22 @@
- }
-
- macx {
-- # macports
-- INCLUDEPATH += /opt/local/include
--
-- # local stuff
-- INCLUDEPATH += /Users/alexc/gqrx/runtime/include
-- 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 += -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 += \
</del></span></pre>
</div>
</div>
</body>
</html>