Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/zynaddsubfx/files/, media-sound/zynaddsubfx/
Date: Fri, 01 Jan 2021 23:27:18
Message-Id: 1609543619.a6410c7da3b8639705122551d2e657bae4ba72f8.asturm@gentoo
1 commit: a6410c7da3b8639705122551d2e657bae4ba72f8
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 1 23:26:41 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 1 23:26:59 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6410c7d
7
8 media-sound/zynaddsubfx: Fix cmake with IUSE=jack
9
10 Closes: https://bugs.gentoo.org/761823
11 Package-Manager: Portage-3.0.12, Repoman-3.0.2
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 .../zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch | 15 +++++++++++++++
15 media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild | 7 +++++--
16 2 files changed, 20 insertions(+), 2 deletions(-)
17
18 diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch
19 new file mode 100644
20 index 00000000000..8fbcf9aca56
21 --- /dev/null
22 +++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch
23 @@ -0,0 +1,15 @@
24 +Fix missing CMake include
25 +
26 +Authored by:  Simon van der Veldt 2020-09-30
27 +Committed by:  Mark McCurry 2020-10-03
28 +
29 +--- a/src/Nio/CMakeLists.txt
30 ++++ b/src/Nio/CMakeLists.txt
31 +@@ -21,6 +21,7 @@
32 + add_definitions(-DIN_DEFAULT="${DefaultInput}")
33 +
34 + if(JackEnable)
35 ++ include(CheckIncludeFiles)
36 + include_directories(${JACK_INCLUDE_DIR})
37 + list(APPEND zynaddsubfx_nio_SRCS JackEngine.cpp JackMultiEngine.cpp)
38 + list(APPEND zynaddsubfx_nio_lib ${JACK_LIBRARIES})
39
40 diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
41 index 72b00573167..36d58edcadf 100644
42 --- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
43 +++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
44 @@ -1,4 +1,4 @@
45 -# Copyright 1999-2019 Gentoo Authors
46 +# Copyright 1999-2021 Gentoo Authors
47 # Distributed under the terms of the GNU General Public License v2
48
49 EAPI=7
50 @@ -38,7 +38,10 @@ DEPEND="
51 "
52 RDEPEND="${DEPEND}"
53
54 -PATCHES=( "${FILESDIR}"/${P}-docs.patch )
55 +PATCHES=(
56 + "${FILESDIR}"/${P}-docs.patch
57 + "${FILESDIR}"/${P}-cmake.patch # bug 761823
58 +)
59
60 DOCS=( ChangeLog HISTORY.txt README.adoc )