[122520] trunk/dports/science/gnuradio
michaelld at macports.org
michaelld at macports.org
Wed Jul 23 07:29:55 PDT 2014
Revision: 122520
https://trac.macports.org/changeset/122520
Author: michaelld at macports.org
Date: 2014-07-23 07:29:55 -0700 (Wed, 23 Jul 2014)
Log Message:
-----------
gnuradio*:
+ update release to 3.7.4;
+ update devel to c580eacd and next to ad17b61b, both 20140722;
+ tweak patches for updates;
+ reorganize variants for new release capabilities;
+ move "name" to before "github.setup" since that now works.
Modified Paths:
--------------
trunk/dports/science/gnuradio/Portfile
trunk/dports/science/gnuradio/files/patch-cmake-expand.release.diff
Removed Paths:
-------------
trunk/dports/science/gnuradio/files/patch-various-10_5-fixes.release.diff
Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile 2014-07-23 14:26:49 UTC (rev 122519)
+++ trunk/dports/science/gnuradio/Portfile 2014-07-23 14:29:55 UTC (rev 122520)
@@ -22,8 +22,7 @@
if {${subport} eq ${name}} {
- github.setup gnuradio gnuradio 3.7.3 v
- revision 2
+ github.setup gnuradio gnuradio 3.7.4 v
long_description ${description}: \
This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
@@ -31,12 +30,9 @@
conflicts gnuradio-legacy gnuradio-next gnuradio-devel
checksums \
- rmd160 5d1b3d03c96e0afd193407346f4f24ed4ed3907b \
- sha256 bec2eee034a525b268e14b2b2529d419313d36844f794f730f7176f75a52262f
+ rmd160 565f1a840502664e5a142cb314d566c243e0c584 \
+ sha256 960433dd098f6a536f1e04a10d5b2c5e9f1dbed17caa7130aa16165743b90489
- patchfiles-append \
- patch-cmake-expand.release.diff
-
# overload the github livecheck regex to look for versions that
# are just numbers and '.', no letters (e.g., "3.7.3git").
@@ -46,8 +42,8 @@
subport gnuradio-legacy {
- github.setup gnuradio gnuradio 3.6.5.1 v
name gnuradio-legacy
+ github.setup gnuradio gnuradio 3.6.5.1 v
revision 8
long_description ${description}: \
@@ -93,15 +89,15 @@
long_description ${description}: \
This port is kept up with the GNU Radio GIT 'master' branch, which is typically updated daily to weekly. This version of GNU Radio generally contains fixes to, and its API is compatible with, the current GNU Radio release, and will be incorporated in an upcoming release. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.
- github.setup gnuradio gnuradio d09b971d01f4e65eff80065796d724d88168866d
- version 3.7.4_20140721
name gnuradio-devel
+ github.setup gnuradio gnuradio c580eacd6edbef6e3566cef8737ba90c1f666847
+ version 3.7.5_20140722
conflicts gnuradio-legacy gnuradio gnuradio-next
checksums \
- rmd160 ad4f426e7a27056808358a7a22f494d0c5279a90 \
- sha256 7ebef46c99b1d193197a95a9e6063db2b2c7a0f1821eb42ea05b535e68f254f6
+ rmd160 ea49ccc20e2567a89bd71cc42e8039596883e037 \
+ sha256 e2099b078abc204aff47e1c44ac5bc2e8d241191676e25005b61ecfb11221d50
}
@@ -110,15 +106,15 @@
long_description ${description}: \
This port is kept up with the GNU Radio GIT 'next' branch, which is typically updated daily to weekly. This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.
- github.setup gnuradio gnuradio ad17b61b2bea012b30078e0b0a691696df17cd8a
- version 3.8.0_20140721
name gnuradio-next
+ github.setup gnuradio gnuradio 5a59c2ee321e5269068df60a7b880a2b0554eb00
+ version 3.8.0_20140722
conflicts gnuradio-legacy gnuradio gnuradio-devel
checksums \
- rmd160 d35116bc9aa3c94b2f8ba5045f0193f099abfff7 \
- sha256 8f2678dfb09a9538308889d570b6ce3b31bc778167a87339fcfea68ec90dd269
+ rmd160 167fb3af6b447106e44285eb42eb52635f410a02 \
+ sha256 f925a22e848b575101c62225a0e5aae356d6407ce7aaa2a964c6aa4fa507fd36
# overload the github livecheck URL with the correct branch
@@ -137,6 +133,26 @@
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.
+
+ if {${subport} eq "gnuradio"} {
+
+ # patches for release only
+ patchfiles-append \
+ patch-cmake-expand.release.diff
+
+ } else {
+
+ # patches for devel and next (which are kept aligned for now)
+ patchfiles-append \
+ patch-cmake-expand.devel.diff
+
+ }
+
+ # 3.7 API variants
+
variant ctrlport description {Enable control port enhancements (EXPERIMENTAL)} {}
if {[variant_isset ctrlport]} {
@@ -164,38 +180,21 @@
}
- if {${subport} ne "gnuradio"} {
+ variant zeromq description {Install GNU Radio with support for the ZeroMQ lightweight messaging kernel (EXPERIMENTAL)} {}
- # patches for devel and next (which are kept aligned for now)
+ if {[variant_isset zeromq]} {
- # 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.
+ depends_lib-append \
+ port:cppzmq
- patchfiles-append patch-cmake-expand.devel.diff
+ configure.args-append \
+ -DENABLE_GR_ZEROMQ=ON
- # the zeromq variant is for devel and next only
- # until the next release
+ } else {
- variant zeromq description {Install GNU Radio with support for the ZeroMQ lightweight messaging kernel (EXPERIMENTAL)} {}
+ configure.args-append \
+ -DENABLE_GR_ZEROMQ=OFF
- if {[variant_isset zeromq]} {
-
- depends_lib-append \
- port:cppzmq
-
- configure.args-append \
- -DENABLE_GR_ZEROMQ=ON
-
- } else {
-
- configure.args-append \
- -DENABLE_GR_ZEROMQ=OFF
-
- }
- } else {
- # temporary patch until 3.7.4 is released
- patchfiles-append patch-various-10_5-fixes.release.diff
}
}
Modified: trunk/dports/science/gnuradio/files/patch-cmake-expand.release.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-cmake-expand.release.diff 2014-07-23 14:26:49 UTC (rev 122519)
+++ trunk/dports/science/gnuradio/files/patch-cmake-expand.release.diff 2014-07-23 14:29:55 UTC (rev 122520)
@@ -1,14 +1,5 @@
--- cmake/Modules/GrMiscUtils.cmake.orig
+++ cmake/Modules/GrMiscUtils.cmake
-@@ -333,7 +333,7 @@ set(CMAKE_REQUIRED_LIBRARIES -lpthread)
- } " HAVE_PTHREAD_SETSCHEDPARAM
- )
- GR_ADD_COND_DEF(HAVE_PTHREAD_SETSCHEDPARAM)
--
-+
- CHECK_CXX_SOURCE_COMPILES("
- #include <sched.h>
- int main(){
@@ -345,3 +345,210 @@ set(CMAKE_REQUIRED_LIBRARIES -lpthread)
GR_ADD_COND_DEF(HAVE_SCHED_SETSCHEDULER)
endmacro(GR_CHECK_LINUX_SCHED_AVAIL)
@@ -233,7 +224,8 @@
########################################################################
-# generate helper scripts to expand templated files
--########################################################################
++# Invoke macro to generate various headers
+ ########################################################################
-include(GrPython)
-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
@@ -261,7 +253,7 @@
- string(REGEX REPLACE "X+" ${sig} name ${root})
- list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
- endforeach(sig)
--
+-
- #create a command to generate the files
- add_custom_command(
- OUTPUT ${expanded_files_h}
@@ -277,8 +269,7 @@
-
-########################################################################
-# Invoke macro to generate various sources
-+# Invoke macro to generate various headers
- #######################################################################
+-#######################################################################
-expand_h(noise_source_X s i f c)
-expand_h(fastnoise_source_X s i f c)
-expand_h(sig_source_X s i f c)
@@ -326,7 +317,7 @@
- list(APPEND expanded_files_cc ${CMAKE_CURRENT_BINARY_DIR}/${name}.cc)
- list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
- endforeach(sig)
--
+-
- #create a command to generate the source files
- add_custom_command(
- OUTPUT ${expanded_files_cc}
@@ -344,15 +335,15 @@
- ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
- ${root} ${root}.h.t ${ARGN}
- )
--
+-
- #make source files depends on headers to force generation
- set_source_files_properties(${expanded_files_cc}
- PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
- )
--
+-
- #install rules for the generated cc files
-- list(APPEND generated_sources ${expanded_files_cc})
-- list(APPEND generated_headers ${expanded_files_h})
+- list(APPEND generated_sources ${expanded_files_cc})
+- list(APPEND generated_headers ${expanded_files_h})
-endmacro(expand_cc)
-
-
@@ -371,7 +362,7 @@
# Setup library
--- gr-blocks/include/gnuradio/blocks/CMakeLists.txt.orig
+++ gr-blocks/include/gnuradio/blocks/CMakeLists.txt
-@@ -18,80 +18,38 @@
+@@ -18,81 +18,38 @@
# Boston, MA 02110-1301, USA.
########################################################################
@@ -379,7 +370,7 @@
+# Invoke macro to generate various headers
########################################################################
-include(GrPython)
-
+-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
-#!${PYTHON_EXECUTABLE}
-
@@ -405,7 +396,7 @@
- string(REGEX REPLACE "X+" ${sig} name ${root})
- list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
- endforeach(sig)
--
+-
- #create a command to generate the files
- add_custom_command(
- OUTPUT ${expanded_files_h}
@@ -444,6 +435,7 @@
-expand_h(probe_signal_vX b s i f c)
-expand_h(sample_and_hold_XX bb ss ii ff)
-expand_h(sub_XX ss ii ff cc)
+-expand_h(tsb_vector_sink_X b s i f c)
-expand_h(xor_XX bb ss ii)
-expand_h(packed_to_unpacked_XX bb ss ii)
-expand_h(unpacked_to_packed_XX bb ss ii)
@@ -473,6 +465,7 @@
+GR_EXPAND_X_H(blocks probe_signal_vX b s i f c)
+GR_EXPAND_X_H(blocks sample_and_hold_XX bb ss ii ff)
+GR_EXPAND_X_H(blocks sub_XX ss ii ff cc)
++GR_EXPAND_X_H(blocks tsb_vector_sink_X b s i f c)
+GR_EXPAND_X_H(blocks xor_XX bb ss ii)
+GR_EXPAND_X_H(blocks packed_to_unpacked_XX bb ss ii)
+GR_EXPAND_X_H(blocks unpacked_to_packed_XX bb ss ii)
@@ -484,7 +477,7 @@
${generated_includes}
--- gr-blocks/lib/CMakeLists.txt.orig
+++ gr-blocks/lib/CMakeLists.txt
-@@ -23,101 +23,37 @@
+@@ -23,102 +23,38 @@
include(${CMAKE_CURRENT_SOURCE_DIR}/ConfigChecks.cmake)
########################################################################
@@ -519,7 +512,7 @@
- list(APPEND expanded_files_h_impl ${CMAKE_CURRENT_BINARY_DIR}/${name}_impl.h)
- list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/../include/${name}.h)
- endforeach(sig)
--
+-
- #create a command to generate the _impl.cc files
- add_custom_command(
- OUTPUT ${expanded_files_cc_impl}
@@ -528,7 +521,7 @@
- ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
- ${root} ${root}_impl.cc.t ${ARGN}
- )
--
+-
- #create a command to generate the _impl.h files
- add_custom_command(
- OUTPUT ${expanded_files_h_impl}
@@ -537,19 +530,19 @@
- ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
- ${root} ${root}_impl.h.t ${ARGN}
- )
--
+-
- #make _impl.cc source files depend on headers to force generation
- set_source_files_properties(${expanded_files_cc_impl}
- PROPERTIES OBJECT_DEPENDS "${expanded_files_h_impl}"
- )
--
+-
- #make _impl.h source files depend on headers to force generation
- set_source_files_properties(${expanded_files_h_impl}
- PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
- )
-
- #install rules for the generated cc files
-- list(APPEND generated_sources ${expanded_files_cc_impl})
+- list(APPEND generated_sources ${expanded_files_cc_impl})
-endmacro(expand_cc_h_impl)
-
-########################################################################
@@ -576,6 +569,7 @@
-expand_cc_h_impl(probe_signal_X b s i f c)
-expand_cc_h_impl(probe_signal_vX b s i f c)
-expand_cc_h_impl(sample_and_hold_XX bb ss ii ff)
+-expand_cc_h_impl(tsb_vector_sink_X b s i f c)
-expand_cc_h_impl(sub_XX ss ii ff cc)
-expand_cc_h_impl(xor_XX bb ss ii)
-expand_cc_h_impl(packed_to_unpacked_XX bb ss ii)
@@ -606,6 +600,7 @@
+GR_EXPAND_X_CC_H_IMPL(blocks probe_signal_vX b s i f c)
+GR_EXPAND_X_CC_H_IMPL(blocks sample_and_hold_XX bb ss ii ff)
+GR_EXPAND_X_CC_H_IMPL(blocks sub_XX ss ii ff cc)
++GR_EXPAND_X_CC_H_IMPL(blocks tsb_vector_sink_X b s i f c)
+GR_EXPAND_X_CC_H_IMPL(blocks xor_XX bb ss ii)
+GR_EXPAND_X_CC_H_IMPL(blocks packed_to_unpacked_XX bb ss ii)
+GR_EXPAND_X_CC_H_IMPL(blocks unpacked_to_packed_XX bb ss ii)
@@ -617,11 +612,9 @@
# Setup the include and linker paths
--- gr-digital/include/gnuradio/digital/CMakeLists.txt.orig
+++ gr-digital/include/gnuradio/digital/CMakeLists.txt
-@@ -17,54 +17,12 @@
- # the Free Software Foundation, Inc., 51 Franklin Street,
+@@ -18,53 +18,10 @@
# Boston, MA 02110-1301, USA.
-+#################################################################
########################################################################
-# generate helper scripts to expand templated files
-########################################################################
@@ -652,7 +645,7 @@
- string(REGEX REPLACE "X+" ${sig} name ${root})
- list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
- endforeach(sig)
--
+-
- #create a command to generate the files
- add_custom_command(
- OUTPUT ${expanded_files_h}
@@ -683,8 +676,7 @@
########################################################################
-# generate helper scripts to expand templated files
-+# Invoke macro to generate various sources and headers
- ########################################################################
+-########################################################################
-include(GrPython)
-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
@@ -713,7 +705,7 @@
- list(APPEND expanded_files_cc ${CMAKE_CURRENT_BINARY_DIR}/${name}.cc)
- list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
- endforeach(sig)
--
+-
- #create a command to generate the source files
- add_custom_command(
- OUTPUT ${expanded_files_cc}
@@ -731,28 +723,28 @@
- ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
- ${root} ${root}.h.t ${ARGN}
- )
--
+-
- #make source files depends on headers to force generation
- set_source_files_properties(${expanded_files_cc}
- PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
- )
--
+-
- #install rules for the generated cc files
-- list(APPEND generated_sources ${expanded_files_cc})
-- list(APPEND generated_headers ${expanded_files_h})
+- list(APPEND generated_sources ${expanded_files_cc})
+- list(APPEND generated_headers ${expanded_files_h})
-endmacro(expand_cc)
-
-
-########################################################################
--# Invoke macro to generate various sources
--########################################################################
+ # Invoke macro to generate various sources
+ ########################################################################
-expand_cc(chunks_to_symbols_XX_impl bf bc sf sc if ic)
+include(GrMiscUtils)
+GR_EXPAND_X_CC_H(digital chunks_to_symbols_XX_impl bf bc sf sc if ic)
########################################################################
# Setup library
-@@ -198,7 +138,6 @@ list(APPEND digital_libs
+@@ -203,7 +143,6 @@ list(APPEND digital_libs
${LOG4CPP_LIBRARIES}
)
@@ -795,7 +787,7 @@
- string(REGEX REPLACE "X+" ${sig} name ${root})
- list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
- endforeach(sig)
--
+-
- #create a command to generate the files
- add_custom_command(
- OUTPUT ${expanded_files_h}
@@ -824,8 +816,8 @@
install(FILES
- ${generated_includes}
api.h
- decode_ccsds_27_fb.h
- encode_ccsds_27_bb.h
+ generic_decoder.h
+ generic_encoder.h
--- gr-filter/include/gnuradio/filter/CMakeLists.txt.orig
+++ gr-filter/include/gnuradio/filter/CMakeLists.txt
@@ -18,56 +18,13 @@
@@ -986,7 +978,8 @@
########################################################################
-# generate helper scripts to expand templated files
--########################################################################
++# Invoke macro to generate various headers
+ ########################################################################
-include(GrPython)
-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
@@ -1014,7 +1007,7 @@
- string(REGEX REPLACE "X+" ${sig} name ${root})
- list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
- endforeach(sig)
--
+-
- #create a command to generate the files
- add_custom_command(
- OUTPUT ${expanded_files_h}
@@ -1030,8 +1023,7 @@
-
-########################################################################
-# Invoke macro to generate various sources
-+# Invoke macro to generate various headers
- #######################################################################
+-#######################################################################
-expand_h(encoder_XX bb bs bi ss si ii)
-expand_h(sccc_encoder_XX bb bs bi ss si ii)
-expand_h(pccc_encoder_XX bb bs bi ss si ii)
@@ -1064,12 +1056,12 @@
#
# This file is part of GNU Radio
#
-@@ -37,79 +37,20 @@ if(ENABLE_GR_CTRLPORT)
- include_directories(${ICE_INCLUDE_DIR})
+@@ -38,78 +38,19 @@ if(ENABLE_GR_CTRLPORT)
endif(ENABLE_GR_CTRLPORT)
--#######################################################################
+ #######################################################################
-# generate the python helper script which calls into the build utils
++# Invoke macro to generate various sources and headers
########################################################################
-include(GrPython)
-
@@ -1099,7 +1091,7 @@
- list(APPEND expanded_files_cc ${CMAKE_CURRENT_BINARY_DIR}/${name}.cc)
- list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
- endforeach(sig)
--
+-
- #create a command to generate the source files
- add_custom_command(
- OUTPUT ${expanded_files_cc}
@@ -1117,21 +1109,20 @@
- ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
- ${root} ${root}.h.t ${ARGN}
- )
--
+-
- #make source files depends on headers to force generation
- set_source_files_properties(${expanded_files_cc}
- PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
- )
--
+-
- #install rules for the generated cc files
-- list(APPEND generated_sources ${expanded_files_cc})
-- list(APPEND generated_headers ${expanded_files_h})
+- list(APPEND generated_sources ${expanded_files_cc})
+- list(APPEND generated_headers ${expanded_files_h})
-endmacro(expand_cc)
-
-########################################################################
-# Invoke macro to generate various sources
-+# Invoke macro to generate various sources and headers
- ########################################################################
+-########################################################################
-expand_cc(encoder_XX_impl bb bs bi ss si ii)
-expand_cc(sccc_encoder_XX_impl bb bs bi ss si ii)
-expand_cc(pccc_encoder_XX_impl bb bs bi ss si ii)
Deleted: trunk/dports/science/gnuradio/files/patch-various-10_5-fixes.release.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-various-10_5-fixes.release.diff 2014-07-23 14:26:49 UTC (rev 122519)
+++ trunk/dports/science/gnuradio/files/patch-various-10_5-fixes.release.diff 2014-07-23 14:29:55 UTC (rev 122520)
@@ -1,87 +0,0 @@
---- gr-audio/lib/osx/osx_common.h.orig
-+++ gr-audio/lib/osx/osx_common.h
-@@ -35,9 +35,9 @@ namespace osx {
- #define check_error_and_throw(err,what,throw_str) \
- if(err) { \
- OSStatus error = static_cast<OSStatus>(err); \
-- char err_str[5]; \
-- *((UInt32*)err_str) = error; \
-- err_str[4] = 0; \
-+ char err_str[sizeof(OSStatus)+1]; \
-+ memcpy((void*)(&err_str), (void*)(&error), sizeof(OSStatus)); \
-+ err_str[sizeof(OSStatus)] = 0; \
- GR_LOG_FATAL(d_logger, boost::format(what)); \
- GR_LOG_FATAL(d_logger, boost::format(" Error# %u ('%s')") \
- % error % err_str); \
-@@ -49,9 +49,9 @@ namespace osx {
- #define check_error(err,what) \
- if(err) { \
- OSStatus error = static_cast<OSStatus>(err); \
-- char err_str[5]; \
-- *((UInt32*)err_str) = error; \
-- err_str[4] = 0; \
-+ char err_str[sizeof(OSStatus)+1]; \
-+ memcpy((void*)(&err_str), (void*)(&error), sizeof(OSStatus)); \
-+ err_str[sizeof(OSStatus)] = 0; \
- GR_LOG_WARN(d_logger, boost::format(what)); \
- GR_LOG_WARN(d_logger, boost::format(" Error# %u ('%s')") \
- % error % err_str); \
-commit aead6f76ab85755c5ae4e561f0560247eb8b2a97
-Author: Michael Dickens <mlk at alum.mit.edu>
-Date: Thu Jun 26 19:35:12 2014 -0400
-
- gr-audio OSX: fix call to AudioHardwareRemovePropertyListener to match API.
-
---- gr-audio/lib/osx/osx_source.cc.orig
-+++ gr-audio/lib/osx/osx_source.cc
-@@ -933,8 +933,7 @@ namespace gr {
- err = AudioHardwareRemovePropertyListener
- (kAudioHardwarePropertyDevices,
- reinterpret_cast<AudioHardwarePropertyListenerProc>
-- (&osx_source::hardware_listener)
-- reinterpret_cast<void*>(this));
-+ (&osx_source::hardware_listener));
- #if _OSX_AU_DEBUG_
- check_error(err, "AudioObjectRemovePropertyListener hardware");
- #endif
-@@ -943,8 +942,7 @@ namespace gr {
- err = AudioHardwareRemovePropertyListener
- (kAudioHardwarePropertyDefaultInputDevice,
- reinterpret_cast<AudioHardwarePropertyListenerProc>
-- (&osx_source::default_listener),
-- reinterpret_cast<void*>(this));
-+ (&osx_source::default_listener));
- #if _OSX_AU_DEBUG_
- check_error(err, "AudioObjectRemovePropertyListener default");
- #endif
-commit 3d76c05bca4efb8f3aa8187135986c28a4e7fae8
-Author: Michael Dickens <mlk at alum.mit.edu>
-Date: Thu Jun 26 20:33:35 2014 -0400
-
- volk cmake: if the CPU is not x86, eliminate all Intel SIMD.
-
---- volk/lib/CMakeLists.txt.orig
-+++ volk/lib/CMakeLists.txt
-@@ -205,6 +205,22 @@ if(${HAVE_AVX_CVTPI32_PS})
- add_definitions(-DHAVE_AVX_CVTPI32_PS)
- endif()
-
-+########################################################################
-+# if the CPU is not x86, eliminate all Intel SIMD
-+########################################################################
-+
-+if(NOT CPU_IS_x86)
-+ OVERRULE_ARCH(3dnow "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(mmx "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(sse "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(sse2 "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(sse3 "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(ssse3 "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(sse4_a "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(sse4_1 "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(sse4_2 "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(avx "Architecture is not x86 or x86_64")
-+endif(NOT CPU_IS_x86)
-
- ########################################################################
- # implement overruling in the ORC case,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140723/a5701901/attachment-0001.html>
More information about the macports-changes
mailing list