diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-06-12 22:31:38 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-06-12 22:31:38 +0000 |
| commit | 0ccc0a8ced3e8f82a3f4fb8e70f7da776a0eae9c (patch) | |
| tree | 3ed857abf702e295b46a8c21c9e6be858e3b2ea1 /net-wireless/gnuradio/files | |
| parent | Add optional depend on gvim for bug #419957 thanks to (diff) | |
| download | gentoo-2-0ccc0a8ced3e8f82a3f4fb8e70f7da776a0eae9c.tar.gz gentoo-2-0ccc0a8ced3e8f82a3f4fb8e70f7da776a0eae9c.tar.bz2 gentoo-2-0ccc0a8ced3e8f82a3f4fb8e70f7da776a0eae9c.zip | |
Always enable gr-audio and make the individual output modules non-automagic.
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless/gnuradio/files')
| -rw-r--r-- | net-wireless/gnuradio/files/gnuradio-3.6.1-automagic-audio.patch | 90 |
1 files changed, 90 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 |