[oe] [WIP][PATCH 19/66] gnuradio: Add PACKAGECONFIG for jack and portaudio

[Martin Jansa]

* remove unused
  0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 ...n-t-add-usr-include-and-usr-lib-to-config.patch | 58 ----------------------
 .../gnuradio/allow-to-disable-jack-portaudio.patch | 34 +++++++++++++
 .../recipes-connectivity/gnuradio/gnuradio_git.bb  |  4 ++
 3 files changed, 38 insertions(+), 58 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch
 create mode 100644 meta-oe/recipes-connectivity/gnuradio/gnuradio/allow-to-disable-jack-portaudio.patch

diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch b/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch
deleted file mode 100644
index 7caaf51..0000000
--- a/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From a130153ae84d8bb5914879cef94df09f06825c10 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen at dominion.thruhere.net>
-Date: Sat, 18 Jun 2011 11:25:36 +0200
-Subject: [PATCH] buildsys: don't add /usr/include and /usr/lib to configure tests for libusb
-
-Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
----
- config/usrp_libusb.m4 |   13 -------------
- 1 files changed, 0 insertions(+), 13 deletions(-)
-
-diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4
-index cc3410f..b421820 100644
---- a/config/usrp_libusb.m4
-+++ b/config/usrp_libusb.m4
-@@ -117,10 +117,6 @@ AC_DEFUN([USRP_LIBUSB], [
-       dnl configured to find this header.
-       AC_LANG_PUSH(C)
-       save_CPPFLAGS="$CPPFLAGS"
--      if test x$USB_INCLUDEDIR != x; then
--        USB_INCLUDES="-I$USB_INCLUDEDIR"
--        CPPFLAGS="$USB_INCLUDES"
--      fi
-       AC_MSG_CHECKING([$libusb_name for header $usb_header])
-       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-         #include "$usb_header"
-@@ -172,9 +168,6 @@ AC_DEFUN([USRP_LIBUSB], [
-             *)
-               AC_LANG_PUSH(C)
-               save_CPPFLAGS="$CPPFLAGS"
--              if test x$USB_INCLUDEDIR != x; then
--                CPPFLAGS="$USB_INCLUDES"
--              fi
-               save_LIBS="$LIBS"
-               LIBS="$USB_LIBS"
-               AC_MSG_CHECKING([$libusb_name for symbol usb_debug in library $usb_lib_name])
-@@ -217,9 +210,6 @@ AC_DEFUN([USRP_LIBUSB], [
-     dnl final error checking, mostly to create #define's
-     AC_LANG_PUSH(C)
-     save_CPPFLAGS="$CPPFLAGS"
--    if test x$USB_INCLUDEDIR != x; then
--      CPPFLAGS="$USB_INCLUDES"
--    fi
-     dnl Check for the header.
-     AC_CHECK_HEADERS([$usb_header], [], [libusbok=no])
-     CPPFLAGS="$save_CPPFLAGS"
-@@ -231,9 +221,6 @@ AC_DEFUN([USRP_LIBUSB], [
-       dnl check for the library (again)
-       AC_LANG_PUSH(C)
-       save_CPPFLAGS="$CPPFLAGS"
--      if test x$USB_INCLUDEDIR != x; then
--        CPPFLAGS="$USB_INCLUDES"
--      fi
-       save_LIBS="$LIBS"
-       LIBS="$USB_LIBS"
-       AC_CHECK_LIB([$usb_lib_name], [$usb_lib_func], [], [
--- 
-1.6.6.1
-
diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio/allow-to-disable-jack-portaudio.patch b/meta-oe/recipes-connectivity/gnuradio/gnuradio/allow-to-disable-jack-portaudio.patch
new file mode 100644
index 0000000..58c4485
--- /dev/null
+++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio/allow-to-disable-jack-portaudio.patch
@@ -0,0 +1,34 @@
+--- ./gr-audio/lib/CMakeLists.txt.orig	2013-08-25 21:30:42.279818436 +0200
++++ ./gr-audio/lib/CMakeLists.txt	2013-08-25 21:30:27.263817898 +0200
+@@ -75,6 +75,7 @@
+ ########################################################################
+ ## Jack Support
+ ########################################################################
++if(ENABLE_JACK)
+ find_package(Jack)
+ 
+ if(JACK_FOUND)
+@@ -90,6 +91,7 @@
+     list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/jack/gr-audio-jack.conf)
+ 
+ endif(JACK_FOUND)
++endif(ENABLE_JACK)
+ 
+ ########################################################################
+ ## OSX Support
+@@ -117,6 +119,7 @@
+ ########################################################################
+ ## PortAudio Support
+ ########################################################################
++IF(ENABLE_PORTAUDIO)
+ find_package(Portaudio)
+ 
+ if(PORTAUDIO_FOUND)
+@@ -132,6 +135,7 @@
+     list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/portaudio/gr-audio-portaudio.conf)
+ 
+ endif(PORTAUDIO_FOUND)
++endif(ENABLE_PORTAUDIO)
+ 
+ ########################################################################
+ ## Windows Support
diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
index b0fc630..6cec02b 100644
--- a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
+++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
@@ -15,6 +15,9 @@ PACKAGECONFIG[grc] = "-DENABLE_GRC=ON,-DENABLE_GRC=OFF,python-pygtk python-cheet
 
 PACKAGECONFIG[qtgui] = "-DENABLE_GR_QTGUI=ON,-DENABLE_GR_QTGUI=OFF,qt4-x11-free qwt, "
 
+PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF,portaudio-v19, "
+PACKAGECONFIG[jack] = "-DENABLE_JACK=ON,-DENABLE_JACK=OFF,jack, "
+
 
 inherit distutils-base cmake pkgconfig
 
@@ -72,6 +75,7 @@ GIT_BRANCH = "master"
 
 SRC_URI = "git://git.gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \
            file://0001-gr-trellis-Kill-docs-hard.patch \
+           file://allow-to-disable-jack-portaudio.patch \
 "
 
 S="${WORKDIR}/git"
-- 
1.8.3.2