* [gentoo-commits] repo/gentoo:master commit in: media-sound/soundkonverter/, media-sound/soundkonverter/files/
@ 2016-01-19 11:58 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2016-01-19 11:58 UTC (permalink / raw
To: gentoo-commits
commit: ea1b5b6f6ad191d09323d7af38660a6e803e2c58
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 11:58:09 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 11:58:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea1b5b6f
media-sound/soundkonverter: add patch to solve build failure with >=media-libs/taglib-1.10
Gentoo-bug: 572202
Package-Manager: portage-2.2.26
.../files/soundkonverter-2.1.2-taglib-110.patch | 26 ++++++++++++++++++++++
.../soundkonverter/soundkonverter-2.1.2.ebuild | 4 +++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/media-sound/soundkonverter/files/soundkonverter-2.1.2-taglib-110.patch b/media-sound/soundkonverter/files/soundkonverter-2.1.2-taglib-110.patch
new file mode 100644
index 0000000..314db93
--- /dev/null
+++ b/media-sound/soundkonverter/files/soundkonverter-2.1.2-taglib-110.patch
@@ -0,0 +1,26 @@
+Fix configure with taglib-1.10.
+
+--- a/cmake/modules/FindTaglib.cmake
++++ b/cmake/modules/FindTaglib.cmake
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_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 STRLESS "${TAGLIB_MIN_VERSION}")
++ else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
diff --git a/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild b/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild
index 38f08ef..578ff4a 100644
--- a/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
sys-devel/gettext
"
+PATCHES=( "${FILESDIR}/${PN}-2.1.2-taglib-110.patch" )
+
pkg_postinst() {
kde4-base_pkg_postinst
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/soundkonverter/, media-sound/soundkonverter/files/
@ 2016-08-05 16:51 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2016-08-05 16:51 UTC (permalink / raw
To: gentoo-commits
commit: 8b1c61a7eef808f23ebbf2cce4809883cd9e7030
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 5 16:47:50 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Aug 5 16:51:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1c61a7
media-sound/soundkonverter: remove old
Package-Manager: portage-2.3.0
media-sound/soundkonverter/Manifest | 2 --
.../files/soundkonverter-2.1.2-taglib-110.patch | 26 ---------------
.../soundkonverter/soundkonverter-2.1.2.ebuild | 38 ----------------------
.../soundkonverter/soundkonverter-2.2.0.ebuild | 36 --------------------
4 files changed, 102 deletions(-)
diff --git a/media-sound/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest
index 339a146..807b2f5 100644
--- a/media-sound/soundkonverter/Manifest
+++ b/media-sound/soundkonverter/Manifest
@@ -1,3 +1 @@
-DIST 29024-soundkonverter-2.1.2.tar.gz 756039 SHA256 b7b984cfcebb31c5e16fb3e04fc811b58453ef5454ea9e567e8510fcdd498957 SHA512 fdbb782eea4702d1b6bfe0135ed8ca482bd43422bc4c825b8b1afe3226faf315b618b4392223d5b3169e831c8e867ee64a11f22e22c53df7cb6b92dc5f1dda23 WHIRLPOOL 7f19644aff536d1715935b58f3c5bab27f7b967aadf7503ed26d168ba1fe1a92a76ba4bec28709c23053a46f32b593034e4941c2ec0e054e0eb8a79ad6097da2
-DIST 29024-soundkonverter-2.2.0.tar.gz 781668 SHA256 c3b1bb7d37fe14902364819959c7883fc379e9f4cdb34aada62dbaa83238a980 SHA512 d6e9b4062162adc560cd09b626c4403c83e1cbee940fffb1b7fac0714f8e3b20b4e5be554e4cec576704f2135e62253d25a23098143a1d63c438ad13c7301685 WHIRLPOOL bc503b57d850c7f08302c2f27bee09600018ba7e9907b59cf6f59478d0ec5a2d09746d7d7b34109834aa681f476e33fa0cba28dfc23c05fa6aca26fa78ebdd30
DIST 29024-soundkonverter-2.2.2.tar.gz 858128 SHA256 327de45ea21780d77c53835289e6b6dba196706d76df755fe5dd338761e97663 SHA512 d0539405feb229b6e844b814ae22705f4213acebac688fb6286c0d76c3d4cbea6dfe297448b148c6502be7eb1925fee2a1274ccf8df8d1c7ecb93e36fd7a6f6f WHIRLPOOL 8d4127a274041506c6436dcda128cad86ae0345470debe120c5989ca954b5c3dd4a3133959104ee7154e832830c689a00c598db9e00a1488579b513066dcdec3
diff --git a/media-sound/soundkonverter/files/soundkonverter-2.1.2-taglib-110.patch b/media-sound/soundkonverter/files/soundkonverter-2.1.2-taglib-110.patch
deleted file mode 100644
index 314db93..0000000
--- a/media-sound/soundkonverter/files/soundkonverter-2.1.2-taglib-110.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix configure with taglib-1.10.
-
---- a/cmake/modules/FindTaglib.cmake
-+++ b/cmake/modules/FindTaglib.cmake
-@@ -29,10 +29,10 @@
-
- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
-
-- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_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 STRLESS "${TAGLIB_MIN_VERSION}")
-+ else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
-
- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
-
-@@ -42,7 +42,7 @@
- set(TAGLIB_FOUND TRUE)
- endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
- string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
-- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-+ endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
- mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
-
- else(TAGLIBCONFIG_EXECUTABLE)
diff --git a/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild b/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild
deleted file mode 100644
index 578ff4a..0000000
--- a/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="ca cs de es et fr hu it pt pt_BR ro ru sl sv zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="Frontend to various audio converters"
-HOMEPAGE="http://www.kde-apps.org/content/show.php/soundKonverter?content=29024"
-SRC_URI="http://kde-apps.org/CONTENT/content-files/29024-${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="
- $(add_kdeapps_dep libkcddb)
- media-libs/phonon[qt4]
- media-libs/taglib
- media-sound/cdparanoia
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
-"
-
-PATCHES=( "${FILESDIR}/${PN}-2.1.2-taglib-110.patch" )
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- elog "soundKonverter optionally supports many different audio formats."
- elog "You will need to install the appropriate encoding packages for the"
- elog "formats you require. For a full listing, consult the README file"
- elog "in /usr/share/doc/${PF}"
-}
diff --git a/media-sound/soundkonverter/soundkonverter-2.2.0.ebuild b/media-sound/soundkonverter/soundkonverter-2.2.0.ebuild
deleted file mode 100644
index 45a3a02..0000000
--- a/media-sound/soundkonverter/soundkonverter-2.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_LINGUAS="ca cs de es et fr hu it pt pt_BR ro ru sl sv zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="Frontend to various audio converters"
-HOMEPAGE="http://www.kde-apps.org/content/show.php/soundKonverter?content=29024"
-SRC_URI="http://kde-apps.org/CONTENT/content-files/29024-${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
- $(add_kdeapps_dep libkcddb)
- media-libs/phonon[qt4]
- media-libs/taglib
- media-sound/cdparanoia
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
-"
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- elog "soundKonverter optionally supports many different audio formats."
- elog "You will need to install the appropriate encoding packages for the"
- elog "formats you require. For a full listing, consult the README file"
- elog "in /usr/share/doc/${PF}"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/soundkonverter/, media-sound/soundkonverter/files/
@ 2020-07-19 11:17 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-07-19 11:17 UTC (permalink / raw
To: gentoo-commits
commit: a41a4f9b1c2b7ebc9dd87ab149af3cf7fcf3e35f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 09:57:10 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 11:14:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a41a4f9b
media-sound/soundkonverter: Update deps.patch
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/soundkonverter-3.0.0-deps.patch | 11 --------
.../files/soundkonverter-3.0.1-deps.patch | 30 ++++++++++++++++++++++
.../soundkonverter/soundkonverter-3.0.1-r2.ebuild | 2 +-
3 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch
deleted file mode 100644
index aa5f68af939..00000000000
--- a/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt 2017-09-12 23:39:15.648029711 +0200
-+++ b/CMakeLists.txt 2017-09-12 23:44:47.944469934 +0200
-@@ -30,7 +30,7 @@
- include(ECMInstallIcons)
- include(FeatureSummary)
-
--find_package(Qt5 REQUIRED COMPONENTS Network Core Widgets)
-+find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml)
- find_package(KF5 REQUIRED COMPONENTS I18n XmlGui KIO Solid Config ConfigWidgets WidgetsAddons KDELibs4Support)
- find_package(KF5Cddb)
- find_package(Phonon4Qt5 REQUIRED)
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch
new file mode 100644
index 00000000000..b7009d33125
--- /dev/null
+++ b/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch
@@ -0,0 +1,30 @@
+From 0eda1978640dda400ca02172abeeacbb725f7b7c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 19 Jul 2020 11:43:30 +0200
+Subject: [PATCH] Consolidate find_package calls inside CMakeLists.txt
+
+- Drop unused Qt5Network
+- Search for Qt5Xml once instead of in most plugins
+- KF5WidgetsAddons and KF5KIO were already being searched for
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 521d0da..7e578f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,7 +30,7 @@ include(CMakePackageConfigHelpers)
+ include(ECMInstallIcons)
+ include(FeatureSummary)
+
+-find_package(Qt5 REQUIRED COMPONENTS Network Core Widgets)
++find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml)
+ find_package(KF5 REQUIRED COMPONENTS I18n XmlGui KIO Solid Config ConfigWidgets WidgetsAddons KDELibs4Support)
+ find_package(KF5Cddb)
+ find_package(Phonon4Qt5 REQUIRED)
+--
+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 0beceea2e00..5730b13cb60 100644
--- a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
@@ -45,7 +45,7 @@ RDEPEND="${DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-3.0.0-deps.patch"
+ "${FILESDIR}/${P}-deps.patch" # pending upstream
"${FILESDIR}/${P}-fix-add-dirs.patch"
"${FILESDIR}/${P}-metainfodir.patch"
)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/soundkonverter/, media-sound/soundkonverter/files/
@ 2020-07-19 11:17 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-07-19 11:17 UTC (permalink / raw
To: gentoo-commits
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 <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+---
+ 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, <montel@kde.org>
++# 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 <montel@kde.org>
++# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org>
++# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org>
++# 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 <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+---
+ 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"
)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-19 11:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-19 11:17 [gentoo-commits] repo/gentoo:master commit in: media-sound/soundkonverter/, media-sound/soundkonverter/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-07-19 11:17 Andreas Sturmlechner
2016-08-05 16:51 Michael Palimaka
2016-01-19 11:58 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox