[123189] trunk/dports/science/gqrx

michaelld at macports.org michaelld at macports.org
Wed Aug 6 13:12:20 PDT 2014


Revision: 123189
          https://trac.macports.org/changeset/123189
Author:   michaelld at macports.org
Date:     2014-08-06 13:12:20 -0700 (Wed, 06 Aug 2014)
Log Message:
-----------
gqrx:
+ update release to 2.3.0;
+ update devel to 75ac9cf3 (20140805);
+ rename release patch to contain "release";
+ fix patches for updates.

Modified Paths:
--------------
    trunk/dports/science/gqrx/Portfile
    trunk/dports/science/gqrx/files/patch-gqrx.pro-devel.diff

Added Paths:
-----------
    trunk/dports/science/gqrx/files/patch-gqrx.pro-release.diff

Removed Paths:
-------------
    trunk/dports/science/gqrx/files/patch-gqrx.pro.diff

Modified: trunk/dports/science/gqrx/Portfile
===================================================================
--- 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)
@@ -17,11 +17,11 @@
 
 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.}
 
-if {${subport} ne "gqrx-devel"} {
+if {${subport} eq "gqrx-legacy"} {
 
     # patch to fix usage of real and imag to be compatible with both
     # libstdc++ and libc++ runtimes; this patch is included with the
-    # devel from upstream.
+    # release and devel from upstream.
 
     patchfiles-append patch-fix-real-imag.diff
 }
@@ -58,15 +58,14 @@
     long_description    ${description}  \
         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}
 
-    github.setup        csete gqrx 2.2.0 v
-    revision            3
+    github.setup        csete gqrx 2.3.0 v
 
-    checksums           rmd160 f8fc0f253734ad5dbe15155fe4e3de8b0c9bac72 \
-                        sha256 6f3114a7476cd1deaaaa37d08669ae44bdc387ce49f24a1db6ca2cf054467c45
+    checksums           rmd160 ff09c0d2badd00740bfd83925a4d0477f8cb16d3 \
+                        sha256 3cfa0a522883b2f702d923b777fbf3060ffa023a0b0dd3d27122a7b6624fcb62
 
     conflicts           gqrx-legacy gqrx-devel
 
-    patchfiles-append   patch-gqrx.pro.diff
+    patchfiles-append   patch-gqrx.pro-release.diff
 
 }
 
@@ -75,11 +74,11 @@
     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 17dda9221e5d21bdbba23dca12598bcf3424c216
-    version             2.2.1_20140804
+    github.setup        csete gqrx 75ac9cf38fa2c61d7b564adb3598abb038a44aba
+    version             2.3_20140805
 
-    checksums           rmd160 83e696e47a7a672b9a9038556361863af6fa2878 \
-                        sha256 413c0ca4b51acc2ee3cc6e3a159cf649e694f2978c709d5e6de9283c2db85c0f
+    checksums           rmd160 30fe72461711ad1a56b73695469257ab227553f5 \
+                        sha256 c8a196a76b7577adff738f4f78942fd12db5f52128a97d6187041f6cd4bf90f4
 
     # fix port name set by github PortGroup
 

Modified: trunk/dports/science/gqrx/files/patch-gqrx.pro-devel.diff
===================================================================
--- 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)
@@ -1,30 +0,0 @@
---- 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

Copied: trunk/dports/science/gqrx/files/patch-gqrx.pro-release.diff (from rev 123186, 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	2014-08-06 20:12:20 UTC (rev 123189)
@@ -0,0 +1,32 @@
+--- 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

Deleted: trunk/dports/science/gqrx/files/patch-gqrx.pro.diff
===================================================================
--- 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)
@@ -1,73 +0,0 @@
---- 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 += \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140806/dc95bdd0/attachment.html>


More information about the macports-changes mailing list