[139216] trunk/dports/science/gnuradio

[michaelld at macports.org]

Revision: 139216
          https://trac.macports.org/changeset/139216
Author:   michaelld at macports.org
Date:     2015-08-07 13:37:59 -0700 (Fri, 07 Aug 2015)
Log Message:
-----------
gnuradio:
+ update release to 3.7.8;
+ update devel to 22e2f1ae and release to 183dc9e9, both 20150805;
+ remove integrated patch.

Modified Paths:
--------------
    trunk/dports/science/gnuradio/Portfile

Removed Paths:
-------------
    trunk/dports/science/gnuradio/files/patch-remove-SIZE_T_32.diff

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2015-08-07 17:07:25 UTC (rev 139215)
+++ trunk/dports/science/gnuradio/Portfile	2015-08-07 20:37:59 UTC (rev 139216)
@@ -21,8 +21,7 @@
 
 if {${subport} eq ${name}} {
 
-    github.setup    gnuradio gnuradio 3.7.7.1 v
-    revision        1
+    github.setup    gnuradio gnuradio 3.7.8 v
 
     long_description    ${description}: \
         This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
@@ -30,8 +29,8 @@
     conflicts       gnuradio-legacy gnuradio-next gnuradio-devel
 
     checksums \
-        rmd160 18383f299f75ecc8d11345872b9991f7eb44f321 \
-        sha256 461681cd7bdff80d07ba24c9b420f4ddcd5f869fc1c4ff671d2f155ff44d14ec
+        rmd160 8b56a2d372d967263470263344a281f16df20df2 \
+        sha256 e2db7cdb3231894e965540cec5930bfdbcaed952e0701e244fd72cb0961d3fef
 
     # overload the github livecheck regex to look for versions that
     # are just numbers and '.', no letters (e.g., "3.7.3git").
@@ -92,11 +91,11 @@
     name                gnuradio-devel
     conflicts           gnuradio-legacy gnuradio gnuradio-next
 
-    github.setup        gnuradio gnuradio cf3f6a9b6dc51e20823990fb43d6fb4ec98691a5
-    version             20150724
+    github.setup        gnuradio gnuradio 22e2f1aed8afdfccce3884cf6bf3140c2b8e3f53
+    version             20150805
     checksums \
-        rmd160 6ace95b419f48fc913303d62f8e190a877d8f71a \
-        sha256 2d2493d49aefc9df7bb96a30400f2d0570012a56b931afd4f5f1d813dcbf4392
+        rmd160 45c442a928f92a8c77476c562061665c02246ce9 \
+        sha256 9c8e8eeef143e1ffd23e8e88922b9269bab342a7b27cf4b615ce561d788cfaeb
 
 }
 
@@ -108,11 +107,11 @@
     name                gnuradio-next
     conflicts           gnuradio-legacy gnuradio gnuradio-devel
 
-    github.setup        gnuradio gnuradio 593e261d6ad4dbd1a45996a6e2f5df22df21091f
-    version             20150724
+    github.setup        gnuradio gnuradio 183dc9e9e18814beacb74bc7810a3a321e005522
+    version             20150805
     checksums \
-        rmd160 e1c8d95eebd5b4351b7b869d2ae777945da9e8e2 \
-        sha256 cc7d17b5f866b803659defb4325dccf0f3155051b2859162a3c0ce7cb81282c3
+        rmd160 92d83bc9665cbf727709e0e808dbab3bd86b8806 \
+        sha256 7a3bef4d1d0eea14a44ff524a1c53ac075835cb6305f73e5af421fcc8c2a471f
 
     # overload the github livecheck URL with the correct branch
 
@@ -172,14 +171,6 @@
 
     depends_lib-append port:log4cpp
 
-    # remove SIZE_T_32 check for SWIG; seems to help on older
-    # 32/64 OSs; this is fixed for SWIG >= 3.0.0 in GNU Radio
-    # devel and next as of 2015-04-28 (6277665c).
-
-    if {${subport} eq "gnuradio"} {
-        patchfiles-append patch-remove-SIZE_T_32.diff
-    }
-
     # temporary patch to fix header creation to be before dependencies
     # are determined, such that local (to the build) headers are found
     # before already-installed ones.

Deleted: trunk/dports/science/gnuradio/files/patch-remove-SIZE_T_32.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-remove-SIZE_T_32.diff	2015-08-07 17:07:25 UTC (rev 139215)
+++ trunk/dports/science/gnuradio/files/patch-remove-SIZE_T_32.diff	2015-08-07 20:37:59 UTC (rev 139216)
@@ -1,39 +0,0 @@
---- cmake/Modules/GrSwig.cmake.orig	2014-08-30 12:33:12.000000000 -0400
-+++ cmake/Modules/GrSwig.cmake	2014-09-01 08:37:32.000000000 -0400
-@@ -105,18 +105,6 @@
- macro(GR_SWIG_MAKE name)
-     set(ifiles ${ARGN})
- 
--    # Shimming this in here to take care of a SWIG bug with handling
--    # vector<size_t> and vector<unsigned int> (on 32-bit machines) and
--    # vector<long unsigned int> (on 64-bit machines). Use this to test
--    # the size of size_t, then set SIZE_T_32 if it's a 32-bit machine
--    # or not if it's 64-bit. The logic in gr_type.i handles the rest.
--    INCLUDE(CheckTypeSize)
--    CHECK_TYPE_SIZE("size_t" SIZEOF_SIZE_T)
--    CHECK_TYPE_SIZE("unsigned int" SIZEOF_UINT)
--    if(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UINT})
--      list(APPEND GR_SWIG_FLAGS -DSIZE_T_32)
--    endif(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UINT})
--
-     #do swig doc generation if specified
-     if(GR_SWIG_DOC_FILE)
-         set(GR_SWIG_DOCS_SOURCE_DEPS ${GR_SWIG_SOURCE_DEPS})
---- gnuradio-runtime/swig/gr_types.i.orig
-+++ gnuradio-runtime/swig/gr_types.i
-@@ -80,15 +80,4 @@ namespace std {
- %template(gr_vector_vector_complexf) std::vector< std::vector< std::complex<float> > >;
- %template(gr_vector_vector_complexd) std::vector< std::vector< std::complex<double> > >;
- 
--// Fix for Issue #529
--#ifdef SIZE_T_32
--  // On 32-bit systems, whenever we see std::vector<size_t>, replace it
--  // with vector<unsigned int>
--  %apply std::vector<unsigned int> { std::vector<size_t> };
--#else
--  // On 64-bit systems, whenever we see std::vector<size_t>, replace it
--  // with vector<long unsigned int>
--  %apply std::vector<long unsigned int> { std::vector<size_t> };
--#endif
--
- #endif /* SWIG_GR_TYPES_I */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150807/f91f2344/attachment.html>