diff options
Diffstat (limited to 'net-wireless/gnuradio/files')
-rw-r--r-- | net-wireless/gnuradio/files/gnuradio-3.6.1-automagic-audio.patch | 90 | ||||
-rw-r--r-- | net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch | 23 |
2 files changed, 113 insertions, 0 deletions
diff --git a/net-wireless/gnuradio/files/gnuradio-3.6.1-automagic-audio.patch b/net-wireless/gnuradio/files/gnuradio-3.6.1-automagic-audio.patch new file mode 100644 index 000000000000..4fa1c664145d --- /dev/null +++ b/net-wireless/gnuradio/files/gnuradio-3.6.1-automagic-audio.patch @@ -0,0 +1,90 @@ +diff -ur a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt +--- a/gr-audio/lib/CMakeLists.txt 2012-06-11 17:55:20.000000000 +0200 ++++ b/gr-audio/lib/CMakeLists.txt 2012-06-12 23:34:58.601611171 +0200 +@@ -38,7 +38,11 @@ + ######################################################################## + find_package(ALSA) + +-if(ALSA_FOUND) ++GR_REGISTER_COMPONENT("gr-audio-alsa" ENABLE_GR_AUDIO_ALSA ++ ALSA_FOUND ++) ++ ++if(ALSA_FOUND AND ENABLE_GR_AUDIO_ALSA) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/alsa ${ALSA_INCLUDE_DIRS}) + list(APPEND gr_audio_libs ${ALSA_LIBRARIES}) +@@ -49,14 +53,18 @@ + ) + list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/alsa/gr-audio-alsa.conf) + +-endif(ALSA_FOUND) ++endif(ALSA_FOUND AND ENABLE_GR_AUDIO_ALSA) + + ######################################################################## + ## OSS Support + ######################################################################## + find_package(OSS) + +-if(OSS_FOUND) ++GR_REGISTER_COMPONENT("gr-audio-oss" ENABLE_GR_AUDIO_OSS ++ OSS_FOUND ++) ++ ++if(OSS_FOUND AND ENABLE_GR_AUDIO_OSS) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/oss ${OSS_INCLUDE_DIRS}) + list(APPEND gr_audio_sources +@@ -65,7 +73,7 @@ + ) + list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/oss/gr-audio-oss.conf) + +-endif(OSS_FOUND) ++endif(OSS_FOUND AND ENABLE_GR_AUDIO_OSS) + + + ######################################################################## +@@ -73,7 +81,11 @@ + ######################################################################## + find_package(Jack) + +-if(JACK_FOUND) ++GR_REGISTER_COMPONENT("gr-audio-jack" ENABLE_GR_AUDIO_JACK ++ JACK_FOUND ++) ++ ++if(JACK_FOUND AND ENABLE_GR_AUDIO_JACK) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/jack ${JACK_INCLUDE_DIRS}) + list(APPEND gr_audio_libs ${JACK_LIBRARIES}) +@@ -85,7 +97,7 @@ + ) + list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/jack/gr-audio-jack.conf) + +-endif(JACK_FOUND) ++endif(JACK_FOUND AND ENABLE_GR_AUDIO_JACK) + + ######################################################################## + ## OSX Support +@@ -115,7 +127,11 @@ + ######################################################################## + find_package(Portaudio) + +-if(PORTAUDIO_FOUND) ++GR_REGISTER_COMPONENT("gr-audio-portaudio" ENABLE_GR_AUDIO_PORTAUDIO ++ PORTAUDIO_FOUND ++) ++ ++if(PORTAUDIO_FOUND AND ENABLE_GR_AUDIO_PORTAUDIO) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/portaudio ${PORTAUDIO_INCLUDE_DIRS}) + list(APPEND gr_audio_libs ${PORTAUDIO_LIBRARIES}) +@@ -127,7 +143,7 @@ + ) + list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/portaudio/gr-audio-portaudio.conf) + +-endif(PORTAUDIO_FOUND) ++endif(PORTAUDIO_FOUND AND ENABLE_GR_AUDIO_PORTAUDIO) + + ######################################################################## + ## Windows Support diff --git a/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch b/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch new file mode 100644 index 000000000000..f155ed51db73 --- /dev/null +++ b/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch @@ -0,0 +1,23 @@ +From b3bdd301debb2eb859473a25b23d068fa66f6cb1 Mon Sep 17 00:00:00 2001 +From: Zero_Chaos <sidhayn@gmail.com> +Date: Fri, 20 Feb 2015 15:54:00 -0500 +Subject: [PATCH] Update FindQwt.cmake to support qwt6-qt4 + +allow finding qwt6-qt4 library. Some distros have added support for both qt4 and qt5 in qwt6, the common name the library uses appears to be qwt6-qt4. The pre-existance of the qwt-qt4 entry suggests this naming convention is reasonably standard (or at least this isn't a unique hack) +--- + cmake/Modules/FindQwt.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake +index 68f55bf..3ce49aa 100644 +--- a/cmake/Modules/FindQwt.cmake ++++ b/cmake/Modules/FindQwt.cmake +@@ -22,7 +22,7 @@ find_path(QWT_INCLUDE_DIRS + ) + + find_library (QWT_LIBRARIES +- NAMES qwt6 qwt qwt-qt4 ++ NAMES qwt6 qwt6-qt4 qwt qwt-qt4 + HINTS + ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 |