diff options
Diffstat (limited to 'media-libs/musicbrainz')
| -rw-r--r-- | media-libs/musicbrainz/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/musicbrainz/files/musicbrainz-5.1.0-no-wildcards.patch | 27 | ||||
| -rw-r--r-- | media-libs/musicbrainz/musicbrainz-5.1.0.ebuild | 18 |
3 files changed, 36 insertions, 12 deletions
diff --git a/media-libs/musicbrainz/Manifest b/media-libs/musicbrainz/Manifest index feb915093cb4..402b2aaa2b62 100644 --- a/media-libs/musicbrainz/Manifest +++ b/media-libs/musicbrainz/Manifest @@ -1,3 +1,4 @@ +AUX musicbrainz-5.1.0-no-wildcards.patch 1316 BLAKE2B 39eb1691ec5967432cbcc166fda63f33cbb5d1ca9761ba47839733d2e78a84bc425e7b7fa200f397d6f6be982ce48688048db73ca55f2e0c84537f504b4afdab SHA512 2768c4c054fb3b1df312e7d9d41c0d9c618ce50ada9013739251933a4f84b32d147d6033507395d8d189b2d203f9c4c982d07375913907bd374587fabd8402b6 DIST libmusicbrainz-5.1.0.tar.gz 77220 BLAKE2B c655ae4a9a11adb15de559a1e518b5c5aab47ce3c36e3a264faddda36112d9caccc42d2013e451ffdf200147ffca4cbba883affa1a6465f6071fa14e1d67fbe5 SHA512 daa7ccb94e517e90f7d88a0659c84b00f04c6a73ef7771b7e3bd9101fa6569b1935a68a3689502ed0cc8c0d71ba9d2d0ebd9c074dd5eed9f75a3db390b222e03 -EBUILD musicbrainz-5.1.0.ebuild 1056 BLAKE2B 9ee4279962bf2fc77e72ee58c55a76a40fb6d315d5e8bd25f8a25179d6e81ff33dcead7ff3966e91f671344aea9d57fda84d8d0ea975f1105fb91609c2165b8d SHA512 120d845f18fa0472b2695d5cf7b2ab665221ae0fd1aae85279f1ccd3b231058ace67aa774d69c80a9009ad77c83b954343b7be4c86702c25a9ac51c07d37ab65 +EBUILD musicbrainz-5.1.0.ebuild 986 BLAKE2B 5a5f0c70a31514905bfe999e0ac1f2c6c3ef5356da4f46cdd4caa18f74153031cb96e1d86cc7fbfdcfc9c14e442f26f919ce6ac013e982a96c7a6b7bb8fb9388 SHA512 0afae34601c907240d37ec42d524ad3af793eb6c496872a1f5b1bf243020873dc00dc00d0e2900daf0b92f1dcc79ecba02755084e02b595a5fbf2f4dffb216b4 MISC metadata.xml 416 BLAKE2B 07504a54a7396e2213d1a031ed5c2aef46c3d321da8aee0dad87ca63c4d257574c3a06bfc57116557ec4a81017eca9a193e236f5119f504fafd6752250368511 SHA512 c2517eaf706a3672812c02189fc33a866b4a27950010c5d1d3e957cab1097d2bb011a6958342f5a840af7b787089bfccde5e7c044873c0dd2d4247ff9b294a6b diff --git a/media-libs/musicbrainz/files/musicbrainz-5.1.0-no-wildcards.patch b/media-libs/musicbrainz/files/musicbrainz-5.1.0-no-wildcards.patch new file mode 100644 index 000000000000..d0bf0868d549 --- /dev/null +++ b/media-libs/musicbrainz/files/musicbrainz-5.1.0-no-wildcards.patch @@ -0,0 +1,27 @@ +From 36262d60fe92fe7a2c9bfb40e736bfcd29a6c3bd Mon Sep 17 00:00:00 2001 +From: Abderrahim Kitouni <a.kitouni@gmail.com> +Date: Fri, 13 Apr 2018 09:56:57 +0100 +Subject: [PATCH 2/2] src/CMakelists.txt: do not use wildcards for dependencies + +This is discouraged by cmake's documentation and doesn't work with the ninja generator. +--- + src/CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 68c04e3..f7439d3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -37,7 +37,8 @@ ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h + COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb5_c.cc mb5_c.h + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h +- DEPENDS make-c-interface cinterface.xml *.inc ++ DEPENDS make-c-interface cinterface.xml c-int-medium-defines.inc c-int-query-source.inc c-int-source-funcs.inc ++ c-int-medium-source.inc c-int-release-defines.inc c-int-query-defines.inc c-int-release-source.inc + ) + + ADD_CUSTOM_TARGET(src_gen DEPENDS mb5_c.h) +-- +2.26.2 + diff --git a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild index 3c7debe14517..fb349000f076 100644 --- a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild +++ b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils flag-o-matic +inherit cmake DESCRIPTION="Client Library for accessing the latest XML based MusicBrainz web service" HOMEPAGE="https://musicbrainz.org/doc/libmusicbrainz" @@ -13,6 +13,7 @@ LICENSE="LGPL-2.1" SLOT="5/1" # soname of libmusicbrainz5.so KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="examples test" + RESTRICT="!test? ( test )" RDEPEND=" @@ -25,20 +26,15 @@ DEPEND="${RDEPEND} S="${WORKDIR}/lib${P}" +PATCHES=( "${FILESDIR}/${P}-no-wildcards.patch" ) + src_prepare() { use test || cmake_comment_add_subdirectory tests - cmake-utils_src_prepare -} - -src_configure() { - # bug 619668 - append-cxxflags -std=c++14 - - cmake-utils_src_configure + cmake_src_prepare } src_install() { - cmake-utils_src_install + cmake_src_install if use examples; then docinto examples |