[gentoo-commits] repo/gentoo:master commit in: media-libs/taglib/, media-libs/taglib/files/
commit: 76ea8770237f2dda920c5ea5d916e6dcb25a51e0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jan 29 20:50:47 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jan 30 20:26:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ea8770
media-libs/taglib: drop 1.13
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/taglib/Manifest | 1 -
media-libs/taglib/files/taglib-1.13-cmake.patch | 37 ---
media-libs/taglib/taglib-1.13.ebuild| 60 -
3 files changed, 98 deletions(-)
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 22a15526c6f5..eaaab49e2e20 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,2 +1 @@
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-cmake.patch
b/media-libs/taglib/files/taglib-1.13-cmake.patch
deleted file mode 100644
index 5bda305db103..
--- a/media-libs/taglib/files/taglib-1.13-cmake.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8aa7dd81d8b89bfa48bb32f6cab7df20f79f3562 Mon Sep 17 00:00:00 2001
-From: Ryan Schmidt
-Date: Thu, 27 Oct 2022 20:02:04 -0500
-Subject: [PATCH] Fix macOS dylib install name to be absolute path
-
-Closes #1065
- bindings/c/CMakeLists.txt | 2 +-
- taglib/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt
-index 15f4e440a..b517da7b6 100644
a/bindings/c/CMakeLists.txt
-+++ b/bindings/c/CMakeLists.txt
-@@ -58,7 +58,7 @@ set_target_properties(tag_c PROPERTIES
- VERSION 0.0.0
- SOVERSION 0
- DEFINE_SYMBOL MAKE_TAGLIB_C_LIB
-- INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}
-+ INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR}
- )
- install(TARGETS tag_c
- FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
-diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
-index 527c00738..ea1ab8388 100644
a/taglib/CMakeLists.txt
-+++ b/taglib/CMakeLists.txt
-@@ -344,7 +344,7 @@ endif()
- set_target_properties(tag PROPERTIES
- VERSION
${TAGLIB_SOVERSION_MAJOR}.${TAGLIB_SOVERSION_MINOR}.${TAGLIB_SOVERSION_PATCH}
- SOVERSION ${TAGLIB_SOVERSION_MAJOR}
-- INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}
-+ INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR}
- DEFINE_SYMBOL MAKE_TAGLIB_LIB
- LINK_INTERFACE_LIBRARIES ""
- PUBLIC_HEADER "${tag_HDRS}"
diff --git a/media-libs/taglib/taglib-1.13.ebuild
b/media-libs/taglib/taglib-1.13.ebuild
deleted file mode 100644
index 969c64b00c3d..
--- a/media-libs/taglib/taglib-1.13.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 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-text/doxygen[dot] )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-cmake.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/, media-libs/taglib/files/
commit: 31d7e83d128bcbff85fbac24852f8594ae7cb312
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Oct 28 16:32:57 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Oct 28 16:48:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d7e83d
media-libs/taglib: add 1.13
See also:
https://mail.kde.org/pipermail/taglib-devel/2022-October/003054.html
https://taglib.org/#taglib-113-release---oct-27-2022
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/taglib/Manifest | 1 +
media-libs/taglib/files/taglib-1.13-cmake.patch | 37 +++
media-libs/taglib/taglib-1.13.ebuild| 60 +
3 files changed, 98 insertions(+)
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 5a275aba3316..71d1b6ea1e04 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1 +1,2 @@
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.13-cmake.patch
b/media-libs/taglib/files/taglib-1.13-cmake.patch
new file mode 100644
index ..5bda305db103
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.13-cmake.patch
@@ -0,0 +1,37 @@
+From 8aa7dd81d8b89bfa48bb32f6cab7df20f79f3562 Mon Sep 17 00:00:00 2001
+From: Ryan Schmidt
+Date: Thu, 27 Oct 2022 20:02:04 -0500
+Subject: [PATCH] Fix macOS dylib install name to be absolute path
+
+Closes #1065
+---
+ bindings/c/CMakeLists.txt | 2 +-
+ taglib/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt
+index 15f4e440a..b517da7b6 100644
+--- a/bindings/c/CMakeLists.txt
b/bindings/c/CMakeLists.txt
+@@ -58,7 +58,7 @@ set_target_properties(tag_c PROPERTIES
+ VERSION 0.0.0
+ SOVERSION 0
+ DEFINE_SYMBOL MAKE_TAGLIB_C_LIB
+- INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}
++ INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR}
+ )
+ install(TARGETS tag_c
+ FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
+diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
+index 527c00738..ea1ab8388 100644
+--- a/taglib/CMakeLists.txt
b/taglib/CMakeLists.txt
+@@ -344,7 +344,7 @@ endif()
+ set_target_properties(tag PROPERTIES
+ VERSION
${TAGLIB_SOVERSION_MAJOR}.${TAGLIB_SOVERSION_MINOR}.${TAGLIB_SOVERSION_PATCH}
+ SOVERSION ${TAGLIB_SOVERSION_MAJOR}
+- INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}
++ INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR}
+ DEFINE_SYMBOL MAKE_TAGLIB_LIB
+ LINK_INTERFACE_LIBRARIES ""
+ PUBLIC_HEADER "${tag_HDRS}"
diff --git a/media-libs/taglib/taglib-1.13.ebuild
b/media-libs/taglib/taglib-1.13.ebuild
new file mode 100644
index ..d5cbedc1aa37
--- /dev/null
+++ b/media-libs/taglib/taglib-1.13.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 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 ~x86-solaris"
+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] )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.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/, media-libs/taglib/files/
commit: bee0fb9a140eac9737f1ade27da8bc6d858d6395
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 15 18:55:56 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 15 22:36:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee0fb9a
media-libs/taglib: Drop 1.11.1_p20190920-r1 snapshot
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/taglib/Manifest | 1 -
.../files/taglib-1.11-install-examples.patch | 13 --
.../files/taglib-1.11.1_p20181028-libdir.patch | 25 --
.../taglib-1.11.1_p20181028-version-1.11.2.patch | 11 -
.../taglib/taglib-1.11.1_p20190920-r1.ebuild | 53 --
5 files changed, 103 deletions(-)
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 29937cf62ab..5a275aba331 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,2 +1 @@
-DIST taglib-1.11.1_p20190920.tar.gz 1290100 BLAKE2B
38f65450b5e7c33b14187ab461bfd18d77f93d1ecab5ccf0c898ca6e67fd05aebac09318d4e1cabf1fdbca38800332ef9d0d5d1317087e69672734d1dec1dfe2
SHA512
4f7ad2a0713d38e8885b10d08041abdfb6c669369edd16e8345d7d679c16c15f191ca378e6690e06347f29e0e9cadebcb95ba26dc583c1127c4531558df27173
DIST taglib-1.12.tar.gz 1364231 BLAKE2B
414a61a302fbdd1af8dae70fcec96311023d3ef85a659b8dc598c8c73cf31142b4a254c843f4d415eff0fda84e62e18f1bb63921f1868400990f023aa01b1a41
SHA512
63c96297d65486450908bda7cc1583ec338fa5a56a7c088fc37d6e125e1ee76e6d20343556a8f3d36f5b7e5187c58a5d15be964c996e3586ea1438910152b1a6
diff --git a/media-libs/taglib/files/taglib-1.11-install-examples.patch
b/media-libs/taglib/files/taglib-1.11-install-examples.patch
deleted file mode 100644
index fd676c6aec1..000
--- a/media-libs/taglib/files/taglib-1.11-install-examples.patch
+++ /dev/null
@@ -1,13 +0,0 @@
a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -37,3 +37,10 @@
- add_executable(strip-id3v1 strip-id3v1.cpp)
- target_link_libraries(strip-id3v1 tag)
-
-+INSTALL(TARGETS
-+ tagreader tagreader_c tagwriter framelist strip-id3v1
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-+)
-+
diff --git a/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch
b/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch
deleted file mode 100644
index 0ae6b1cfb9a..000
--- a/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cd9e6b750206417f155574c78d2551242a779a97 Mon Sep 17 00:00:00 2001
-From: jiblime <47689567+jibl...@users.noreply.github.com>
-Date: Sat, 19 Oct 2019 15:12:03 -0700
-Subject: [PATCH] Changed libdir/includedir variables to change based on a
- user's system and match syntax
-
- taglib-config.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/taglib-config.cmake b/taglib-config.cmake
-index 2a5c19f90..e613fa226 100644
a/taglib-config.cmake
-+++ b/taglib-config.cmake
-@@ -16,8 +16,8 @@ EOH
-
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=${exec_prefix}/lib
--includedir=${prefix}/include
-+libdir=@LIB_INSTALL_DIR@
-+includedir=@INCLUDE_INSTALL_DIR@
-
- flags=""
-
diff --git
a/media-libs/taglib/files/taglib-1.11.1_p20181028-version-1.11.2.patch
b/media-libs/taglib/files/taglib-1.11.1_p20181028-version-1.11.2.patch
deleted file mode 100644
index 4b8311d24a1..000
--- a/media-libs/taglib/files/taglib-1.11.1_p20181028-version-1.11.2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/taglib/toolkit/taglib.h 2018-10-28 14:43:45.0 +0100
-+++ b/taglib/toolkit/taglib.h 2018-11-17 23:40:39.517716254 +0100
-@@ -30,7 +30,7 @@
-
- #define TAGLIB_MAJOR_VERSION 1
- #define TAGLIB_MINOR_VERSION 11
--#define TAGLIB_PATCH_VERSION 1
-+#define TAGLIB_PATCH_VERSION 2
-
- #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >
1)) || defined(__clang__)
- #define TAGLIB_IGNORE_MISSING_DESTRUCTOR _Pragma("GCC diagnostic ignored
\"-Wnon-virtual-dtor\"")
diff --git a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
deleted file mode 100644
index a79a5c9b8e2..000
--- a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-COMMIT=54508df30bc888c4d2359576ceb0cc8f2fa8dbdf
-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/${COMMIT}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-SLOT="0
[gentoo-commits] repo/gentoo:master commit in: media-libs/taglib/, media-libs/taglib/files/
commit: bf7746b7c8a729749e4f9c266e7757f622995bda
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Feb 15 22:51:10 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Feb 16 00:15:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf7746b7
media-libs/taglib: 1.12 version bump, add IUSE=doc, fix tests
Package-Manager: Portage-3.0.14, Repoman-3.0.2
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| 63 +++
3 files changed, 589 insertions(+)
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 935619532ed..29937cf62ab 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1 +1,2 @@
DIST taglib-1.11.1_p20190920.tar.gz 1290100 BLAKE2B
38f65450b5e7c33b14187ab461bfd18d77f93d1ecab5ccf0c898ca6e67fd05aebac09318d4e1cabf1fdbca38800332ef9d0d5d1317087e69672734d1dec1dfe2
SHA512
4f7ad2a0713d38e8885b10d08041abdfb6c669369edd16e8345d7d679c16c15f191ca378e6690e06347f29e0e9cadebcb95ba26dc583c1127c4531558df27173
+DIST taglib-1.12.tar.gz 1364231 BLAKE2B
414a61a302fbdd1af8dae70fcec96311023d3ef85a659b8dc598c8c73cf31142b4a254c843f4d415eff0fda84e62e18f1bb63921f1868400990f023aa01b1a41
SHA512
63c96297d65486450908bda7cc1583ec338fa5a56a7c088fc37d6e125e1ee76e6d20343556a8f3d36f5b7e5187c58a5d15be964c996e3586ea1438910152b1a6
diff --git a/media-libs/taglib/files/taglib-1.12-cmake.patch
b/media-libs/taglib/files/taglib-1.12-cmake.patch
new file mode 100644
index 000..185a1e23ed2
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.12-cmake.patch
@@ -0,0 +1,525 @@
+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
[gentoo-commits] repo/gentoo:master commit in: media-libs/taglib/, media-libs/taglib/files/
commit: f5376c03c8c65c581901c4dee29a05cf2bae2327
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Oct 20 14:17:09 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Oct 20 14:19:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5376c03
media-libs/taglib: Fix taglib-config libdir
Pending upstream PR: https://github.com/taglib/taglib/pull/935
Closes: https://bugs.gentoo.org/697742
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/taglib-1.11.1_p20181028-libdir.patch | 25 ++
...20.ebuild => taglib-1.11.1_p20190920-r1.ebuild} | 1 +
2 files changed, 26 insertions(+)
diff --git a/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch
b/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch
new file mode 100644
index 000..0ae6b1cfb9a
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch
@@ -0,0 +1,25 @@
+From cd9e6b750206417f155574c78d2551242a779a97 Mon Sep 17 00:00:00 2001
+From: jiblime <47689567+jibl...@users.noreply.github.com>
+Date: Sat, 19 Oct 2019 15:12:03 -0700
+Subject: [PATCH] Changed libdir/includedir variables to change based on a
+ user's system and match syntax
+
+---
+ taglib-config.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/taglib-config.cmake b/taglib-config.cmake
+index 2a5c19f90..e613fa226 100644
+--- a/taglib-config.cmake
b/taglib-config.cmake
+@@ -16,8 +16,8 @@ EOH
+
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++libdir=@LIB_INSTALL_DIR@
++includedir=@INCLUDE_INSTALL_DIR@
+
+ flags=""
+
diff --git a/media-libs/taglib/taglib-1.11.1_p20190920.ebuild
b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
similarity index 96%
rename from media-libs/taglib/taglib-1.11.1_p20190920.ebuild
rename to media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
index b83996484d6..163dcdf23ea 100644
--- a/media-libs/taglib/taglib-1.11.1_p20190920.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-1.11-install-examples.patch
"${FILESDIR}"/${PN}-1.11.1_p20181028-version-1.11.2.patch
+ "${FILESDIR}"/${PN}-1.11.1_p20181028-libdir.patch
)
MULTILIB_CHOST_TOOLS=(
[gentoo-commits] repo/gentoo:master commit in: media-libs/taglib/, media-libs/taglib/files/
commit: b8e04362d44ebc6f8573f6646f31d29ec1e38f89
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Nov 17 22:45:57 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 17 22:45:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8e04362
media-libs/taglib: Fake version 1.11.2
Revdeps are already checking for >1.11.1 regarding features and bugfixes.
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../taglib/files/taglib-1.11.1_p20181028-version-1.11.2.patch | 11 +++
media-libs/taglib/taglib-1.11.1_p20181028.ebuild | 5 -
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git
a/media-libs/taglib/files/taglib-1.11.1_p20181028-version-1.11.2.patch
b/media-libs/taglib/files/taglib-1.11.1_p20181028-version-1.11.2.patch
new file mode 100644
index 000..4b8311d24a1
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.11.1_p20181028-version-1.11.2.patch
@@ -0,0 +1,11 @@
+--- a/taglib/toolkit/taglib.h 2018-10-28 14:43:45.0 +0100
b/taglib/toolkit/taglib.h 2018-11-17 23:40:39.517716254 +0100
+@@ -30,7 +30,7 @@
+
+ #define TAGLIB_MAJOR_VERSION 1
+ #define TAGLIB_MINOR_VERSION 11
+-#define TAGLIB_PATCH_VERSION 1
++#define TAGLIB_PATCH_VERSION 2
+
+ #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >
1)) || defined(__clang__)
+ #define TAGLIB_IGNORE_MISSING_DESTRUCTOR _Pragma("GCC diagnostic ignored
\"-Wnon-virtual-dtor\"")
diff --git a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
b/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
index 8bea0ad114e..0b424ee 100644
--- a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
@@ -23,7 +23,10 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${PN}-${COMMIT}"
-PATCHES=( "${FILESDIR}"/${PN}-1.11-install-examples.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.11-install-examples.patch
+ "${FILESDIR}"/${P}-version-1.11.2.patch
+)
MULTILIB_CHOST_TOOLS=(
/usr/bin/taglib-config
[gentoo-commits] repo/gentoo:master commit in: media-libs/taglib/, media-libs/taglib/files/
commit: 96280e607739038a6f0ed6778fb3f01b82a5f534
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Aug 8 17:26:24 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Aug 8 17:26:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96280e60
media-libs/taglib: Security revbump for CVE-2017-12678
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../files/taglib-1.11.1-CVE-2017-12678.patch | 30
media-libs/taglib/taglib-1.11.1-r1.ebuild | 55 ++
2 files changed, 85 insertions(+)
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
new file mode 100644
index 000..4b567da1982
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch
@@ -0,0 +1,30 @@
+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/taglib-1.11.1-r1.ebuild
b/media-libs/taglib/taglib-1.11.1-r1.ebuild
new file mode 100644
index 000..f8b48fe19f0
--- /dev/null
+++ b/media-libs/taglib/taglib-1.11.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+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
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=$(multilib_native_usex examples)
+ $(cmake-utils_use_find_package boost Boost)
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_TESTS=$(usex test)
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_test() {
+ # ctest does not work
+ emake -C "${BUILD_DIR}" check
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/taglib/, media-libs/taglib/files/
commit: f2e3654b1c0fad418d7a3945239e0f3129f580f5
Author: Michael Palimaka gentoo org>
AuthorDate: Wed Jul 20 21:34:50 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Jul 20 21:35:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e3654b
media-libs/taglib: version bump
Package-Manager: portage-2.3.0
media-libs/taglib/Manifest | 1 +
.../files/taglib-1.11-install-examples.patch | 13 +
media-libs/taglib/taglib-1.11.ebuild | 55 ++
3 files changed, 69 insertions(+)
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index fa8a1ae..27f9ea0 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,2 +1,3 @@
DIST taglib-1.10.tar.gz 1233893 SHA256
2cd09ac6d4c4ec610aa5a0a488466bd0e0f78576581ef1f344090e397ecb9c52 SHA512
bf3256b08c4fa35d9416b50d700a6634222485e481528bd2a711ae7ec0d48ee99aed66286199f30e5391218aa818a692b92c779b5fcf40617a78b767bfd9b9a5
WHIRLPOOL
ae55b391a69416877674ba9bdf01fcca06a216589c620785a4d7a489b548969bf317ce8d08aab9309325564f7ebe8e4b0c51f8bf2269c6d995f2a1ad8b430790
+DIST taglib-1.11.tar.gz 1263736 SHA256
ed4cabb3d970ff9a30b2620071c2b054c4347f44fc63546dbe06f97980ece288 SHA512
f353bd0dadcc75f8a8f08919efc3aec2502166a3e23dd605f1b1c14ffe68ea1d2c59731bc4e0e4ee879ccf33436e4084e7c4d983034a1ce85fe0fa31a78dede7
WHIRLPOOL
4143fff5ad6141388ea5184b7f73772deb3245d8abb4381ae43de59624f95237c4d206d7afb776422e55fd54b83b631e391a0b6e3f5181e09f3f78de7103cff7
DIST taglib-1.9.1.tar.gz 654074 SHA256
d4da9aaaddf590ff15273b9b2c4622b6ce8377de0f40bab40155d471ede9c585 SHA512
17523b7ebdd089520289ae817b07f291be93fd0b9d3b2891eb4860a24e45943e94d25b99250c1ac477de5e51b08c39887ca13fdcc2dce17867eb60d1edb26154
WHIRLPOOL
962ec0508d8256a54ea686d4fb8d366f23f82bf10df6406c8012295ceda8416a5f23db6e450551b685798d628623eb5247e6ab7b658f955d897b86340baa5e8e
diff --git a/media-libs/taglib/files/taglib-1.11-install-examples.patch
b/media-libs/taglib/files/taglib-1.11-install-examples.patch
new file mode 100644
index 000..fd676c6
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.11-install-examples.patch
@@ -0,0 +1,13 @@
+--- a/examples/CMakeLists.txt
b/examples/CMakeLists.txt
+@@ -37,3 +37,10 @@
+ add_executable(strip-id3v1 strip-id3v1.cpp)
+ target_link_libraries(strip-id3v1 tag)
+
++INSTALL(TARGETS
++ tagreader tagreader_c tagwriter framelist strip-id3v1
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
++ RUNTIME DESTINATION ${BIN_INSTALL_DIR}
++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
++)
++
diff --git a/media-libs/taglib/taglib-1.11.ebuild
b/media-libs/taglib/taglib-1.11.ebuild
new file mode 100644
index 000..5ec14d4
--- /dev/null
+++ b/media-libs/taglib/taglib-1.11.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-multilib
+
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
~ppc-macos ~x86-solaris"
+SLOT="0"
+IUSE="debug examples test"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${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
+)
+
+DOCS=( AUTHORS NEWS )
+
+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
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ $(multilib_is_native_abi && echo -DBUILD_EXAMPLES=$(usex
examples))
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_TESTS=$(usex test)
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_test() {
+ # ctest does not work
+ emake -C "${BUILD_DIR}" check
+}
