diff options
Diffstat (limited to 'media-sound/clementine')
| -rw-r--r-- | media-sound/clementine/Manifest | 7 | ||||
| -rw-r--r-- | media-sound/clementine/clementine-1.4.1_p28.ebuild (renamed from media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild) | 24 | ||||
| -rw-r--r-- | media-sound/clementine/clementine-9999.ebuild | 18 | ||||
| -rw-r--r-- | media-sound/clementine/files/clementine-1.4.0_rc2-absl2.patch | 86 | ||||
| -rw-r--r-- | media-sound/clementine/files/clementine-1.4.0_rc2-fix-build-taglib2.patch | 188 |
5 files changed, 22 insertions, 301 deletions
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest index b3c7c4d4941c..d667e46e4ff5 100644 --- a/media-sound/clementine/Manifest +++ b/media-sound/clementine/Manifest @@ -1,11 +1,10 @@ AUX clementine-1.4.0_rc2-absl.patch 353 BLAKE2B 8e33c6d539a60294186a674dade27f8220c197e85302ae026ecf54392a4a0ad4ff17f84ba2ef5e5e715bc12913f5dccc2e7b97d911865896c818c9b7bcf69d6f SHA512 b60721a347cd9fd703e1550e39552f0f0d9927130f4abe13122ca760aef78a9b0fcf242178e91f2fca809e98b95f0584095b010283d9e28d4a3b8b6c87cac6dc -AUX clementine-1.4.0_rc2-absl2.patch 2356 BLAKE2B d6b06c70abf5e236f341c7d8ef93923b41de650efd61d1e475960d79577ab51ff98aafc812b9f159a70eae27ceb02603b51f6f941e4db97c301368ea1a7916f8 SHA512 928c041bc7e67861402bbb8d1e3ebfb9009b5d1a0abb3fe6d49e32b602ab87b25990524505d58a5b99cd4ac0ed536538e227f814f29b34778f3e04da23fb8027 AUX clementine-1.4.0_rc2-c17.patch 2261 BLAKE2B e66117f376b440d359eb40c3247c28ed662b4924e066385792cc3638ae2d0296b52b3c4dc5185507f21c51baac78e063ab79d72bbb7ce2df76e82f5ebffe10c0 SHA512 8a68a23956a08c08a4d7ee030606512f375c2039314268f6f615c424a1b3ab46b643af3afdf221a2d827f03962a1644bd5b1de5d4d70c53b1fd02625fc1026ea -AUX clementine-1.4.0_rc2-fix-build-taglib2.patch 6949 BLAKE2B 748bae24f6cb7912cdab00766ab57b31a430401cd97d81f53aaeffe85ce060f1482604fa8b4bb36c915ef68c18b7acdde734fc490f7279bf7e5e5c92f81bc5d1 SHA512 7e6a62f10c5342bd0b7623ed4d464198ee14cf43241dd4598e4b5b0373d8fe4b7f9a0c1fb67fddb00d93ec0fce63da87208bf4a154cc3a1eb68d9453f5781663 AUX clementine-1.4.0_rc2-lz.patch 889 BLAKE2B ce04feb2b14c4b1e2e994672c0196100b35672da8b830c3ad1b8103f11327aefbccce97c5ad4253227b88939e16d6a6a88c8b3e3530e8589b1b9e28eb524361c SHA512 4bd24c05dd3d748d6b5f66070900fcef841144baaa8557bdc05a6128ee7b64f7b222344447944ef41d83694ec3f7618fd744d8e6053ec34f35b923b0a3db02a7 AUX clementine-1.4.0_rc2-projectm-dir.patch 1879 BLAKE2B dc2d19a17b6c255360ae961ff55c6598eae51f0b5b1f4147c8b13541121f8c6dd03d864ba04dbc594ec670c5872e356e3522aaef4f67804b6e7aeb438ec0bb9c SHA512 7d891b9c26dd62b1fdad5548de0976192934aa1a28d25501fb5ba896a81d663243196e076054de6678b69cae3b05df16209c0cfd9ee3b652fe051c7ad4f17a2e DIST clementine-1.4.0_rc2.tar.gz 9073685 BLAKE2B a2376f1a895c651c2eb089419e20b9ce6050739f1342a6fdf1ebad0a14b65a08f56cc846eb79ad7facb77d6ee2cac74f9e374bd8e284a2a7f87d7c117779a08d SHA512 403093386efabd52e649c0e379abbf4873c4b2f8d0af72cda2b7e0255f90c60259f961045e7b51d0e5bf35425d678ff6b018c9191845ebbd156d9216d8bd7722 +DIST clementine-1.4.1_p28.tar.xz 5554308 BLAKE2B 213c5719ce987700739d625de07861143a85690c91908d458cb40db9b932f4a33caca727f2a2db942d96ee3e5f356841c09dfd293fa676ad134d1283937ef4fc SHA512 c5b06540909127e8b3bc774f2bee54584c0993e1ddebce4572cd8402bba5524babdcc3b74a1b6a8335c525ce64ee1347766b6698df05bdcf21209583b8d1dc9d EBUILD clementine-1.4.0_rc2-r5.ebuild 4780 BLAKE2B 0adc837a75b8244f34ea2574b232f892832958e0f66428fd19a08ab0adc3a534a2d96fff6e80e25d7a0ae3c7e8813d75de6dd19830e2df511e4219c4a6d744f0 SHA512 b9f41774dc627b9f7bd57b66bcc1655c8b538da13bc1d9c69a56e423d2335d835de019d19efaab92e94d9df296e9f994eedf09bf644abe68b3cc29034aacf109 -EBUILD clementine-1.4.0_rc2-r6.ebuild 4723 BLAKE2B 3ac050ba2a4027123feff5f4ed8afad86b69bca503e330772263b3d67c4ae3f7ba138ca2c77ee39d43555a26e28079d57ef59773c9f78e4422d91e2b312a1dd4 SHA512 f5d697ab9682376bc2c14e236ab03a244682b6626417a5a0d3ed4115afc35dd4e971821199f7a4f69b892f3eb2fedcae1759c7d9da76bcf69a787e2ea6b1576b -EBUILD clementine-9999.ebuild 4586 BLAKE2B 11f9a16c04d6e588bb4518446a19f07999ba9c4aa2c701b16210be81229f52c5d5ead5ffbddcb99896d54b9737522e08aeeee3d2da173fb5cf8ca7b0a68e64be SHA512 9bd9ced94180e05a0ad95ba5553722d7a6017609c8688e5cb7ac0e685570eb308b247656073dedf6ec0d1211f23ec07ba70df0dc45aa45fc66eb4e8e08c794c4 +EBUILD clementine-1.4.1_p28.ebuild 4527 BLAKE2B cb174b48357aa837a62ddb4ccd0ee13125c21c3ff773b8cfbe6cbc60401fc02f61f0ece3a0a91c20c575abd84fa55b42b3dc5f53f28f20b4244d62f72b1f6462 SHA512 cb21fedfc120f691c7df81f42157c8316db176e6fd8d6ed789b2ec0be15edc7cadc1324e4b1e84819137ede49208fa70dace68819fcbb93bb55d4e68b8e7935b +EBUILD clementine-9999.ebuild 4527 BLAKE2B 6cc1d2d197e514d14612f02504a64d26a32f794b780294c29f7a6d731b1493a8a7f382b63098f7c5fdf8fd803614c3fe431b382306cba3afcb2a99591aaa86b6 SHA512 1cd7ba8eee884ca80d6d6afacb96c0ad560ece87989836308196ed99cda016b6bc7e6b4232b925d73ea73de3ca8ae3d361b88c2460dbbc04c89aa24245469ec0 MISC metadata.xml 1205 BLAKE2B 385d0f742772f036d1d0e03913aa1e38fe165dfeec7a6773fa5685992f9bbc348437bd759c24c54686d19f8dfbadc8bf208909788bc1e0dd957e47bb659fb832 SHA512 58d908699a52724401f167ae20fa05327aa4fd5b705856a43292c98e898b2f13d11c9db6fac6def35eede0c356071ff38e22883ca233a1005173ded18e69ca92 diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild b/media-sound/clementine/clementine-1.4.1_p28.ebuild index 914852a6f203..1555e2a42292 100644 --- a/media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild +++ b/media-sound/clementine/clementine-1.4.1_p28.ebuild @@ -14,8 +14,9 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" inherit git-r3 else - SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Clementine-${PV/_}" + MY_PV="$(ver_cut 1-3)-$(ver_cut 5)-g41e2a07b3" + SRC_URI="https://github.com/clementine-player/Clementine/releases/download/${MY_PV}/clementine-${MY_PV}.tar.xz -> ${P}.tar.xz" + S="${WORKDIR}/clementine-${MY_PV}" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi @@ -92,14 +93,6 @@ BDEPEND=" ) " -PATCHES=( - "${FILESDIR}/clementine-1.4.0_rc2-lz.patch" - "${FILESDIR}/clementine-1.4.0_rc2-c17.patch" - "${FILESDIR}/clementine-1.4.0_rc2-absl2.patch" - "${FILESDIR}/clementine-1.4.0_rc2-projectm-dir.patch" - "${FILESDIR}/clementine-1.4.0_rc2-fix-build-taglib2.patch" -) - DOCS=( Changelog README.md ) src_prepare() { @@ -116,19 +109,16 @@ src_prepare() { cmake_comment_add_subdirectory tests fi - rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die + rm -r 3rdparty/{libmygpo-qt5,taglib} || die } src_configure() { - # spotify is not in portage local mycmakeargs=( -DBUILD_WERROR=OFF # avoid automagically enabling of ccache (bug #611010) -DCCACHE_EXECUTABLE=OFF -DENABLE_BREAKPAD=OFF #< disable crash reporting -DENABLE_GIO=ON - -DENABLE_SPOTIFY=OFF - -DENABLE_SPOTIFY_BLOB=OFF -DUSE_SYSTEM_GMOCK=ON -DUSE_SYSTEM_PROJECTM=ON -DBUNDLE_PROJECTM_PRESETS=OFF @@ -151,6 +141,12 @@ src_configure() { "$(cmake_use_find_package alsa ALSA)" ) + if [[ ${PV} != *9999* ]]; then + mycmakeargs+=( + -DFORCE_GIT_REVISION="${MY_PV}" + ) + fi + use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT cmake_src_configure diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild index f3083d6651fb..823a70ac7fe8 100644 --- a/media-sound/clementine/clementine-9999.ebuild +++ b/media-sound/clementine/clementine-9999.ebuild @@ -14,8 +14,9 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" inherit git-r3 else - SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Clementine-${PV/_}" + MY_PV="$(ver_cut 1-3)-$(ver_cut 5)-gxxxxxxxxx" + SRC_URI="https://github.com/clementine-player/Clementine/releases/download/${MY_PV}/clementine-${MY_PV}.tar.xz -> ${P}.tar.xz" + S="${WORKDIR}/clementine-${MY_PV}" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi @@ -92,13 +93,6 @@ BDEPEND=" ) " -PATCHES=( - "${FILESDIR}/clementine-1.4.0_rc2-c17.patch" - "${FILESDIR}/clementine-1.4.0_rc2-absl2.patch" - "${FILESDIR}/clementine-1.4.0_rc2-projectm-dir.patch" - "${FILESDIR}/clementine-1.4.0_rc2-fix-build-taglib2.patch" -) - DOCS=( Changelog README.md ) src_prepare() { @@ -147,6 +141,12 @@ src_configure() { "$(cmake_use_find_package alsa ALSA)" ) + if [[ ${PV} != *9999* ]]; then + mycmakeargs+=( + -DFORCE_GIT_REVISION="${MY_PV}" + ) + fi + use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT cmake_src_configure diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-absl2.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-absl2.patch deleted file mode 100644 index f6f9b4532b2b..000000000000 --- a/media-sound/clementine/files/clementine-1.4.0_rc2-absl2.patch +++ /dev/null @@ -1,86 +0,0 @@ -Fix build - -https://bugs.gentoo.org/912853 -https://bugs.gentoo.org/947632 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 010191b..57163b9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,7 +46,7 @@ endif(OPENGL_FOUND) - find_package(Boost REQUIRED) - find_package(Gettext REQUIRED) - find_package(PkgConfig REQUIRED) --find_package(Protobuf REQUIRED) -+find_package(protobuf REQUIRED) - find_package(FFTW3) - find_package(ALSA) - if (NOT APPLE) -diff --git a/ext/libclementine-remote/CMakeLists.txt b/ext/libclementine-remote/CMakeLists.txt -index 115d1f4..717d76c 100644 ---- a/ext/libclementine-remote/CMakeLists.txt -+++ b/ext/libclementine-remote/CMakeLists.txt -@@ -6,14 +6,14 @@ set(MESSAGES - remotecontrolmessages.proto - ) - --protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES}) -- - add_library(libclementine-remote STATIC -- ${PROTO_SOURCES} -+ ${MESSAGES} - ) - -+protobuf_generate(TARGET libclementine-remote LANGUAGE cpp) -+ - target_link_libraries(libclementine-remote -- ${PROTOBUF_LIBRARY} - libclementine-common -+ protobuf::libprotobuf - ) - -diff --git a/ext/libclementine-spotifyblob/CMakeLists.txt b/ext/libclementine-spotifyblob/CMakeLists.txt -index 7a73b14..072fe60 100644 ---- a/ext/libclementine-spotifyblob/CMakeLists.txt -+++ b/ext/libclementine-spotifyblob/CMakeLists.txt -@@ -7,12 +7,12 @@ set(MESSAGES - spotifymessages.proto - ) - --protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES}) -- - add_library(clementine-spotifyblob-messages STATIC -- ${PROTO_SOURCES} -+ ${MESSAGES} - ) - -+protobuf_generate(TARGET clementine-spotifyblob-messages LANGUAGE cpp) -+ - target_link_libraries(clementine-spotifyblob-messages - libclementine-common - ) -diff --git a/ext/libclementine-tagreader/CMakeLists.txt b/ext/libclementine-tagreader/CMakeLists.txt -index 8a0a944..fc2d6e6 100644 ---- a/ext/libclementine-tagreader/CMakeLists.txt -+++ b/ext/libclementine-tagreader/CMakeLists.txt -@@ -28,16 +28,16 @@ optional_source(HAVE_GOOGLE_DRIVE - - qt5_wrap_cpp(MOC ${HEADERS}) - --protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES}) -- - add_library(libclementine-tagreader STATIC -- ${PROTO_SOURCES} -+ ${MESSAGES} - ${SOURCES} - ${MOC} - ) - -+protobuf_generate(TARGET libclementine-tagreader LANGUAGE cpp) -+ - target_link_libraries(libclementine-tagreader -- ${PROTOBUF_LIBRARY} - libclementine-common -+ protobuf::libprotobuf - ) - diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-fix-build-taglib2.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-fix-build-taglib2.patch deleted file mode 100644 index 0c26343c7bf0..000000000000 --- a/media-sound/clementine/files/clementine-1.4.0_rc2-fix-build-taglib2.patch +++ /dev/null @@ -1,188 +0,0 @@ -https://github.com/clementine-player/Clementine/commit/e9c09b1c4054925fa6366233cb44d4d0a543258f.patch -compatibility added with taglib1 ---- a/ext/libclementine-tagreader/cloudstream.cpp -+++ b/ext/libclementine-tagreader/cloudstream.cpp -@@ -91,7 +91,11 @@ - clear(); - } - -+#if (TAGLIB_MAJOR_VERSION == 2) -+TagLib::ByteVector CloudStream::readBlock(size_t length) { -+#else - TagLib::ByteVector CloudStream::readBlock(ulong length) { -+#endif - const uint start = cursor_; - const uint end = qMin(cursor_ + length - 1, length_ - 1); - -@@ -144,11 +148,19 @@ - qLog(Debug) << Q_FUNC_INFO << "not implemented"; - } - -+#if (TAGLIB_MAJOR_VERSION == 2) -+void CloudStream::insert(const TagLib::ByteVector&, TagLib::offset_t, size_t) { -+#else - void CloudStream::insert(const TagLib::ByteVector&, ulong, ulong) { -+#endif - qLog(Debug) << Q_FUNC_INFO << "not implemented"; - } - -+#if (TAGLIB_MAJOR_VERSION == 2) -+void CloudStream::removeBlock(TagLib::offset_t, size_t) { -+#else - void CloudStream::removeBlock(ulong, ulong) { -+#endif - qLog(Debug) << Q_FUNC_INFO << "not implemented"; - } - -@@ -159,7 +171,11 @@ - - bool CloudStream::isOpen() const { return true; } - -+#if (TAGLIB_MAJOR_VERSION == 2) -+void CloudStream::seek(TagLib::offset_t offset, TagLib::IOStream::Position p) { -+#else - void CloudStream::seek(long offset, TagLib::IOStream::Position p) { -+#endif - switch (p) { - case TagLib::IOStream::Beginning: - cursor_ = offset; -@@ -178,11 +194,19 @@ - - void CloudStream::clear() { cursor_ = 0; } - -+#if (TAGLIB_MAJOR_VERSION == 2) -+TagLib::offset_t CloudStream::tell() const { return cursor_; } -+ -+TagLib::offset_t CloudStream::length() { return length_; } -+ -+void CloudStream::truncate(TagLib::offset_t) { -+#else - long CloudStream::tell() const { return cursor_; } - - long CloudStream::length() { return length_; } - - void CloudStream::truncate(long) { -+#endif - qLog(Debug) << Q_FUNC_INFO << "not implemented"; - } - ---- a/ext/libclementine-tagreader/cloudstream.h -+++ b/ext/libclementine-tagreader/cloudstream.h -@@ -35,6 +35,19 @@ - - // Taglib::IOStream - virtual TagLib::FileName name() const; -+#if (TAGLIB_MAJOR_VERSION == 2) -+ virtual TagLib::ByteVector readBlock(size_t length); -+ virtual void writeBlock(const TagLib::ByteVector&); -+ virtual void insert(const TagLib::ByteVector&, TagLib::offset_t, size_t); -+ virtual void removeBlock(TagLib::offset_t, size_t); -+ virtual bool readOnly() const; -+ virtual bool isOpen() const; -+ virtual void seek(TagLib::offset_t offset, TagLib::IOStream::Position p); -+ virtual void clear(); -+ virtual TagLib::offset_t tell() const; -+ virtual TagLib::offset_t length(); -+ virtual void truncate(TagLib::offset_t); -+#else - virtual TagLib::ByteVector readBlock(ulong length); - virtual void writeBlock(const TagLib::ByteVector&); - virtual void insert(const TagLib::ByteVector&, ulong, ulong); -@@ -46,6 +59,7 @@ - virtual long tell() const; - virtual long length(); - virtual void truncate(long); -+#endif - - google::sparsetable<char>::size_type cached_bytes() const { - return cache_.num_nonempty(); ---- a/ext/libclementine-tagreader/tagreader.cpp -+++ b/ext/libclementine-tagreader/tagreader.cpp -@@ -198,7 +198,7 @@ - // Find album artists - TagLib::APE::ItemListMap::ConstIterator it = items.find("ALBUM ARTIST"); - if (it != items.end()) { -- TagLib::StringList album_artists = it->second.toStringList(); -+ TagLib::StringList album_artists = it->second.values(); - if (!album_artists.isEmpty()) { - Decode(album_artists.front(), nullptr, song->mutable_albumartist()); - } -@@ -243,22 +243,22 @@ - } - - if (items.contains("BPM")) { -- Decode(items["BPM"].toStringList().toString(", "), nullptr, -+ Decode(items["BPM"].values().toString(", "), nullptr, - song->mutable_performer()); - } - - if (items.contains("PERFORMER")) { -- Decode(items["PERFORMER"].toStringList().toString(", "), nullptr, -+ Decode(items["PERFORMER"].values().toString(", "), nullptr, - song->mutable_performer()); - } - - if (items.contains("COMPOSER")) { -- Decode(items["COMPOSER"].toStringList().toString(", "), nullptr, -+ Decode(items["COMPOSER"].values().toString(", "), nullptr, - song->mutable_composer()); - } - - if (items.contains("GROUPING")) { -- Decode(items["GROUPING"].toStringList().toString(" "), nullptr, -+ Decode(items["GROUPING"].values().toString(" "), nullptr, - song->mutable_grouping()); - } - -@@ -565,8 +565,8 @@ - if (fileref->audioProperties()) { - song->set_bitrate(fileref->audioProperties()->bitrate()); - song->set_samplerate(fileref->audioProperties()->sampleRate()); -- song->set_length_nanosec(fileref->audioProperties()->length() * -- kNsecPerSec); -+ song->set_length_nanosec(fileref->audioProperties()->lengthInMilliseconds() * -+ kNsecPerMsec); - } - - // Get the filetype if we can -@@ -1376,9 +1376,15 @@ - std::unique_ptr<TagLib::File> tag; - if (mime_type == "audio/mpeg" && - title.endsWith(".mp3", Qt::CaseInsensitive)) { -+#if (TAGLIB_MAJOR_VERSION == 2) -+ tag.reset(new TagLib::MPEG::File(stream.get(), true, -+ TagLib::AudioProperties::Accurate, -+ TagLib::ID3v2::FrameFactory::instance())); -+#else - tag.reset(new TagLib::MPEG::File(stream.get(), - TagLib::ID3v2::FrameFactory::instance(), - TagLib::AudioProperties::Accurate)); -+#endif - } else if (mime_type == "audio/mp4" || - (mime_type == "audio/mpeg" && - title.endsWith(".m4a", Qt::CaseInsensitive))) { -@@ -1398,9 +1398,15 @@ - TagLib::AudioProperties::Accurate)); - } else if (mime_type == "application/x-flac" || mime_type == "audio/flac" || - mime_type == "audio/x-flac") { -+#if (TAGLIB_MAJOR_VERSION == 2) -+ tag.reset(new TagLib::FLAC::File(stream.get(), true, -+ TagLib::AudioProperties::Accurate, -+ TagLib::ID3v2::FrameFactory::instance())); -+#else - tag.reset(new TagLib::FLAC::File(stream.get(), - TagLib::ID3v2::FrameFactory::instance(), - true, TagLib::AudioProperties::Accurate)); -+#endif - } else if (mime_type == "audio/x-ms-wma") { - tag.reset(new TagLib::ASF::File(stream.get(), true, - TagLib::AudioProperties::Accurate)); -@@ -1431,7 +1431,7 @@ - song->set_type(cpb::tagreader::SongMetadata_Type_STREAM); - - if (tag->audioProperties()) { -- song->set_length_nanosec(tag->audioProperties()->length() * kNsecPerSec); -+ song->set_length_nanosec(tag->audioProperties()->lengthInMilliseconds() * kNsecPerMsec); - } - return true; - } |