| 1 |
commit: 033dbcfea987a71075f03504be723e4b9826a60d |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 16 19:34:01 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 16 19:34:19 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=033dbcfe |
| 7 |
|
| 8 |
kde-apps/libkcompactdisc: Fix USE=-alsa, add missing RDEPEND |
| 9 |
|
| 10 |
Gentoo-bug: 615776 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 13 |
|
| 14 |
.../files/libkcompactdisc-17.04.0-no-alsa.patch | 21 +++++++++++++++++++++ |
| 15 |
...4.0.ebuild => libkcompactdisc-17.04.0-r1.ebuild} | 6 ++++-- |
| 16 |
.../libkcompactdisc-17.04.49.9999.ebuild | 4 ++-- |
| 17 |
.../libkcompactdisc/libkcompactdisc-9999.ebuild | 4 ++-- |
| 18 |
4 files changed, 29 insertions(+), 6 deletions(-) |
| 19 |
|
| 20 |
diff --git a/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch b/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch |
| 21 |
new file mode 100644 |
| 22 |
index 0000000000..e2bb2c11d3 |
| 23 |
--- /dev/null |
| 24 |
+++ b/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch |
| 25 |
@@ -0,0 +1,21 @@ |
| 26 |
+commit 082b1637c6720a0955855a92a037cd033568ddf1 |
| 27 |
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 28 |
+Date: Sun Apr 16 21:23:58 2017 +0200 |
| 29 |
+ |
| 30 |
+ Fix build without ALSA again |
| 31 |
+ |
| 32 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 33 |
+index b25c7d7..c32f1f7 100644 |
| 34 |
+--- a/src/CMakeLists.txt |
| 35 |
++++ b/src/CMakeLists.txt |
| 36 |
+@@ -13,7 +13,9 @@ set_package_properties(ALSA PROPERTIES |
| 37 |
+ TYPE OPTIONAL |
| 38 |
+ PURPOSE "Play back audo CDs via ALSA") |
| 39 |
+ set(HAVE_ALSA ${ALSA_FOUND}) |
| 40 |
+-configure_file(config-alsa.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) |
| 41 |
++if(ALSA_FOUND) |
| 42 |
++ configure_file(config-alsa.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) |
| 43 |
++endif(ALSA_FOUND) |
| 44 |
+ |
| 45 |
+ set(wmlib_audio_SRCS |
| 46 |
+ wmlib/audio/audio.c |
| 47 |
|
| 48 |
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0-r1.ebuild |
| 49 |
similarity index 80% |
| 50 |
rename from kde-apps/libkcompactdisc/libkcompactdisc-17.04.0.ebuild |
| 51 |
rename to kde-apps/libkcompactdisc/libkcompactdisc-17.04.0-r1.ebuild |
| 52 |
index 638a382f7d..d6863f4e17 100644 |
| 53 |
--- a/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0.ebuild |
| 54 |
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0-r1.ebuild |
| 55 |
@@ -13,17 +13,19 @@ IUSE="alsa" |
| 56 |
|
| 57 |
DEPEND=" |
| 58 |
$(add_frameworks_dep kcoreaddons) |
| 59 |
- $(add_frameworks_dep kdelibs4support) |
| 60 |
$(add_frameworks_dep ki18n) |
| 61 |
$(add_frameworks_dep solid) |
| 62 |
$(add_qt_dep qtdbus) |
| 63 |
media-libs/phonon[qt5] |
| 64 |
+ alsa? ( media-libs/alsa-lib ) |
| 65 |
" |
| 66 |
RDEPEND="${DEPEND}" |
| 67 |
|
| 68 |
+PATCHES=( "${FILESDIR}/${P}-no-alsa.patch" ) |
| 69 |
+ |
| 70 |
src_configure() { |
| 71 |
local mycmakeargs=( |
| 72 |
- $(cmake-utils_use_find_package alsa Alsa) |
| 73 |
+ $(cmake-utils_use_find_package alsa ALSA) |
| 74 |
) |
| 75 |
kde5_src_configure |
| 76 |
} |
| 77 |
|
| 78 |
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-17.04.49.9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-17.04.49.9999.ebuild |
| 79 |
index cc67f12f0d..13a932d522 100644 |
| 80 |
--- a/kde-apps/libkcompactdisc/libkcompactdisc-17.04.49.9999.ebuild |
| 81 |
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-17.04.49.9999.ebuild |
| 82 |
@@ -13,17 +13,17 @@ IUSE="alsa" |
| 83 |
|
| 84 |
DEPEND=" |
| 85 |
$(add_frameworks_dep kcoreaddons) |
| 86 |
- $(add_frameworks_dep kdelibs4support) |
| 87 |
$(add_frameworks_dep ki18n) |
| 88 |
$(add_frameworks_dep solid) |
| 89 |
$(add_qt_dep qtdbus) |
| 90 |
media-libs/phonon[qt5] |
| 91 |
+ alsa? ( media-libs/alsa-lib ) |
| 92 |
" |
| 93 |
RDEPEND="${DEPEND}" |
| 94 |
|
| 95 |
src_configure() { |
| 96 |
local mycmakeargs=( |
| 97 |
- $(cmake-utils_use_find_package alsa Alsa) |
| 98 |
+ $(cmake-utils_use_find_package alsa ALSA) |
| 99 |
) |
| 100 |
kde5_src_configure |
| 101 |
} |
| 102 |
|
| 103 |
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild |
| 104 |
index cc67f12f0d..13a932d522 100644 |
| 105 |
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild |
| 106 |
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild |
| 107 |
@@ -13,17 +13,17 @@ IUSE="alsa" |
| 108 |
|
| 109 |
DEPEND=" |
| 110 |
$(add_frameworks_dep kcoreaddons) |
| 111 |
- $(add_frameworks_dep kdelibs4support) |
| 112 |
$(add_frameworks_dep ki18n) |
| 113 |
$(add_frameworks_dep solid) |
| 114 |
$(add_qt_dep qtdbus) |
| 115 |
media-libs/phonon[qt5] |
| 116 |
+ alsa? ( media-libs/alsa-lib ) |
| 117 |
" |
| 118 |
RDEPEND="${DEPEND}" |
| 119 |
|
| 120 |
src_configure() { |
| 121 |
local mycmakeargs=( |
| 122 |
- $(cmake-utils_use_find_package alsa Alsa) |
| 123 |
+ $(cmake-utils_use_find_package alsa ALSA) |
| 124 |
) |
| 125 |
kde5_src_configure |
| 126 |
} |
Archives