[hamradio-commits] [cubicsdr] 04/11: Drop use-system-rtaudio patch, use new build variable instead

[Andreas E. Bombe]

This is an automated email from the git hooks/post-receive script.

aeb pushed a commit to branch master
in repository cubicsdr.

commit 4eb9dc063ad99b9e55bbdb58ad8d2056ca53586b
Author: Andreas Bombe <aeb at debian.org>
Date:   Wed Mar 8 20:50:28 2017 +0100

    Drop use-system-rtaudio patch, use new build variable instead
---
 debian/patches/series             |  1 -
 debian/patches/use-system-rtaudio | 38 --------------------------------------
 debian/rules                      |  2 +-
 3 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 884e45f..a9791b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-use-system-rtaudio
 use-system-tinyxml
 disable-deb-processing
diff --git a/debian/patches/use-system-rtaudio b/debian/patches/use-system-rtaudio
deleted file mode 100644
index 8bdc3b5..0000000
--- a/debian/patches/use-system-rtaudio
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Use system librtaudio instead of embedded copy
- Edit the cmake script to use the system installed librtaudio instead of
- the (removed in Debian) embedded copy.
-Author: Andreas Bombe <aeb at debian.org>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -120,6 +120,13 @@
- include_directories(${LIQUID_INCLUDES})
- SET(OTHER_LIBRARIES ${OTHER_LIBRARIES} ${LIQUID_LIBRARIES})
- 
-+
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(RTAUDIO REQUIRED rtaudio)
-+include_directories(${RTAUDIO_INCLUDE_DIRS})
-+SET(OTHER_LIBRARIES ${OTHER_LIBRARIES} ${RTAUDIO_LIBRARIES})
-+
-+
- find_package(wxWidgets COMPONENTS gl core propgrid adv base REQUIRED)
- set(wxWidgets_CONFIGURATION mswu)
- include(${wxWidgets_USE_FILE})
-@@ -304,7 +311,6 @@
-     src/forms/SDRDevices/SDRDevicesForm.cpp
-     src/forms/SDRDevices/SDRDeviceAdd.cpp
-     src/forms/SDRDevices/SDRDeviceAddForm.cpp
--	external/rtaudio/RtAudio.cpp
- 	external/lodepng/lodepng.cpp
- 	external/tinyxml/tinyxml.cpp
- 	external/tinyxml/tinystr.cpp
-@@ -408,7 +414,6 @@
-     src/forms/SDRDevices/SDRDevicesForm.h
-     src/forms/SDRDevices/SDRDeviceAdd.h
-     src/forms/SDRDevices/SDRDeviceAddForm.h
--	external/rtaudio/RtAudio.h
- 	external/lodepng/lodepng.h
- 	external/tinyxml/tinyxml.h
- 	external/tinyxml/tinystr.h
diff --git a/debian/rules b/debian/rules
index 8c07f5b..82ffeaf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,4 +7,4 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 	dh ${@}
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DUSE_HAMLIB=ON
+	dh_auto_configure -- -DUSE_HAMLIB=ON -DUSE_SYSTEM_RTAUDIO=ON

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/cubicsdr.git