| 1 |
commit: 9a8b5e7ac652dba8749de23792f2256d96091755 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 16 20:18:22 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 16 20:18:22 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9a8b5e7a |
| 7 |
|
| 8 |
kde-apps/libkcompactdisc: Fix ALSA linking as well |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
.../files/libkcompactdisc-17.04.0-no-alsa.patch | 23 ++++++++++++++++++---- |
| 13 |
1 file changed, 19 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
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 |
| 16 |
index e2bb2c11d3..6bebf88e7c 100644 |
| 17 |
--- a/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch |
| 18 |
+++ b/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch |
| 19 |
@@ -1,21 +1,36 @@ |
| 20 |
-commit 082b1637c6720a0955855a92a037cd033568ddf1 |
| 21 |
+commit bb427b44150e23e618209334d826d389b903ac8a |
| 22 |
Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 23 |
Date: Sun Apr 16 21:23:58 2017 +0200 |
| 24 |
|
| 25 |
Fix build without ALSA again |
| 26 |
+ |
| 27 |
+ Signed-off-by: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 28 |
|
| 29 |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 30 |
-index b25c7d7..c32f1f7 100644 |
| 31 |
+index b25c7d7..c89e9dd 100644 |
| 32 |
--- a/src/CMakeLists.txt |
| 33 |
+++ b/src/CMakeLists.txt |
| 34 |
-@@ -13,7 +13,9 @@ set_package_properties(ALSA PROPERTIES |
| 35 |
+@@ -12,8 +12,10 @@ set_package_properties(ALSA PROPERTIES |
| 36 |
+ DESCRIPTION "ALSA provides audio and MIDI functionality" |
| 37 |
TYPE OPTIONAL |
| 38 |
PURPOSE "Play back audo CDs via ALSA") |
| 39 |
- set(HAVE_ALSA ${ALSA_FOUND}) |
| 40 |
+-set(HAVE_ALSA ${ALSA_FOUND}) |
| 41 |
-configure_file(config-alsa.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) |
| 42 |
+if(ALSA_FOUND) |
| 43 |
++ add_definitions(-DHAVE_ALSA) |
| 44 |
+ configure_file(config-alsa.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) |
| 45 |
+endif(ALSA_FOUND) |
| 46 |
|
| 47 |
set(wmlib_audio_SRCS |
| 48 |
wmlib/audio/audio.c |
| 49 |
+@@ -79,8 +81,8 @@ target_link_libraries(KF5CompactDisc |
| 50 |
+ Phonon::phonon4qt5 |
| 51 |
+ ) |
| 52 |
+ |
| 53 |
+-if (HAVE_ALSA) |
| 54 |
+- target_link_libraries(KF5CompactDisc ${ALSA_LIBRARY}) |
| 55 |
++if (ALSA_FOUND) |
| 56 |
++ target_link_libraries(KF5CompactDisc ${ALSA_LIBRARIES}) |
| 57 |
+ endif () |
| 58 |
+ |
| 59 |
+ if (USE_WMLIB) |
Archives