Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libsoundio/files/, media-libs/libsoundio/
Date: Sun, 30 Jul 2017 11:24:34
Message-Id: 1501413681.51f2806c9cf5348bbce1ca635600a0b4ec2c97db.soap@gentoo
1 commit: 51f2806c9cf5348bbce1ca635600a0b4ec2c97db
2 Author: Diogo Pereira <sir.suriv <AT> gmail <DOT> com>
3 AuthorDate: Wed Jul 19 20:04:27 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 30 11:21:21 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51f2806c
7
8 media-libs/libsoundio: drop old
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11 Closes: https://github.com/gentoo/gentoo/pull/5144
12
13 media-libs/libsoundio/Manifest | 2 -
14 .../libsoundio/files/libsoundio-1.0.0_clang.patch | 32 ----
15 .../files/libsoundio-1.0.0_examples_tests.patch | 182 ---------------------
16 .../files/libsoundio-1.0.0_static-libs.patch | 52 ------
17 media-libs/libsoundio/libsoundio-1.0.0.ebuild | 40 -----
18 media-libs/libsoundio/libsoundio-1.0.2.ebuild | 35 ----
19 media-libs/libsoundio/libsoundio-1.1.0.ebuild | 39 -----
20 7 files changed, 382 deletions(-)
21
22 diff --git a/media-libs/libsoundio/Manifest b/media-libs/libsoundio/Manifest
23 index 433d75fe275..67c28795c21 100644
24 --- a/media-libs/libsoundio/Manifest
25 +++ b/media-libs/libsoundio/Manifest
26 @@ -1,3 +1 @@
27 -DIST libsoundio-1.0.0.tar.gz 112139 SHA256 f05d87916266b6b32020c3e13b78ce9f3a758c43c8f8c8bbaf37578d99e1d3e2 SHA512 d0a0eda701d99ef658ee2858dbf4be2ec872d74bc1c9d05ed5484adcc17e774530c150fcd86cd1213a8dceb6373dfd3319a2c97c506ada0cdfe0f02551c0ddd0 WHIRLPOOL 1720e8eb64dc407a17dfbc9ccc8406184e0fa8c5bcc799553e5af181c9faebc0d0ba75fab0c8d9f6332fec6db1711ae9d6afe4be0e970fd5e9b526511b0a8965
28 -DIST libsoundio-1.0.2.tar.gz 114311 SHA256 821fc5b94880f09f57178ea7b474216e7dd0d698c8cac98e366d28d3b4f3ac4d SHA512 9110c6dd2f2ee8ed9f4a454b92aea5292b1b222aebe6851d247e964a6aa80f1d95d490e2d3da5d06cbd6853407c4002f02d163fac5631f51e110d57a9b58faa3 WHIRLPOOL 1e82ddf04c42e64e1bc19519ab07265ebd0f56ac2f32bb83ab4710e61cdfaa392ee5103c2a9a23c3a8f71be93cb713b2a4356b07ba03e1e5957f0b7e3b517dff
29 DIST libsoundio-1.1.0.tar.gz 118672 SHA256 ba0b21397cb3e29dc8f51ed213ae27625f05398c01aefcfbaa860fab42a84281 SHA512 3de35fa83395faea5e6f4478cd82d49615e470b09847fb076647664238e232ff3d4597ca7a07ce06012ae084f11e5d3903b42d8f4afe64c27b1a4b92d2081b5f WHIRLPOOL 4a43e0cb3118502693d95fad90182a3797930ce7797b8fcf411dcd24a053b62df7cc899bf196c4ffb765b9879982b4d08dd17b6b140244e5ce731f0f2fc274c6
30
31 diff --git a/media-libs/libsoundio/files/libsoundio-1.0.0_clang.patch b/media-libs/libsoundio/files/libsoundio-1.0.0_clang.patch
32 deleted file mode 100644
33 index 9c417c0b63b..00000000000
34 --- a/media-libs/libsoundio/files/libsoundio-1.0.0_clang.patch
35 +++ /dev/null
36 @@ -1,32 +0,0 @@
37 -From 85c219067579e299f9faddd2c24836cf96cc245b Mon Sep 17 00:00:00 2001
38 -From: Andrew Kelley <superjoe30@×××××.com>
39 -Date: Thu, 3 Sep 2015 14:05:19 -0700
40 -Subject: [PATCH] build: fix build on linux with clang
41 -
42 -closes #8
43 ----
44 - src/alsa.cpp | 4 ++--
45 - 1 file changed, 2 insertions(+), 2 deletions(-)
46 -
47 -diff --git a/src/alsa.cpp b/src/alsa.cpp
48 -index 18ef1de..8e779a6 100644
49 ---- a/src/alsa.cpp
50 -+++ b/src/alsa.cpp
51 -@@ -1016,7 +1016,7 @@ static int instream_wait_for_poll(SoundIoInStreamPrivate *is) {
52 - }
53 - }
54 -
55 --void outstream_thread_run(void *arg) {
56 -+static void outstream_thread_run(void *arg) {
57 - SoundIoOutStreamPrivate *os = (SoundIoOutStreamPrivate *) arg;
58 - SoundIoOutStream *outstream = &os->pub;
59 - SoundIoOutStreamAlsa *osa = &os->backend_data.alsa;
60 -@@ -1367,7 +1367,7 @@ static int outstream_start_alsa(SoundIoPrivate *si, SoundIoOutStreamPrivate *os)
61 - return 0;
62 - }
63 -
64 --int outstream_begin_write_alsa(SoundIoPrivate *si, SoundIoOutStreamPrivate *os,
65 -+static int outstream_begin_write_alsa(SoundIoPrivate *si, SoundIoOutStreamPrivate *os,
66 - struct SoundIoChannelArea **out_areas, int *frame_count)
67 - {
68 - *out_areas = nullptr;
69
70 diff --git a/media-libs/libsoundio/files/libsoundio-1.0.0_examples_tests.patch b/media-libs/libsoundio/files/libsoundio-1.0.0_examples_tests.patch
71 deleted file mode 100644
72 index aa322c1c789..00000000000
73 --- a/media-libs/libsoundio/files/libsoundio-1.0.0_examples_tests.patch
74 +++ /dev/null
75 @@ -1,182 +0,0 @@
76 -From a3dd080fda5a3581de0602b5887cda87dca2a915 Mon Sep 17 00:00:00 2001
77 -From: hasufell <hasufell@××××××××.de>
78 -Date: Sat, 5 Sep 2015 14:07:22 +0200
79 -Subject: [PATCH] Make building examples and tests optional
80 -
81 ----
82 - CMakeLists.txt | 136 +++++++++++++++++++++++++++++++--------------------------
83 - 1 file changed, 74 insertions(+), 62 deletions(-)
84 -
85 -diff --git a/CMakeLists.txt b/CMakeLists.txt
86 -index c109af4..7fa8247 100644
87 ---- a/CMakeLists.txt
88 -+++ b/CMakeLists.txt
89 -@@ -25,6 +25,8 @@ set(LIBSOUNDIO_VERSION "${LIBSOUNDIO_VERSION_MAJOR}.${LIBSOUNDIO_VERSION_MINOR}.
90 - message("Configuring libsoundio version ${LIBSOUNDIO_VERSION}")
91 -
92 - option(BUILD_STATIC_LIBS "Build static libraries" ON)
93 -+option(BUILD_EXAMPLE_PROGRAMS "Build example programs" ON)
94 -+option(BUILD_TESTS "Build tests" ON)
95 - option(ENABLE_JACK "Enable JACK backend" ON)
96 - option(ENABLE_PULSEAUDIO "Enable PulseAudio backend" ON)
97 - option(ENABLE_ALSA "Enable ALSA backend" ON)
98 -@@ -254,80 +256,88 @@ install(FILES
99 -
100 - # Example Programs
101 -
102 --add_executable(sio_sine example/sio_sine.c)
103 --set_target_properties(sio_sine PROPERTIES
104 -- LINKER_LANGUAGE C
105 -- COMPILE_FLAGS ${EXAMPLE_CFLAGS})
106 --target_link_libraries(sio_sine libsoundio_shared)
107 --install(TARGETS sio_sine DESTINATION ${CMAKE_INSTALL_BINDIR})
108 -+if(BUILD_EXAMPLE_PROGRAMS)
109 -+ add_executable(sio_sine example/sio_sine.c)
110 -+ set_target_properties(sio_sine PROPERTIES
111 -+ LINKER_LANGUAGE C
112 -+ COMPILE_FLAGS ${EXAMPLE_CFLAGS})
113 -+ target_link_libraries(sio_sine libsoundio_shared)
114 -+ install(TARGETS sio_sine DESTINATION ${CMAKE_INSTALL_BINDIR})
115 -
116 --add_executable(sio_list_devices example/sio_list_devices.c)
117 --set_target_properties(sio_list_devices PROPERTIES
118 -- LINKER_LANGUAGE C
119 -- COMPILE_FLAGS ${EXAMPLE_CFLAGS})
120 --target_link_libraries(sio_list_devices libsoundio_shared)
121 --install(TARGETS sio_list_devices DESTINATION ${CMAKE_INSTALL_BINDIR})
122 -+ add_executable(sio_list_devices example/sio_list_devices.c)
123 -+ set_target_properties(sio_list_devices PROPERTIES
124 -+ LINKER_LANGUAGE C
125 -+ COMPILE_FLAGS ${EXAMPLE_CFLAGS})
126 -+ target_link_libraries(sio_list_devices libsoundio_shared)
127 -+ install(TARGETS sio_list_devices DESTINATION ${CMAKE_INSTALL_BINDIR})
128 -
129 --add_executable(sio_microphone example/sio_microphone.c)
130 --set_target_properties(sio_microphone PROPERTIES
131 -- LINKER_LANGUAGE C
132 -- COMPILE_FLAGS ${EXAMPLE_CFLAGS})
133 --target_link_libraries(sio_microphone libsoundio_shared)
134 --install(TARGETS sio_microphone DESTINATION ${CMAKE_INSTALL_BINDIR})
135 -+ add_executable(sio_microphone example/sio_microphone.c)
136 -+ set_target_properties(sio_microphone PROPERTIES
137 -+ LINKER_LANGUAGE C
138 -+ COMPILE_FLAGS ${EXAMPLE_CFLAGS})
139 -+ target_link_libraries(sio_microphone libsoundio_shared)
140 -+ install(TARGETS sio_microphone DESTINATION ${CMAKE_INSTALL_BINDIR})
141 -
142 --add_executable(sio_record example/sio_record.c)
143 --set_target_properties(sio_record PROPERTIES
144 -- LINKER_LANGUAGE C
145 -- COMPILE_FLAGS ${EXAMPLE_CFLAGS})
146 --target_link_libraries(sio_record libsoundio_shared)
147 --install(TARGETS sio_record DESTINATION ${CMAKE_INSTALL_BINDIR})
148 -+ add_executable(sio_record example/sio_record.c)
149 -+ set_target_properties(sio_record PROPERTIES
150 -+ LINKER_LANGUAGE C
151 -+ COMPILE_FLAGS ${EXAMPLE_CFLAGS})
152 -+ target_link_libraries(sio_record libsoundio_shared)
153 -+ install(TARGETS sio_record DESTINATION ${CMAKE_INSTALL_BINDIR})
154 -+endif()
155 -
156 -+if(BUILD_TESTS)
157 -+ include_directories(
158 -+ "${CMAKE_SOURCE_DIR}/test"
159 -+ )
160 -
161 --add_executable(unit_tests "${CMAKE_SOURCE_DIR}/test/unit_tests.cpp" ${LIBSOUNDIO_SOURCES})
162 --target_link_libraries(unit_tests LINK_PUBLIC ${LIBSOUNDIO_LIBS})
163 --set_target_properties(unit_tests PROPERTIES
164 -- LINKER_LANGUAGE C
165 -- COMPILE_FLAGS ${TEST_CFLAGS}
166 -- LINK_FLAGS ${TEST_LDFLAGS}
167 --)
168 -+ add_executable(unit_tests "${CMAKE_SOURCE_DIR}/test/unit_tests.cpp" ${LIBSOUNDIO_SOURCES})
169 -+ target_link_libraries(unit_tests LINK_PUBLIC ${LIBSOUNDIO_LIBS})
170 -+ set_target_properties(unit_tests PROPERTIES
171 -+ LINKER_LANGUAGE C
172 -+ COMPILE_FLAGS ${TEST_CFLAGS}
173 -+ LINK_FLAGS ${TEST_LDFLAGS}
174 -+ )
175 -
176 --add_executable(latency "${CMAKE_SOURCE_DIR}/test/latency.cpp" ${LIBSOUNDIO_SOURCES})
177 --target_link_libraries(latency LINK_PUBLIC ${LIBSOUNDIO_LIBS})
178 --set_target_properties(latency PROPERTIES
179 -- LINKER_LANGUAGE C
180 -- COMPILE_FLAGS ${LIB_CFLAGS}
181 --)
182 -+ add_executable(latency "${CMAKE_SOURCE_DIR}/test/latency.cpp" ${LIBSOUNDIO_SOURCES})
183 -+ target_link_libraries(latency LINK_PUBLIC ${LIBSOUNDIO_LIBS})
184 -+ set_target_properties(latency PROPERTIES
185 -+ LINKER_LANGUAGE C
186 -+ COMPILE_FLAGS ${LIB_CFLAGS}
187 -+ )
188 -
189 --add_executable(underflow test/underflow.c)
190 --set_target_properties(underflow PROPERTIES
191 -- LINKER_LANGUAGE C
192 -- COMPILE_FLAGS ${EXAMPLE_CFLAGS})
193 --target_link_libraries(underflow libsoundio_shared)
194 -+ add_executable(underflow test/underflow.c)
195 -+ set_target_properties(underflow PROPERTIES
196 -+ LINKER_LANGUAGE C
197 -+ COMPILE_FLAGS ${EXAMPLE_CFLAGS})
198 -+ target_link_libraries(underflow libsoundio_shared)
199 -
200 --add_executable(backend_disconnect_recover test/backend_disconnect_recover.c)
201 --set_target_properties(backend_disconnect_recover PROPERTIES
202 -- LINKER_LANGUAGE C
203 -- COMPILE_FLAGS ${EXAMPLE_CFLAGS})
204 --target_link_libraries(backend_disconnect_recover libsoundio_shared)
205 -+ add_executable(backend_disconnect_recover test/backend_disconnect_recover.c)
206 -+ set_target_properties(backend_disconnect_recover PROPERTIES
207 -+ LINKER_LANGUAGE C
208 -+ COMPILE_FLAGS ${EXAMPLE_CFLAGS})
209 -+ target_link_libraries(backend_disconnect_recover libsoundio_shared)
210 -
211 --add_executable(overflow test/overflow.c)
212 --set_target_properties(overflow PROPERTIES
213 -- LINKER_LANGUAGE C
214 -- COMPILE_FLAGS ${EXAMPLE_CFLAGS})
215 --target_link_libraries(overflow libsoundio_shared)
216 -+ add_executable(overflow test/overflow.c)
217 -+ set_target_properties(overflow PROPERTIES
218 -+ LINKER_LANGUAGE C
219 -+ COMPILE_FLAGS ${EXAMPLE_CFLAGS})
220 -+ target_link_libraries(overflow libsoundio_shared)
221 -
222 -
223 -
224 --add_custom_target(coverage
225 -- DEPENDS unit_tests
226 -- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
227 -- COMMAND lcov --directory . --zerocounters --rc lcov_branch_coverage=1
228 -- COMMAND ./unit_tests
229 -- COMMAND lcov --directory . --capture --output-file coverage.info --rc lcov_branch_coverage=1
230 -- COMMAND lcov --remove coverage.info '/usr/*' --output-file coverage.info.cleaned --rc lcov_branch_coverage=1
231 -- COMMAND genhtml -o coverage coverage.info.cleaned --rc lcov_branch_coverage=1
232 -- COMMAND rm coverage.info coverage.info.cleaned
233 --)
234 -+ add_custom_target(coverage
235 -+ DEPENDS unit_tests
236 -+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
237 -+ COMMAND lcov --directory . --zerocounters --rc lcov_branch_coverage=1
238 -+ COMMAND ./unit_tests
239 -+ COMMAND lcov --directory . --capture --output-file coverage.info --rc lcov_branch_coverage=1
240 -+ COMMAND lcov --remove coverage.info '/usr/*' --output-file coverage.info.cleaned --rc lcov_branch_coverage=1
241 -+ COMMAND genhtml -o coverage coverage.info.cleaned --rc lcov_branch_coverage=1
242 -+ COMMAND rm coverage.info coverage.info.cleaned
243 -+ )
244 -+endif()
245 -+
246 -
247 - add_custom_target(doc
248 - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
249 -@@ -342,6 +352,8 @@ message("\n"
250 - "* Install Directory : ${CMAKE_INSTALL_PREFIX}\n"
251 - "* Build Type : ${CMAKE_BUILD_TYPE}\n"
252 - "* Build static libs : ${BUILD_STATIC_LIBS}\n"
253 -+ "* Build examples : ${BUILD_EXAMPLE_PROGRAMS}\n"
254 -+ "* Build tests : ${BUILD_TESTS}\n"
255 - )
256 -
257 - message(
258
259 diff --git a/media-libs/libsoundio/files/libsoundio-1.0.0_static-libs.patch b/media-libs/libsoundio/files/libsoundio-1.0.0_static-libs.patch
260 deleted file mode 100644
261 index 4b0875c5a62..00000000000
262 --- a/media-libs/libsoundio/files/libsoundio-1.0.0_static-libs.patch
263 +++ /dev/null
264 @@ -1,52 +0,0 @@
265 -From 0a20aec2a14dcfbcbc741d2002985073094634d8 Mon Sep 17 00:00:00 2001
266 -From: Diogo Pereira <sir.suriv@×××××.com>
267 -Date: Fri, 4 Sep 2015 17:21:54 +0100
268 -Subject: [PATCH] Make building static libs optional
269 -
270 ----
271 - CMakeLists.txt | 18 +++++++++++-------
272 - 1 file changed, 11 insertions(+), 7 deletions(-)
273 -
274 -diff --git a/CMakeLists.txt b/CMakeLists.txt
275 -index 0e66834..c109af4 100644
276 ---- a/CMakeLists.txt
277 -+++ b/CMakeLists.txt
278 -@@ -24,6 +24,7 @@ set(LIBSOUNDIO_VERSION_PATCH 0)
279 - set(LIBSOUNDIO_VERSION "${LIBSOUNDIO_VERSION_MAJOR}.${LIBSOUNDIO_VERSION_MINOR}.${LIBSOUNDIO_VERSION_PATCH}")
280 - message("Configuring libsoundio version ${LIBSOUNDIO_VERSION}")
281 -
282 -+option(BUILD_STATIC_LIBS "Build static libraries" ON)
283 - option(ENABLE_JACK "Enable JACK backend" ON)
284 - option(ENABLE_PULSEAUDIO "Enable PulseAudio backend" ON)
285 - option(ENABLE_ALSA "Enable ALSA backend" ON)
286 -@@ -237,13 +238,15 @@ target_link_libraries(libsoundio_shared LINK_PUBLIC ${LIBSOUNDIO_LIBS})
287 - install(TARGETS libsoundio_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
288 -
289 -
290 --add_library(libsoundio_static STATIC ${LIBSOUNDIO_SOURCES})
291 --set_target_properties(libsoundio_static PROPERTIES
292 -- OUTPUT_NAME soundio
293 -- COMPILE_FLAGS ${LIB_CFLAGS}
294 -- LINKER_LANGUAGE C
295 --)
296 --install(TARGETS libsoundio_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
297 -+if(BUILD_STATIC_LIBS)
298 -+ add_library(libsoundio_static STATIC ${LIBSOUNDIO_SOURCES})
299 -+ set_target_properties(libsoundio_static PROPERTIES
300 -+ OUTPUT_NAME soundio
301 -+ COMPILE_FLAGS ${LIB_CFLAGS}
302 -+ LINKER_LANGUAGE C
303 -+ )
304 -+ install(TARGETS libsoundio_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
305 -+endif()
306 -
307 - install(FILES
308 - ${LIBSOUNDIO_HEADERS}
309 -@@ -338,6 +341,7 @@ message("\n"
310 - "--------------------\n"
311 - "* Install Directory : ${CMAKE_INSTALL_PREFIX}\n"
312 - "* Build Type : ${CMAKE_BUILD_TYPE}\n"
313 -+ "* Build static libs : ${BUILD_STATIC_LIBS}\n"
314 - )
315 -
316 - message(
317
318 diff --git a/media-libs/libsoundio/libsoundio-1.0.0.ebuild b/media-libs/libsoundio/libsoundio-1.0.0.ebuild
319 deleted file mode 100644
320 index 040311337b5..00000000000
321 --- a/media-libs/libsoundio/libsoundio-1.0.0.ebuild
322 +++ /dev/null
323 @@ -1,40 +0,0 @@
324 -# Copyright 1999-2015 Gentoo Foundation
325 -# Distributed under the terms of the GNU General Public License v2
326 -
327 -EAPI=5
328 -
329 -inherit cmake-multilib
330 -
331 -DESCRIPTION="C99 library providing cross-platform audio input and output."
332 -HOMEPAGE="http://libsound.io/"
333 -SRC_URI="http://libsound.io/release/${P}.tar.gz"
334 -
335 -LICENSE="MIT"
336 -SLOT="0/1"
337 -KEYWORDS="~amd64"
338 -IUSE="alsa coreaudio examples pulseaudio static-libs"
339 -
340 -DEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
341 - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )"
342 -RDEPEND="${DEPEND}"
343 -
344 -# All of these patches have been merged upstream (#8, #16, #20)
345 -PATCHES=( "${FILESDIR}/${P}_clang.patch"
346 - "${FILESDIR}/${P}_static-libs.patch"
347 - "${FILESDIR}/${P}_examples_tests.patch" )
348 -
349 -# ENABLE_JACK does not support the current version of jack1
350 -# See https://github.com/andrewrk/libsoundio/issues/11
351 -multilib_src_configure() {
352 - local mycmakeargs=(
353 - $(cmake-utils_use_enable alsa ALSA)
354 - $(cmake-utils_use_enable coreaudio COREAUDIO)
355 - -DENABLE_JACK=OFF
356 - $(cmake-utils_use_enable pulseaudio PULSEAUDIO)
357 - -DENABLE_WASAPI=OFF
358 - $(cmake-utils_use static-libs BUILD_STATIC_LIBS)
359 - -DBUILD_EXAMPLE_PROGRAMS=$(multilib_native_usex examples "ON" "OFF")
360 - -DBUILD_TESTS=OFF
361 - )
362 - cmake-utils_src_configure
363 -}
364
365 diff --git a/media-libs/libsoundio/libsoundio-1.0.2.ebuild b/media-libs/libsoundio/libsoundio-1.0.2.ebuild
366 deleted file mode 100644
367 index 00674f8faad..00000000000
368 --- a/media-libs/libsoundio/libsoundio-1.0.2.ebuild
369 +++ /dev/null
370 @@ -1,35 +0,0 @@
371 -# Copyright 1999-2015 Gentoo Foundation
372 -# Distributed under the terms of the GNU General Public License v2
373 -
374 -EAPI=5
375 -
376 -inherit cmake-multilib
377 -
378 -DESCRIPTION="C99 library providing cross-platform audio input and output"
379 -HOMEPAGE="http://libsound.io/"
380 -SRC_URI="http://libsound.io/release/${P}.tar.gz"
381 -
382 -LICENSE="MIT"
383 -SLOT="0/1"
384 -KEYWORDS="~amd64"
385 -IUSE="alsa coreaudio examples pulseaudio static-libs"
386 -
387 -DEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
388 - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )"
389 -RDEPEND="${DEPEND}"
390 -
391 -# ENABLE_JACK does not support the current version of jack1
392 -# See https://github.com/andrewrk/libsoundio/issues/11
393 -multilib_src_configure() {
394 - local mycmakeargs=(
395 - -DENABLE_ALSA=$(usex alsa)
396 - -DENABLE_COREAUDIO=$(usex coreaudio)
397 - -DENABLE_JACK=no
398 - -DENABLE_PULSEAUDIO=$(usex pulseaudio)
399 - -DENABLE_WASAPI=no
400 - -DBUILD_STATIC_LIBS=$(usex static-libs)
401 - -DBUILD_EXAMPLE_PROGRAMS=$(multilib_native_usex examples)
402 - -DBUILD_TESTS=no
403 - )
404 - cmake-utils_src_configure
405 -}
406
407 diff --git a/media-libs/libsoundio/libsoundio-1.1.0.ebuild b/media-libs/libsoundio/libsoundio-1.1.0.ebuild
408 deleted file mode 100644
409 index 5e0e5b0f93c..00000000000
410 --- a/media-libs/libsoundio/libsoundio-1.1.0.ebuild
411 +++ /dev/null
412 @@ -1,39 +0,0 @@
413 -# Copyright 1999-2017 Gentoo Foundation
414 -# Distributed under the terms of the GNU General Public License v2
415 -
416 -EAPI=6
417 -
418 -inherit cmake-multilib
419 -
420 -DESCRIPTION="C library for cross-platform real-time audio input and output"
421 -HOMEPAGE="http://libsound.io/"
422 -SRC_URI="http://libsound.io/release/${P}.tar.gz"
423 -
424 -LICENSE="MIT"
425 -SLOT="0/1"
426 -KEYWORDS="~amd64 ~x86"
427 -IUSE="alsa coreaudio examples jack pulseaudio static-libs"
428 -
429 -# Build fails with <=media-sound/jack2-1.9.10
430 -# See https://github.com/andrewrk/libsoundio/issues/7
431 -# Only jack1 is supported for the time being
432 -DEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
433 - jack? ( >=media-sound/jack-audio-connection-kit-0.125.0[${MULTILIB_USEDEP}] )
434 - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )"
435 -RDEPEND="${DEPEND}"
436 -
437 -PATCHES=( "${FILESDIR}/${P}_missing_include.patch" )
438 -
439 -multilib_src_configure() {
440 - local mycmakeargs=(
441 - -DENABLE_ALSA=$(usex alsa)
442 - -DENABLE_COREAUDIO=$(usex coreaudio)
443 - -DENABLE_JACK=$(usex jack)
444 - -DENABLE_PULSEAUDIO=$(usex pulseaudio)
445 - -DENABLE_WASAPI=no
446 - -DBUILD_STATIC_LIBS=$(usex static-libs)
447 - -DBUILD_EXAMPLE_PROGRAMS=$(multilib_native_usex examples)
448 - -DBUILD_TESTS=no
449 - )
450 - cmake-utils_src_configure
451 -}