public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/zynaddsubfx/files/, media-sound/zynaddsubfx/
Date: Fri,  1 Jan 2021 23:27:12 +0000 (UTC)	[thread overview]
Message-ID: <1609543619.a6410c7da3b8639705122551d2e657bae4ba72f8.asturm@gentoo> (raw)

commit:     a6410c7da3b8639705122551d2e657bae4ba72f8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 23:26:41 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 23:26:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6410c7d

media-sound/zynaddsubfx: Fix cmake with IUSE=jack

Closes: https://bugs.gentoo.org/761823
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch       | 15 +++++++++++++++
 media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild          |  7 +++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch
new file mode 100644
index 00000000000..8fbcf9aca56
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch
@@ -0,0 +1,15 @@
+Fix missing CMake include
+
+Authored by:  Simon van der Veldt 2020-09-30
+Committed by:  Mark McCurry 2020-10-03
+
+--- a/src/Nio/CMakeLists.txt
++++ b/src/Nio/CMakeLists.txt
+@@ -21,6 +21,7 @@
+ add_definitions(-DIN_DEFAULT="${DefaultInput}")
+ 
+ if(JackEnable)
++    include(CheckIncludeFiles)
+     include_directories(${JACK_INCLUDE_DIR})
+     list(APPEND zynaddsubfx_nio_SRCS JackEngine.cpp JackMultiEngine.cpp)
+     list(APPEND zynaddsubfx_nio_lib ${JACK_LIBRARIES})

diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
index 72b00573167..36d58edcadf 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-docs.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-docs.patch
+	"${FILESDIR}"/${P}-cmake.patch # bug 761823
+)
 
 DOCS=( ChangeLog HISTORY.txt README.adoc )
 


             reply	other threads:[~2021-01-01 23:27 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-01 23:27 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-12-19 22:39 [gentoo-commits] repo/gentoo:master commit in: media-sound/zynaddsubfx/files/, media-sound/zynaddsubfx/ Miroslav Šulc
2023-05-21  7:42 Miroslav Šulc
2022-01-27  8:43 Miroslav Šulc
2019-06-20 10:37 Andreas Sturmlechner
2019-02-09 23:57 Andreas Sturmlechner
2018-01-07 18:16 Alexis Ballier
2017-02-12 16:07 Johannes Huber
2015-11-17  8:41 Alexis Ballier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1609543619.a6410c7da3b8639705122551d2e657bae4ba72f8.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox