From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CF421139694 for ; Sun, 16 Apr 2017 20:19:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0575E0CB0; Sun, 16 Apr 2017 20:19:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 997A7E0CB0 for ; Sun, 16 Apr 2017 20:19:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D308341301 for ; Sun, 16 Apr 2017 20:19:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C552173C6 for ; Sun, 16 Apr 2017 20:19:45 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1492373902.9a8b5e7ac652dba8749de23792f2256d96091755.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch X-VCS-Directories: kde-apps/libkcompactdisc/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9a8b5e7ac652dba8749de23792f2256d96091755 X-VCS-Branch: master Date: Sun, 16 Apr 2017 20:19:45 +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: 562209ff-ee1a-4775-bd08-7a7e67579431 X-Archives-Hash: 5394f15950bb31a8d3fd8ea23917847a commit: 9a8b5e7ac652dba8749de23792f2256d96091755 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 16 20:18:22 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 16 20:18:22 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9a8b5e7a kde-apps/libkcompactdisc: Fix ALSA linking as well Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../files/libkcompactdisc-17.04.0-no-alsa.patch | 23 ++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) 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 index e2bb2c11d3..6bebf88e7c 100644 --- a/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch +++ b/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch @@ -1,21 +1,36 @@ -commit 082b1637c6720a0955855a92a037cd033568ddf1 +commit bb427b44150e23e618209334d826d389b903ac8a Author: Andreas Sturmlechner Date: Sun Apr 16 21:23:58 2017 +0200 Fix build without ALSA again + + Signed-off-by: Andreas Sturmlechner diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index b25c7d7..c32f1f7 100644 +index b25c7d7..c89e9dd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -13,7 +13,9 @@ set_package_properties(ALSA PROPERTIES +@@ -12,8 +12,10 @@ set_package_properties(ALSA PROPERTIES + DESCRIPTION "ALSA provides audio and MIDI functionality" TYPE OPTIONAL PURPOSE "Play back audo CDs via ALSA") - set(HAVE_ALSA ${ALSA_FOUND}) +-set(HAVE_ALSA ${ALSA_FOUND}) -configure_file(config-alsa.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) +if(ALSA_FOUND) ++ add_definitions(-DHAVE_ALSA) + configure_file(config-alsa.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) +endif(ALSA_FOUND) set(wmlib_audio_SRCS wmlib/audio/audio.c +@@ -79,8 +81,8 @@ target_link_libraries(KF5CompactDisc + Phonon::phonon4qt5 + ) + +-if (HAVE_ALSA) +- target_link_libraries(KF5CompactDisc ${ALSA_LIBRARY}) ++if (ALSA_FOUND) ++ target_link_libraries(KF5CompactDisc ${ALSA_LIBRARIES}) + endif () + + if (USE_WMLIB)