From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/
Date: Sat, 23 May 2015 15:57:14 +0000 (UTC) [thread overview]
Message-ID: <1432396623.1e8df41937b7b788290c29c6a59b94f809e6e93f.kensington@gentoo> (raw)
commit: 1e8df41937b7b788290c29c6a59b94f809e6e93f
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat May 16 20:47:24 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat May 23 15:57:03 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1e8df419
[kde-apps/kmix] Fix build with USE=-alsa
Package-Manager: portage-2.2.19
.../kmix/files/kmix-5.9999-alsa-optional.patch | 26 ++++++++++++++++++++++
kde-apps/kmix/kmix-5.9999.ebuild | 2 ++
2 files changed, 28 insertions(+)
diff --git a/kde-apps/kmix/files/kmix-5.9999-alsa-optional.patch b/kde-apps/kmix/files/kmix-5.9999-alsa-optional.patch
new file mode 100644
index 0000000..92c258c
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-5.9999-alsa-optional.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt 2015-05-16 22:31:57.555962909 +0200
++++ b/CMakeLists.txt 2015-05-16 22:19:13.393985683 +0200
+@@ -79,7 +79,9 @@
+ endif()
+
+ find_package(Alsa)
+-alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
++if(Alsa_FOUND)
++ alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
++endif()
+
+ add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} )
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=67100)
+--- a/backends/kmix-backends.cpp 2015-05-16 22:31:36.650963532 +0200
++++ b/backends/kmix-backends.cpp 2015-05-16 22:22:57.761978996 +0200
+@@ -23,7 +23,10 @@
+ /* This code is being #include'd from mixer.cpp */
+
+ #include <config.h>
++
++#if defined(HAVE_LIBASOUND2)
+ #include <config-alsa.h>
++#endif
+
+ #include "mixer_backend.h"
+ #include "core/mixer.h"
diff --git a/kde-apps/kmix/kmix-5.9999.ebuild b/kde-apps/kmix/kmix-5.9999.ebuild
index 15f3eaa..4158e29 100644
--- a/kde-apps/kmix/kmix-5.9999.ebuild
+++ b/kde-apps/kmix/kmix-5.9999.ebuild
@@ -36,6 +36,8 @@ RDEPEND="${DEPEND}
!kde-base/kmix:4
"
+PATCHES=( "${FILESDIR}/${PN}-5.9999-alsa-optional.patch" )
+
src_configure() {
local mycmakeargs=(
-DKMIX_KF5_BUILD=ON
next reply other threads:[~2015-05-23 15:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-23 15:57 Michael Palimaka [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-08-25 16:24 [gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/ Michael Palimaka
2020-04-09 21:38 Andreas Sturmlechner
2023-06-17 10:11 Andreas Sturmlechner
2025-02-26 20:44 Andreas Sturmlechner
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=1432396623.1e8df41937b7b788290c29c6a59b94f809e6e93f.kensington@gentoo \
--to=kensington@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