Author: blekot Date: Wed Feb 8 20:31:04 2012 GMT Module: packages Tag: HEAD ---- Log message: - new, taken from repository - fix linking problems
---- Files affected: packages/phonon-backend-vlc: phonon-backend-vlc-FindPhonon.cmake.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/phonon-backend-vlc/phonon-backend-vlc-FindPhonon.cmake.patch diff -u /dev/null packages/phonon-backend-vlc/phonon-backend-vlc-FindPhonon.cmake.patch:1.1 --- /dev/null Wed Feb 8 21:31:04 2012 +++ packages/phonon-backend-vlc/phonon-backend-vlc-FindPhonon.cmake.patch Wed Feb 8 21:30:59 2012 @@ -0,0 +1,65 @@ +--- ./cmake/modules/FindPhonon.cmake.old 2012-02-08 21:25:21.000000000 +0100 ++++ ./cmake/modules/FindPhonon.cmake 2012-02-08 21:25:36.000000000 +0100 +@@ -1,53 +1,18 @@ + # Find Phonon + + # Copyright (c) 2010, Harald Sitter <[email protected]> ++# Copyright (c) 2011, Alexander Neundorf <[email protected]> + # + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +-if (NOT PHONON_BUILDSYSTEM_DIR) +- find_program(PC_EXECUTABLE NAMES pkg-config +- PATH_SUFFIXES bin +- HINTS +- ${CMAKE_INSTALL_PREFIX} +- ONLY_CMAKE_FIND_ROOT_PATH +- ) +- +- if (NOT PC_EXECUTABLE) +- if (Phonon_FIND_REQUIRED) +- message(FATAL_ERROR "ERROR: Could not find pkg-config [required to find Phonon].") +- endif (Phonon_FIND_REQUIRED) +- endif (NOT PC_EXECUTABLE) +- +- if (PC_EXECUTABLE) +- execute_process(COMMAND "${PC_EXECUTABLE}" --variable=buildsystemdir phonon +- OUTPUT_VARIABLE _data_DIR +- ERROR_QUIET +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- file(TO_CMAKE_PATH "${_data_DIR}" _data_DIR) +- find_path(PHONON_BUILDSYSTEM_DIR FindPhononInternal.cmake HINTS ${_data_DIR}) +- endif (PC_EXECUTABLE) +-endif (NOT PHONON_BUILDSYSTEM_DIR) +- +-if (PHONON_BUILDSYSTEM_DIR) ++find_package(Phonon NO_MODULE) ++if(PHONON_FOUND) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PHONON_BUILDSYSTEM_DIR}) ++endif() ++ ++include(FindPackageHandleStandardArgs) ++ ++find_package_handle_standard_args(Phonon DEFAULT_MSG Phonon_DIR ) ++ + +- if (Phonon_FIND_REQUIRED) +- set(_req REQUIRED) +- endif (Phonon_FIND_REQUIRED) +- if (PHONON_FIND_QUIETLY) +- set(_quiet QUIET) +- endif (PHONON_FIND_QUIETLY) +- +- find_package(PhononInternal ${_req} ${_quiet}) +-else (PHONON_BUILDSYSTEM_DIR) +- if (_data_DIR) +- if (Phonon_FIND_REQUIRED) +- message(FATAL_ERROR "ERROR: FindPhonon.cmake not found in ${_data_DIR}") +- endif (Phonon_FIND_REQUIRED) +- else (_data_DIR) +- if (Phonon_FIND_REQUIRED) +- message(FATAL_ERROR "ERROR: Either pkg-config can not find its phonon config, or you are not using a recent enough Phonon version.") +- endif (Phonon_FIND_REQUIRED) +- endif (_data_DIR) +-endif (PHONON_BUILDSYSTEM_DIR) ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
