commit: aa48b7a92d8251e1e9c3a2f6e03b3bbbba6b7ae2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 19 10:59:56 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jul 19 11:15:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa48b7a9
media-sound/soundkonverter: Fix build with ECM >=5.72.0 Closes: https://bugs.gentoo.org/733200 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../soundkonverter-3.0.1-kf-5.72-findtaglib.patch | 300 +++++++++++++++++++++ .../soundkonverter/soundkonverter-3.0.1-r2.ebuild | 1 + 2 files changed, 301 insertions(+) diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch new file mode 100644 index 00000000000..8439e7a83df --- /dev/null +++ b/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch @@ -0,0 +1,300 @@ +From 3760bccb3aa1e15bd5ec67bc977717c55a95bc6e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Sun, 19 Jul 2020 12:06:28 +0200 +Subject: [PATCH 1/2] FindTaglib.cmake: Update local copy with ECM 5.72.0 + version and adapt cmake + +ECM 5.72.0 ships an incompatible FindTaglib.cmake module. + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + CMakeLists.txt | 6 +- + cmake/modules/FindTaglib.cmake | 209 +++++++++++------------------ + 2 files changed, 85 insertions(+), 130 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 521d0da..c9d9bee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,7 +40,7 @@ find_package(Phonon4Qt5 REQUIRED) + find_package(Cdparanoia REQUIRED) + + set(TAGLIB_MIN_VERSION "1.10") +-find_package(Taglib REQUIRED) ++find_package(Taglib ${TAGLIB_MIN_VERSION} REQUIRED) + + + # plugins +@@ -48,7 +48,7 @@ add_subdirectory(plugins) + + + # include directories +-include_directories(${TAGLIB_INCLUDES} ${CDPARANOIA_INCLUDE_DIR}) ++include_directories(${CDPARANOIA_INCLUDE_DIR}) + + + # translation +@@ -120,7 +120,7 @@ set(soundkonverter_SRCS + ) + + add_executable(soundkonverter ${soundkonverter_SRCS}) +-target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 ${TAGLIB_LIBRARIES} ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore) ++target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 Taglib::Taglib ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore) + + install(TARGETS soundkonverter DESTINATION ${BIN_INSTALL_DIR}) + +diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake +index 5a985f9..40c5ca2 100644 +--- a/cmake/modules/FindTaglib.cmake ++++ b/cmake/modules/FindTaglib.cmake +@@ -1,135 +1,90 @@ +-# - Try to find the Taglib library +-# Once done this will define ++#.rst: ++# FindTaglib ++# ---------- + # +-# TAGLIB_FOUND - system has the taglib library +-# TAGLIB_CFLAGS - the taglib cflags +-# TAGLIB_LIBRARIES - The libraries needed to use taglib +- +-# Copyright (c) 2006, Laurent Montel, <[email protected]> ++# Try to find the Taglib library. + # +-# Redistribution and use is allowed according to the terms of the BSD license. +-# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +- +-if(NOT TAGLIB_MIN_VERSION) +- set(TAGLIB_MIN_VERSION "1.6") +-endif(NOT TAGLIB_MIN_VERSION) +- +-if(NOT WIN32) +- find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS +- ${BIN_INSTALL_DIR} +- ) +-endif(NOT WIN32) +- +-#reset vars +-set(TAGLIB_LIBRARIES) +-set(TAGLIB_CFLAGS) +- +-# if taglib-config has been found +-if(TAGLIBCONFIG_EXECUTABLE) +- +- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) +- +- if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") +- message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") +- set(TAGLIB_FOUND FALSE) +- else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") +- +- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) +- +- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) ++# This will define the following variables: ++# ++# ``Taglib_FOUND`` ++# True if the system has the taglib library of at least the minimum ++# version specified by the version parameter to find_package() ++# ``Taglib_INCLUDE_DIRS`` ++# The taglib include dirs for use with target_include_directories ++# ``Taglib_LIBRARIES`` ++# The taglib libraries for use with target_link_libraries() ++# ``Taglib_VERSION`` ++# The version of taglib that was found ++# ++# If ``Taglib_FOUND is TRUE, it will also define the following imported ++# target: ++# ++# ``Taglib::Taglib`` ++# The Taglib library ++# ++# Since 5.72.0 ++# ++# SPDX-FileCopyrightText: 2006 Laurent Montel <[email protected]> ++# SPDX-FileCopyrightText: 2019 Heiko Becker <[email protected]> ++# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <[email protected]> ++# SPDX-License-Identifier: BSD-3-Clause + +- if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) +- set(TAGLIB_FOUND TRUE) +- endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) +- string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") +- endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") +- mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) ++find_package(PkgConfig QUIET) + +-else(TAGLIBCONFIG_EXECUTABLE) ++pkg_search_module(PC_TAGLIB QUIET taglib) + +- find_path(TAGLIB_INCLUDES +- NAMES +- tag.h ++find_path(Taglib_INCLUDE_DIRS ++ NAMES tag.h + PATH_SUFFIXES taglib +- PATHS +- ${KDE4_INCLUDE_DIR} +- ${INCLUDE_INSTALL_DIR} +- ) +- +- IF(NOT WIN32) +- # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX +- +- FIND_LIBRARY(TAGLIB_LIBRARIES tag PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}) +- +- ELSE(NOT WIN32) +- +- # 1. get all possible libnames +- SET(args PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}) +- SET(newargs "") +- SET(libnames_release "") +- SET(libnames_debug "") +- +- LIST(LENGTH args listCount) +- +- # just one name +- LIST(APPEND libnames_release "tag") +- LIST(APPEND libnames_debug "tagd") +- +- SET(newargs ${args}) +- +- # search the release lib +- FIND_LIBRARY(TAGLIB_LIBRARIES_RELEASE +- NAMES ${libnames_release} +- ${newargs} +- ) +- +- # search the debug lib +- FIND_LIBRARY(TAGLIB_LIBRARIES_DEBUG +- NAMES ${libnames_debug} +- ${newargs} +- ) +- +- IF(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG) +- +- # both libs found +- SET(TAGLIB_LIBRARIES optimized ${TAGLIB_LIBRARIES_RELEASE} +- debug ${TAGLIB_LIBRARIES_DEBUG}) +- +- ELSE(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG) +- +- IF(TAGLIB_LIBRARIES_RELEASE) +- +- # only release found +- SET(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_RELEASE}) +- +- ELSE(TAGLIB_LIBRARIES_RELEASE) +- +- # only debug (or nothing) found +- SET(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_DEBUG}) +- +- ENDIF(TAGLIB_LIBRARIES_RELEASE) +- +- ENDIF(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG) +- +- MARK_AS_ADVANCED(TAGLIB_LIBRARIES_RELEASE) +- MARK_AS_ADVANCED(TAGLIB_LIBRARIES_DEBUG) +- +- ENDIF(NOT WIN32) +- +- INCLUDE(FindPackageMessage) +- INCLUDE(FindPackageHandleStandardArgs) +- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES) +- +-endif(TAGLIBCONFIG_EXECUTABLE) +- ++ HINTS ${PC_TAGLIB_INCLUDEDIR} ++) ++ ++find_library(Taglib_LIBRARIES ++ NAMES tag ++ HINTS ${PC_TAGLIB_LIBDIR} ++) ++ ++set(Taglib_VERSION ${PC_TAGLIB_VERSION}) ++ ++if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION) ++ if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h") ++ file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H) ++ ++ string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H}) ++ string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H}) ++ string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H}) ++ ++ string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}") ++ string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}") ++ string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}") ++ ++ set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}") ++ endif() ++endif() ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(Taglib ++ FOUND_VAR ++ Taglib_FOUND ++ REQUIRED_VARS ++ Taglib_LIBRARIES ++ Taglib_INCLUDE_DIRS ++ VERSION_VAR ++ Taglib_VERSION ++) ++ ++if (Taglib_FOUND AND NOT TARGET Taglib::Taglib) ++ add_library(Taglib::Taglib UNKNOWN IMPORTED) ++ set_target_properties(Taglib::Taglib PROPERTIES ++ IMPORTED_LOCATION "${Taglib_LIBRARIES}" ++ INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}" ++ ) ++endif() + +-if(TAGLIB_FOUND) +- if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) +- message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}") +- endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) +-else(TAGLIB_FOUND) +- if(Taglib_FIND_REQUIRED) +- message(FATAL_ERROR "Could not find Taglib") +- endif(Taglib_FIND_REQUIRED) +-endif(TAGLIB_FOUND) ++mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS) + ++include(FeatureSummary) ++set_package_properties(Taglib PROPERTIES ++ URL "https://taglib.org/"; ++ DESCRIPTION "A library for reading and editing the meta-data of audio formats" ++) +-- +2.27.0 + + +From ff943d9cb19aa46b555826a053642ac2e84d392d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Sun, 19 Jul 2020 13:02:33 +0200 +Subject: [PATCH 2/2] Use local cmake modules first + +Although FindTaglib.cmake was fixed in previous commit, local cmake modules +should not be overriden by system versions anyway. + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c9d9bee..7a92898 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,7 +19,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations") + + # kde libs + find_package(ECM REQUIRED NO_MODULE) +-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) ++set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH}) + + add_definitions(-DSOUNDKONVERTER_KF5_BUILD) + +-- +2.27.0 + diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild index 5730b13cb60..98e141c9a71 100644 --- a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild +++ b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild @@ -46,6 +46,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}/${P}-deps.patch" # pending upstream + "${FILESDIR}/${P}-kf-5.72-findtaglib.patch" # pending upstream "${FILESDIR}/${P}-fix-add-dirs.patch" "${FILESDIR}/${P}-metainfodir.patch" )
