[gentoo-commits] repo/gentoo:master commit in: media-libs/taglib/files/, media-libs/taglib/
commit: 813736e4d1b04b73abd1a57896fe4e7a2f3b104f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 2 17:54:58 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 2 18:01:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=813736e4
media-libs/taglib: add 1.13.1
See also:
https://mail.kde.org/pipermail/taglib-devel/2023-July/003066.html
https://taglib.org/#taglib-1131-release---jul-1-2023
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/taglib/Manifest | 1 +
.../taglib/files/taglib-1.13.1-pkgconfig.patch | 42 +++
media-libs/taglib/taglib-1.13.1.ebuild | 61 ++
3 files changed, 104 insertions(+)
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 5eacd0b69db4..22a15526c6f5 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1 +1,2 @@
+DIST taglib-1.13.1.tar.gz 1372618 BLAKE2B
36cf9b59ded95c9996d04a86055a36a7b74a2a01c13f75826d4907abca0b982c5f9b0e4bcd6648707013108f8eaf424ab95f07c383130452aa169e2cab33f466
SHA512
986231ee62caa975afead7e94630d58acaac25a38bc33d4493d51bd635d79336e81bba60586d7355ebc0670e31f28d32da3ecceaf33292e4bc240c64bf00f35b
DIST taglib-1.13.tar.gz 1371504 BLAKE2B
844aacec1a5a6baf69cc849cd09c53778b618acffc4bffb0b80835e0a0b6481c0492a5b66b51ef6fd15350b3a392f4a473410696534a7c2129cf045de6108156
SHA512
b6e3253d158b41173073c0da1915f5e4a3de947db918660817cb1c755fba7e3723ea1a335fbbc30b0dcf942348a471b493fe2ce1d52d1a808578edee14e1bfc7
diff --git a/media-libs/taglib/files/taglib-1.13.1-pkgconfig.patch
b/media-libs/taglib/files/taglib-1.13.1-pkgconfig.patch
new file mode 100644
index ..6907e87ae4a3
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.13.1-pkgconfig.patch
@@ -0,0 +1,42 @@
+From b5d07842d27e61d01c7f2cd0e0c61bc354ebf618 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sat, 2 Sep 2023 19:53:13 +0200
+Subject: [PATCH] Revert pkgconfig file path mangling
+
+Signed-off-by: Andreas Sturmlechner
+---
+ bindings/c/taglib_c.pc.cmake | 4 ++--
+ taglib.pc.cmake | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/bindings/c/taglib_c.pc.cmake b/bindings/c/taglib_c.pc.cmake
+index 178f1e50..7918d558 100644
+--- a/bindings/c/taglib_c.pc.cmake
b/bindings/c/taglib_c.pc.cmake
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+
+ Name: TagLib C Bindings
+ Description: Audio meta-data library (C bindings)
+diff --git a/taglib.pc.cmake b/taglib.pc.cmake
+index 3800f078..575cb310 100644
+--- a/taglib.pc.cmake
b/taglib.pc.cmake
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+
+ Name: TagLib
+ Description: Audio meta-data library
+--
+2.42.0
+
diff --git a/media-libs/taglib/taglib-1.13.1.ebuild
b/media-libs/taglib/taglib-1.13.1.ebuild
new file mode 100644
index ..9fbcaf1647e4
--- /dev/null
+++ b/media-libs/taglib/taglib-1.13.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Library for reading and editing audio meta data"
+HOMEPAGE="https://taglib.github.io/";
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc examples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen[dot] )
+"
+
+# https://github.com/taglib/taglib/issues/1098
+PATCHES=( "${FILESDIR}"/${P}-pkgconfig.patch )
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/taglib-config
+)
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=$(multilib_native_usex examples)
+ -DBUILD_TESTING=$(usex test)
+ )
+ cmake_src_configure
+}
+
+multilib_src_compile() {
+ cmake_src_compile
+
+ if multilib_is_native_abi; then
+ use doc && cmake_build docs
+ fi
+}
+
+multilib_src_test() {
+ eninja check
+}
+
+multilib_src_install() {
+ cmake_src_install
+
+ if multilib_is_native_abi && use doc; then
+ HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/taglib/files/, media-libs/taglib/
commit: 5ffd946e9e8883a49e17fdd8b276940257aee01e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Dec 15 19:26:00 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Dec 15 19:26:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ffd946e
media-libs/taglib: drop 1.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/taglib/Manifest | 1 -
media-libs/taglib/files/taglib-1.12-cmake.patch | 525
media-libs/taglib/taglib-1.12.ebuild| 62 ---
3 files changed, 588 deletions(-)
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 71d1b6ea1e04..5eacd0b69db4 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,2 +1 @@
-DIST taglib-1.12.tar.gz 1364231 BLAKE2B
414a61a302fbdd1af8dae70fcec96311023d3ef85a659b8dc598c8c73cf31142b4a254c843f4d415eff0fda84e62e18f1bb63921f1868400990f023aa01b1a41
SHA512
63c96297d65486450908bda7cc1583ec338fa5a56a7c088fc37d6e125e1ee76e6d20343556a8f3d36f5b7e5187c58a5d15be964c996e3586ea1438910152b1a6
DIST taglib-1.13.tar.gz 1371504 BLAKE2B
844aacec1a5a6baf69cc849cd09c53778b618acffc4bffb0b80835e0a0b6481c0492a5b66b51ef6fd15350b3a392f4a473410696534a7c2129cf045de6108156
SHA512
b6e3253d158b41173073c0da1915f5e4a3de947db918660817cb1c755fba7e3723ea1a335fbbc30b0dcf942348a471b493fe2ce1d52d1a808578edee14e1bfc7
diff --git a/media-libs/taglib/files/taglib-1.12-cmake.patch
b/media-libs/taglib/files/taglib-1.12-cmake.patch
deleted file mode 100644
index 185a1e23ed20..
--- a/media-libs/taglib/files/taglib-1.12-cmake.patch
+++ /dev/null
@@ -1,525 +0,0 @@
-From 5d5315c5ddf2e3a6d92d6b5dba8a120b7c04f46a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Mon, 15 Feb 2021 22:50:56 +0100
-Subject: [PATCH 1/7] Use CMake's CTest which includes BUILD_TESTING option
-
-BUILD_TESTING is default enabled, which is a good default anyway.
-Move the CppUnit check to the root CMakeLists.txt, simpler and clearer.
-BUILD_TESTS is obsolete.
-
-The need for BUILD_SHARED_LIBS=OFF for testing is not clear, it works on Linux.
-But I kept it in the instructions for now.
-
-Signed-off-by: Andreas Sturmlechner
- CMakeLists.txt| 13 +
- ConfigureChecks.cmake | 10 --
- INSTALL.md| 6 +++---
- 3 files changed, 12 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5fc91cc6..770fa046 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,6 +4,8 @@ project(taglib)
-
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
-
-+include(CTest)
-+
- if(DEFINED ENABLE_STATIC)
- message(FATAL_ERROR "This option is no longer available, use
BUILD_SHARED_LIBS instead")
- endif()
-@@ -32,7 +34,6 @@ if(ENABLE_CCACHE)
- endif()
-
- option(VISIBILITY_HIDDEN "Build with -fvisibility=hidden" OFF)
--option(BUILD_TESTS "Build the test suite" OFF)
- option(BUILD_EXAMPLES "Build the examples" OFF)
- option(BUILD_BINDINGS "Build the bindings" ON)
-
-@@ -147,9 +148,13 @@ if(BUILD_BINDINGS)
- add_subdirectory(bindings)
- endif()
-
--if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
-- enable_testing()
-- add_subdirectory(tests)
-+if(BUILD_TESTING)
-+ find_package(CppUnit)
-+ if(CppUnit_FOUND)
-+add_subdirectory(tests)
-+ else()
-+message(WARNING "BUILD_TESTING requested, but CppUnit not found, skipping
tests.")
-+ endif()
- endif()
-
- if(BUILD_EXAMPLES)
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index bcdbfe20..2fe2f129 100644
a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -187,16 +187,6 @@ if(NOT ZLIB_SOURCE)
- endif()
- endif()
-
--# Determine whether CppUnit is installed.
--
--if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
-- find_package(CppUnit)
-- if(NOT CppUnit_FOUND)
--message(STATUS "CppUnit not found, disabling tests.")
--set(BUILD_TESTS OFF)
-- endif()
--endif()
--
- # Detect WinRT mode
- if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
- set(PLATFORM WINRT 1)
-diff --git a/INSTALL.md b/INSTALL.md
-index a398654e..19771aca 100644
a/INSTALL.md
-+++ b/INSTALL.md
-@@ -167,7 +167,7 @@ Unit Tests
-
- If you want to run the test suite to make sure TagLib works properly on your
- system, you need to have cppunit installed. To build the tests, include
--the option `-DBUILD_TESTS=ON -DBUILD_SHARED_LIBS=OFF` when running cmake.
-+the option `-DBUILD_TESTING=ON` when running cmake.
-
- The test suite has a custom target in the build system, so you can run
- the tests using make:
-@@ -183,7 +183,7 @@ Windows MinGW:
- - `mingw32-make; mingw32-make install DESTDIR=/path/to/install/dir`
- * Build TagLib with testing enabled:
- - ```
--cmake -G "MinGW Makefiles" -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON
-DBUILD_SHARED_LIBS=OFF \
-+cmake -G "MinGW Makefiles" -DBUILD_TESTING=ON -DBUILD_EXAMPLES=ON
-DBUILD_SHARED_LIBS=OFF \
- -DCPPUNIT_INCLUDE_DIR=/path/to/cppunit/include \
[gentoo-commits] repo/gentoo:master commit in: media-libs/taglib/files/, media-libs/taglib/
commit: 2a9c1691cbf9d3697e3aceb12d697b7987747023
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Feb 14 17:09:15 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 14 18:36:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a9c1691
media-libs/taglib: Drop 1.11.1-r1
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/taglib/Manifest | 1 -
.../files/taglib-1.11.1-CVE-2017-12678.patch | 30 ---
media-libs/taglib/metadata.xml | 3 --
media-libs/taglib/taglib-1.11.1-r1.ebuild | 58 --
4 files changed, 92 deletions(-)
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index d83fc6fa89d..22540a0665a 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,2 +1 @@
-DIST taglib-1.11.1.tar.gz 1261620 BLAKE2B
b33212df2a63d8d6bbca62b175812ec52783fdbfed8fb7bc5dedde845ac01e4f89a64d96b231e1db1e5e609e84dd84d83a2266c1f9ed371f1fad7ffca50486ac
SHA512
7846775c4954ea948fe4383e514ba7c11f55d038ee06b6ea5a0a1c1069044b348026e76b27aa4ba1c71539aa8143e1401fab39184cc6e915ba0ae2c06133cb98
DIST taglib-1.11.1_p20181028.tar.gz 123 BLAKE2B
d281873a87742ba417ea764bb01f9a4c5553a4624d2c257dd82bbb2f0b7e3103ab6ca253f78c0167908f449aac833873ca1cce6f24b1eb5f608131382833262a
SHA512
e26439b65ab579455f79e87a94c33a98e17209b31a19b531e5964a2c0ded395c35067655e31ad22b6205149e2e920d7bd145993f064d3ad13e1de8a9f7e37256
diff --git a/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch
b/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch
deleted file mode 100644
index 4b567da1982..000
--- a/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From eb9ded1206f18f2c319157337edea2533a40bea6 Mon Sep 17 00:00:00 2001
-From: "Stephen F. Booth"
-Date: Sun, 23 Jul 2017 10:11:09 -0400
-Subject: [PATCH] Don't assume TDRC is an instance of TextIdentificationFrame
-
-If TDRC is encrypted, FrameFactory::createFrame() returns UnknownFrame
-which causes problems in rebuildAggregateFrames() when it is assumed
-that TDRC is a TextIdentificationFrame
- taglib/mpeg/id3v2/id3v2framefactory.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp
b/taglib/mpeg/id3v2/id3v2framefactory.cpp
-index 759a9b7be..9347ab869 100644
a/taglib/mpeg/id3v2/id3v2framefactory.cpp
-+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
-@@ -334,10 +334,11 @@ void FrameFactory::rebuildAggregateFrames(ID3v2::Tag
*tag) const
- tag->frameList("TDAT").size() == 1)
- {
- TextIdentificationFrame *tdrc =
-- static_cast(tag->frameList("TDRC").front());
-+ dynamic_cast(tag->frameList("TDRC").front());
- UnknownFrame *tdat = static_cast(tag->frameList("TDAT").front());
-
--if(tdrc->fieldList().size() == 1 &&
-+if(tdrc &&
-+ tdrc->fieldList().size() == 1 &&
-tdrc->fieldList().front().size() == 4 &&
-tdat->data().size() >= 5)
- {
diff --git a/media-libs/taglib/metadata.xml b/media-libs/taglib/metadata.xml
index cabb8e8cf5a..0d251d573cf 100644
--- a/media-libs/taglib/metadata.xml
+++ b/media-libs/taglib/metadata.xml
@@ -5,9 +5,6 @@
k...@gentoo.org
Gentoo KDE Project
-
- Use dev-libs/boost instead of GCC
built-ins
-
taglib/taglib
diff --git a/media-libs/taglib/taglib-1.11.1-r1.ebuild
b/media-libs/taglib/taglib-1.11.1-r1.ebuild
deleted file mode 100644
index ac42c4b3bf4..000
--- a/media-libs/taglib/taglib-1.11.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="A library for reading and editing audio meta data"
-HOMEPAGE="https://taglib.github.io/";
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-SLOT="0"
-IUSE="boost debug examples test"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- boost? ( dev-libs/boost:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.11-install-examples.patch
- "${FILESDIR}"/${P}-CVE-2017-12678.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/taglib-config
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \
- -i CMakeLists.txt \
- -i ConfigureChecks.cmake || die
-
- #
