mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-08 06:48:28 +00:00
Code Issues Releases Activity

Unbreak after r436971 with the PULSEAUDIO option on.

Browse Source 
Use CMake to look for libcanberra so its entire path is passed to the linker
instead of just "-lcanberra", which currently fails because we do not pass
-L${LOCALBASE} to the linker.

Reported by:	Michael Butler <imb@protected-networks.net>
This commit is contained in:
Raphael Kubo da Costa 2017-03-28 18:03:23 +00:00
parent eb78632890
commit 0d6c77015d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=437146
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
x11/kde4-runtime/files/patch-phonon_kcm_CMakeLists.txt Normal file
View File

@ -0,0 +1,19 @@
Detect libcanberra with CMake, not pkg-config.
The latter does not produce full paths for libraries, leading to build failures
if -L/path/to is not passed to the linker as well.
--- phonon/kcm/CMakeLists.txt
+++ phonon/kcm/CMakeLists.txt
@@ -11,7 +11,11 @@ set_package_properties(GLIB2 PROPERTIES DESCRIPTION "Low-level core library for
TYPE OPTIONAL
)
-pkg_check_modules(CANBERRA libcanberra)
+find_path(CANBERRA_INCLUDE_DIRS canberra.h)
+find_library(CANBERRA_LIBRARIES canberra)
+if (CANBERRA_INCLUDE_DIRS AND CANBERRA_LIBRARIES)
+ set(CANBERRA_FOUND TRUE)
+endif ()
add_feature_info ("Audio setup GUI" CANBERRA_FOUND
"libcanberra is needed for audio setup GUI
* http://0pointer.de/lennart/projects/libcanberra"