Changeset 110113


Ignore:
Timestamp:
Aug 26, 2013, 2:21:30 PM (4 years ago)
Author:
michaelld@…
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.
Location:
trunk/dports/science/gqrx
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/science/gqrx/Portfile

    r109185 r110113  
    4949
    5050    long_description    ${description}  \
    51         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}
     51        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}
    5252
    5353    set full_commit     796ca0b077ef864185dc1ebf475dbbd2ed317a1a
     
    6868
    6969    long_description    ${description}  \
    70         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}
     70        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}
    7171
    72     set full_commit     796ca0b077ef864185dc1ebf475dbbd2ed317a1a
     72    set full_commit     12c0f5581056c6fb5b4b19eefe8eb5ceb1f6ed97
    7373    github.setup        csete gqrx [string range ${full_commit} 0 7]
    7474
     
    7777    name                gqrx-devel
    7878
    79     version             2.2.1_20130808
     79    version             2.2.1_20130825
    8080
    81     checksums           rmd160  e832f384f2760ed23d4d640adb288130a5e3af80 \
    82                         sha256  9612e8e421613078c2ce4dbec7b9b05e47a2be45df704ac0dbf899651860718c
     81    checksums           rmd160  38ac4ba5d7dc609adf7c2ad93318283f0ca9d33e \
     82                        sha256  3916bcdf8771d89a4820ca9e7a7493d573322966b738547fb3462b6573a528d8
    8383
    8484    conflicts           gqrx-legacy gqrx
    8585
    86     patchfiles          patch-gqrx.pro.devel.diff
     86    patchfiles          patch-gqrx.pro-devel.diff
    8787
    8888}
     
    121121if {${subport} != "gqrx-legacy"} {
    122122
    123     # disable debug for now
    124 
    125     patchfiles          patch-gqrx.pro.diff
    126 
    127123    # allow gqrx to work with both gnuradio and gnuradio-devel ...
    128124
     
    145141    }
    146142
     143    variant portaudio description "Use PortAudio 2.0 for the audio interface" {
     144        depends_lib-append port:portaudio
     145        configure.args-append AUDIO_BACKEND=portaudio
     146    }
     147
    147148    # fix livecheck to look for commits, not tags
    148149
  • trunk/dports/science/gqrx/files/patch-gqrx.pro-devel.diff

    r109181 r110113  
    1 --- gqrx.pro.orig       2013-08-08 16:32:53.000000000 -0400
    2 +++ gqrx.pro    2013-08-08 16:38:08.000000000 -0400
    3 @@ -45,31 +45,27 @@
     1--- gqrx.pro.orig       2013-08-26 10:02:32.000000000 -0400
     2+++ gqrx.pro    2013-08-26 10:03:14.000000000 -0400
     3@@ -45,23 +45,21 @@
    44     PREFIX=/usr/local
    55 }
     
    2929     # Release binaries with gr bundled
    3030     # QMAKE_RPATH & co won't work with origin
    31      ## QMAKE_LFLAGS += '-Wl,-rpath,\'\$$ORIGIN/lib\''
    32  }
    33  
    34 -VER = '2.2'
    35 -
    36  # Tip from: http://www.qtcentre.org/wiki/index.php?title=Version_numbering_using_QMake
    37  VERSTR = '\\"$${VER}\\"'          # place quotes around the version string
    38  DEFINES += VERSION=\"$${VERSTR}\" # create a VERSION macro containing the version string
    39 @@ -204,12 +200,7 @@
     31@@ -203,21 +201,23 @@
    4032 }
    4133 
     
    4335-    # macports
    4436-    INCLUDEPATH += /opt/local/include
    45 -
     37+    INCLUDEPATH += $$PREFIX/include
     38+
     39+    CONFIG += link_pkgconfig
     40 
    4641-    # local stuff
    4742-    INCLUDEPATH += /Users/alexc/gqrx/runtime/include
    4843-    LIBS += -L/opt/local/lib -L/Users/alexc/gqrx/runtime/lib
    49 +    INCLUDEPATH += $$PREFIX/include
     44+    contains(AUDIO_BACKEND, portaudio) {
     45+        PKGCONFIG += portaudio-2.0
     46+    }
     47+
     48+    PKGCONFIG += gnuradio-analog \
     49+                 gnuradio-audio \
     50+                 gnuradio-blocks \
     51+                 gnuradio-filter \
     52+                 gnuradio-fft \
     53+                 gnuradio-osmosdr
    5054 
    5155     LIBS += -lboost_system-mt -lboost_program_options-mt
    52      LIBS += -lgnuradio-runtime -lgnuradio-pmt -lgnuradio-audio -lgnuradio-analog
     56-    LIBS += -lgnuradio-runtime -lgnuradio-pmt -lgnuradio-audio -lgnuradio-analog
     57-    LIBS += -lgnuradio-blocks -lgnuradio-filter -lgnuradio-fft -lgnuradio-osmosdr
     58 
     59-    # portaudio
     60-    contains(AUDIO_BACKEND, portaudio): {
     61-        LIBS    += -lportaudio
     62-    }
     63 }
     64 
     65 OTHER_FILES += \
  • trunk/dports/science/gqrx/files/patch-gqrx.pro.diff

    r109181 r110113  
    1 --- gqrx.pro.orig       2013-08-08 16:32:53.000000000 -0400
    2 +++ gqrx.pro    2013-08-08 16:38:08.000000000 -0400
     1--- gqrx.pro.orig       2013-08-26 10:06:59.000000000 -0400
     2+++ gqrx.pro    2013-08-26 10:09:17.000000000 -0400
    33@@ -45,31 +45,27 @@
    44     PREFIX=/usr/local
     
    3737 VERSTR = '\\"$${VER}\\"'          # place quotes around the version string
    3838 DEFINES += VERSION=\"$${VERSTR}\" # create a VERSION macro containing the version string
    39 @@ -204,12 +200,7 @@
     39@@ -204,21 +200,22 @@
    4040 }
    4141 
     
    4949+    INCLUDEPATH += $$PREFIX/include
    5050 
    51      LIBS += -lboost_system-mt -lboost_program_options-mt
    52      LIBS += -lgnuradio-runtime -lgnuradio-pmt -lgnuradio-audio -lgnuradio-analog
     51-    LIBS += -lboost_system-mt -lboost_program_options-mt
     52-    LIBS += -lgnuradio-runtime -lgnuradio-pmt -lgnuradio-audio -lgnuradio-analog
     53-    LIBS += -lgnuradio-blocks -lgnuradio-filter -lgnuradio-fft -lgnuradio-osmosdr
     54+    CONFIG += link_pkgconfig
     55 
     56-    # portaudio
     57-    contains(AUDIO_BACKEND, portaudio): {
     58-        LIBS    += -lportaudio
     59+    contains(AUDIO_BACKEND, portaudio) {
     60+        PKGCONFIG += portaudio-2.0
     61     }
     62+
     63+    PKGCONFIG += gnuradio-analog \
     64+                 gnuradio-audio \
     65+                 gnuradio-blocks \
     66+                 gnuradio-filter \
     67+                 gnuradio-fft \
     68+                 gnuradio-osmosdr
     69+
     70+    LIBS += -lboost_system-mt -lboost_program_options-mt
     71 }
     72 
     73 OTHER_FILES += \
Note: See TracChangeset for help on using the changeset viewer.