diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-03-21 20:34:52 +0100 |
|---|---|---|
| committer |   Michael Palimaka <kensington@gentoo.org> | 2016-03-23 04:19:09 +1100 |
| commit | e01edfa45b5427226370df9cb9f93cae87acf52a (patch) | |
| tree | e354e1e3123300c36fce9d76e9a5126b08bb4c36 /kde-apps | |
| parent | dev-python/naima: numpy depedency increasede to 1.10 (diff) | |
| download | gentoo-e01edfa45b5427226370df9cb9f93cae87acf52a.tar.gz gentoo-e01edfa45b5427226370df9cb9f93cae87acf52a.tar.bz2 gentoo-e01edfa45b5427226370df9cb9f93cae87acf52a.zip | |
kde-apps/libkcompactdisc: Fix USE=-alsa, missing deps, bug 577904
Package-Manager: portage-2.2.27
Diffstat (limited to 'kde-apps')
3 files changed, 106 insertions, 0 deletions
diff --git a/kde-apps/libkcompactdisc/files/libkcompactdisc-15.12.3-alsa.patch b/kde-apps/libkcompactdisc/files/libkcompactdisc-15.12.3-alsa.patch new file mode 100644 index 000000000000..cf05bb83c2e5 --- /dev/null +++ b/kde-apps/libkcompactdisc/files/libkcompactdisc-15.12.3-alsa.patch @@ -0,0 +1,54 @@ +commit 8d78f61538826337a040b4d954daa17d15d4044e +Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Mon Mar 21 19:50:27 2016 +0100 + + Fix build with missing ALSA + + REVIEW: 127451 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e2bf812..3964b6d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,7 +14,10 @@ if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + endif() + + find_package(Alsa) +-alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) ++if(ALSA_FOUND) ++ alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) ++ add_definitions(-DHAVE_LIBASOUND2) ++endif(ALSA_FOUND) + + include_directories(${KDE4_INCLUDES}) + include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +diff --git a/wmlib/audio/audio.c b/wmlib/audio/audio.c +index 7101d23..09e817f 100644 +--- a/wmlib/audio/audio.c ++++ b/wmlib/audio/audio.c +@@ -19,7 +19,9 @@ + #include "audio.h" + #include "../include/wm_config.h" + ++#ifdef HAVE_LIBASOUND2 + #include <config-alsa.h> ++#endif + #include <string.h> + + struct audio_oops *setup_phonon(const char *dev, const char *ctl); +diff --git a/wmlib/audio/audio_alsa.c b/wmlib/audio/audio_alsa.c +index de5dbe1..7c14671 100644 +--- a/wmlib/audio/audio_alsa.c ++++ b/wmlib/audio/audio_alsa.c +@@ -26,9 +26,9 @@ + #include "../include/wm_struct.h" + #include "../include/wm_config.h" + +-#include <config-alsa.h> ++#ifdef HAVE_LIBASOUND2 + +-#if defined(HAVE_LIBASOUND2) ++#include <config-alsa.h> + + #ifdef HAVE_ALSA_ASOUNDLIB_H + # include <alsa/asoundlib.h> diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-15.08.3-r1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-15.08.3-r1.ebuild new file mode 100644 index 000000000000..fe08bfa1e01b --- /dev/null +++ b/kde-apps/libkcompactdisc/libkcompactdisc-15.08.3-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit kde4-base + +DESCRIPTION="KDE library for playing & ripping CDs" +KEYWORDS="~amd64 ~x86" +IUSE="alsa debug" + +DEPEND=" + media-libs/phonon[qt4] + alsa? ( media-libs/alsa-lib ) +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-15.12.3-alsa.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package alsa Alsa) + ) + kde4-base_src_configure +} diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-15.12.3-r1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-15.12.3-r1.ebuild new file mode 100644 index 000000000000..c815344b519d --- /dev/null +++ b/kde-apps/libkcompactdisc/libkcompactdisc-15.12.3-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit kde4-base + +DESCRIPTION="KDE library for playing & ripping CDs" +KEYWORDS=" ~amd64 ~x86" +IUSE="alsa debug" + +DEPEND=" + media-libs/phonon[qt4] + alsa? ( media-libs/alsa-lib ) +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-15.12.3-alsa.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package alsa Alsa) + ) + kde4-base_src_configure +} |