commit: 34dc087ab7687bdca24b3c3b0e9fdeefa98c4f79 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Feb 13 02:51:44 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Feb 13 02:51:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34dc087a
media-libs/stk: fix build Signed-off-by: Sam James <sam <AT> gentoo.org> .../stk/files/stk-4.5.1/060_all_linux_pulse.patch | 36 ++++++++++++++++++++++ media-libs/stk/stk-4.6.2.ebuild | 6 ++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/media-libs/stk/files/stk-4.5.1/060_all_linux_pulse.patch b/media-libs/stk/files/stk-4.5.1/060_all_linux_pulse.patch new file mode 100644 index 000000000000..2e4ae36abd7e --- /dev/null +++ b/media-libs/stk/files/stk-4.5.1/060_all_linux_pulse.patch @@ -0,0 +1,36 @@ +https://github.com/thestk/stk/commit/b3439132339fc0fc649b8e305d7872e60b9520bf + +From b3439132339fc0fc649b8e305d7872e60b9520bf Mon Sep 17 00:00:00 2001 +From: Tristan Matthews <[email protected]> +Date: Wed, 9 Feb 2022 17:20:26 -0500 +Subject: [PATCH] configure: fix build for --with-pulse + +--- a/configure.ac ++++ b/configure.ac +@@ -162,6 +162,14 @@ api="$api -D__UNIX_JACK__" + AC_MSG_RESULT(using ALSA) + AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))]) + ++ # Look for PulseAudio flag ++ AC_ARG_WITH(pulse, [ --with-pulse = choose PulseAudio support (linux only)]) ++ AS_IF([test "x$with_pulse" == "xyes"], [ ++ api="$api -D__LINUX_PULSE__" ++ AC_MSG_RESULT(using PulseAudio) ++ AC_CHECK_LIB(pulse, pa_proplist_gets, , AC_MSG_ERROR(PulseAudio support requires the libpulse library!)) ++ AC_CHECK_LIB(pulse-simple, pa_simple_new, , AC_MSG_ERROR(PulseAudio support requires the libpulse-simple library!))]) ++ + # Look for OSS flag + AC_ARG_WITH(oss, [ --with-oss = choose OSS API support (unixes only)]) + AS_IF([test "x$with_oss" == "xyes"], [ +--- a/include/Stk.h ++++ b/include/Stk.h +@@ -622,7 +622,7 @@ const StkFloat ONE_OVER_128 = 0.0078125; + #if defined(__WINDOWS_DS__) || defined(__WINDOWS_ASIO__) || defined(__WINDOWS_MM__) + #define __OS_WINDOWS__ + #define __STK_REALTIME__ +-#elif defined(__LINUX_OSS__) || defined(__LINUX_ALSA__) || defined(__UNIX_JACK__) ++#elif defined(__LINUX_OSS__) || defined(__LINUX_ALSA__) || defined(__UNIX_JACK__) || defined(__LINUX_PULSE__) + #define __OS_LINUX__ + #define __STK_REALTIME__ + #elif defined(__IRIX_AL__) + diff --git a/media-libs/stk/stk-4.6.2.ebuild b/media-libs/stk/stk-4.6.2.ebuild index 52b7e39ead65..1a28ba8457df 100644 --- a/media-libs/stk/stk-4.6.2.ebuild +++ b/media-libs/stk/stk-4.6.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="Synthesis ToolKit in C++" HOMEPAGE="https://ccrma.stanford.edu/software/stk/"; @@ -37,6 +37,8 @@ src_prepare() { } src_configure() { + use kernel_linux && append-flags -D__OS_LINUX__ + #breaks with --disable-foo...uses as --enable-foo local myconf if use debug; then
