From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7CF67138CCF for ; Sat, 23 May 2015 15:57:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5ACC8E0A9A; Sat, 23 May 2015 15:57:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F41D2E0A9B for ; Sat, 23 May 2015 15:57:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A1BC340D56 for ; Sat, 23 May 2015 15:57:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9AF9A9F9 for ; Sat, 23 May 2015 15:57:14 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1432396623.1e8df41937b7b788290c29c6a59b94f809e6e93f.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kmix/, kde-apps/kmix/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kmix/files/kmix-5.9999-alsa-optional.patch kde-apps/kmix/kmix-5.9999.ebuild X-VCS-Directories: kde-apps/kmix/files/ kde-apps/kmix/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 1e8df41937b7b788290c29c6a59b94f809e6e93f X-VCS-Branch: master Date: Sat, 23 May 2015 15:57:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3289934d-e0e7-4a39-bb27-8ae013b95acb X-Archives-Hash: b765fc2e2e78cd0a98827018c1f96a12 commit: 1e8df41937b7b788290c29c6a59b94f809e6e93f Author: Andreas Sturmlechner gmail com> AuthorDate: Sat May 16 20:47:24 2015 +0000 Commit: Michael Palimaka gentoo 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 ++ ++#if defined(HAVE_LIBASOUND2) + #include ++#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