diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-11-24 13:58:32 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-11-24 14:04:23 +0100 |
| commit | 4d0edf6808391ca6ae5c8df9efbeeec0bfd48ba7 (patch) | |
| tree | 7ec2dd0974b961f243dcda83b34f351869884574 /media-libs/chromaprint/files | |
| parent | dev-python/wheel: Remove redundant versions (diff) | |
| download | gentoo-4d0edf6808391ca6ae5c8df9efbeeec0bfd48ba7.tar.gz gentoo-4d0edf6808391ca6ae5c8df9efbeeec0bfd48ba7.tar.bz2 gentoo-4d0edf6808391ca6ae5c8df9efbeeec0bfd48ba7.zip | |
media-libs/chromaprint: EAPI-7 bump, fix DEPENDs and DESCRIPTION
CMake improvements.
Closes: https://bugs.gentoo.org/625300
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-libs/chromaprint/files')
| -rw-r--r-- | media-libs/chromaprint/files/chromaprint-1.4.3-cmake.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/media-libs/chromaprint/files/chromaprint-1.4.3-cmake.patch b/media-libs/chromaprint/files/chromaprint-1.4.3-cmake.patch new file mode 100644 index 000000000000..60fe548cf29c --- /dev/null +++ b/media-libs/chromaprint/files/chromaprint-1.4.3-cmake.patch @@ -0,0 +1,58 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3991219..f9e172b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,21 +1,11 @@ +-cmake_minimum_required(VERSION 2.8.12) +- +-if(POLICY CMP0042) +- cmake_policy(SET CMP0042 NEW) +-endif() +- +-if(POLICY CMP0048) +- cmake_policy(SET CMP0048 OLD) +-endif() +- +-project(chromaprint C CXX) ++cmake_minimum_required(VERSION 3.3) + + set(chromaprint_VERSION_MAJOR 1) + set(chromaprint_VERSION_MINOR 4) + set(chromaprint_VERSION_PATCH 3) + set(chromaprint_VERSION "${chromaprint_VERSION_MAJOR}.${chromaprint_VERSION_MINOR}.${chromaprint_VERSION_PATCH}") + +-set(PROJECT_VERSION "${chromaprint_VERSION}") ++project(chromaprint LANGUAGES C CXX VERSION "${chromaprint_VERSION}") + + set(chromaprint_SOVERSION 1) + +@@ -31,14 +21,14 @@ include(CheckCXXCompilerFlag) + + find_package(Threads) + +-check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11) +-if(COMPILER_SUPPORTS_CXX11) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +-endif() ++option(BUILD_SHARED_LIBS "Build shared libraries" ON) + +-if(CMAKE_COMPILER_IS_GNUCXX AND BUILD_SHARED_LIBS) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") ++set(CMAKE_CXX_STANDARD 11) ++ ++if(BUILD_SHARED_LIBS) ++ set(CMAKE_C_VISIBILITY_PRESET hidden) ++ set(CMAKE_CXX_VISIBILITY_PRESET hidden) ++ set(CMAKE_VISIBILITY_INLINES_HIDDEN ON) + endif() + + if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_BUILD_TYPE STREQUAL "Debug") +@@ -70,7 +60,6 @@ if(APPLE) + set(FRAMEWORK_INSTALL_DIR "/Library/Frameworks" CACHE STRING "Directory to install frameworks to") + endif() + +-option(BUILD_SHARED_LIBS "Build shared libraries" ON) + option(BUILD_TOOLS "Build command line tools" OFF) + option(BUILD_TESTS "Build test suite" OFF) + |