| 1 |
commit: 80c425d6a843dda3f36264fa06241b31de6bc6f9 |
| 2 |
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> |
| 3 |
AuthorDate: Wed Dec 21 01:37:17 2022 +0000 |
| 4 |
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 2 12:29:02 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80c425d6 |
| 7 |
|
| 8 |
media-sound/clementine: fix deps and link |
| 9 |
|
| 10 |
crypto++ was required only for spotify which is gone |
| 11 |
(https://bugs.gentoo.org/885529) |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/887105 |
| 14 |
Closes: https://bugs.gentoo.org/887163 |
| 15 |
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/28722 |
| 17 |
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> |
| 18 |
|
| 19 |
...c2-r1.ebuild => clementine-1.4.0_rc2-r2.ebuild} | 37 +++++++++++----------- |
| 20 |
media-sound/clementine/clementine-9999.ebuild | 33 +++++++++---------- |
| 21 |
.../clementine/files/clementine-1.4.0_rc2-lz.patch | 33 +++++++++++++++++++ |
| 22 |
3 files changed, 67 insertions(+), 36 deletions(-) |
| 23 |
|
| 24 |
diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r1.ebuild b/media-sound/clementine/clementine-1.4.0_rc2-r2.ebuild |
| 25 |
similarity index 94% |
| 26 |
rename from media-sound/clementine/clementine-1.4.0_rc2-r1.ebuild |
| 27 |
rename to media-sound/clementine/clementine-1.4.0_rc2-r2.ebuild |
| 28 |
index 68143124af82..c10ccef43172 100644 |
| 29 |
--- a/media-sound/clementine/clementine-1.4.0_rc2-r1.ebuild |
| 30 |
+++ b/media-sound/clementine/clementine-1.4.0_rc2-r2.ebuild |
| 31 |
@@ -1,4 +1,4 @@ |
| 32 |
-# Copyright 1999-2022 Gentoo Authors |
| 33 |
+# Copyright 1999-2023 Gentoo Authors |
| 34 |
# Distributed under the terms of the GNU General Public License v2 |
| 35 |
|
| 36 |
EAPI=8 |
| 37 |
@@ -14,8 +14,8 @@ if [[ ${PV} == *9999* ]]; then |
| 38 |
EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" |
| 39 |
inherit git-r3 |
| 40 |
else |
| 41 |
- S="${WORKDIR}/Clementine-${PV/_}" |
| 42 |
SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz" |
| 43 |
+ S="${WORKDIR}/Clementine-${PV/_}" |
| 44 |
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
| 45 |
fi |
| 46 |
|
| 47 |
@@ -29,19 +29,8 @@ REQUIRED_USE=" |
| 48 |
wiimote? ( dbus ) |
| 49 |
" |
| 50 |
|
| 51 |
-BDEPEND=" |
| 52 |
- >=dev-cpp/gtest-1.8.0 |
| 53 |
- dev-qt/linguist-tools:5 |
| 54 |
- sys-devel/gettext |
| 55 |
- virtual/pkgconfig |
| 56 |
- test? ( |
| 57 |
- dev-qt/qttest:5 |
| 58 |
- gnome-base/gsettings-desktop-schemas |
| 59 |
- ) |
| 60 |
-" |
| 61 |
COMMON_DEPEND=" |
| 62 |
dev-db/sqlite:3 |
| 63 |
- dev-libs/crypto++:= |
| 64 |
dev-libs/glib:2 |
| 65 |
dev-libs/protobuf:= |
| 66 |
dev-qt/qtconcurrent:5 |
| 67 |
@@ -64,12 +53,13 @@ COMMON_DEPEND=" |
| 68 |
ipod? ( >=media-libs/libgpod-0.8.0 ) |
| 69 |
lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) |
| 70 |
moodbar? ( sci-libs/fftw:3.0= ) |
| 71 |
- mtp? ( >=media-libs/libmtp-1.0.0 ) |
| 72 |
+ mtp? ( >=media-libs/libmtp-1.0.0:= ) |
| 73 |
projectm? ( |
| 74 |
media-libs/glew:= |
| 75 |
>=media-libs/libprojectm-3.1.12:0= |
| 76 |
virtual/opengl |
| 77 |
) |
| 78 |
+ pulseaudio? ( media-libs/libpulse ) |
| 79 |
" |
| 80 |
RDEPEND="${COMMON_DEPEND} |
| 81 |
media-plugins/gst-plugins-meta:1.0 |
| 82 |
@@ -88,10 +78,23 @@ DEPEND="${COMMON_DEPEND} |
| 83 |
box? ( dev-cpp/sparsehash ) |
| 84 |
dropbox? ( dev-cpp/sparsehash ) |
| 85 |
googledrive? ( dev-cpp/sparsehash ) |
| 86 |
- pulseaudio? ( media-sound/pulseaudio ) |
| 87 |
seafile? ( dev-cpp/sparsehash ) |
| 88 |
skydrive? ( dev-cpp/sparsehash ) |
| 89 |
" |
| 90 |
+BDEPEND=" |
| 91 |
+ >=dev-cpp/gtest-1.8.0 |
| 92 |
+ dev-qt/linguist-tools:5 |
| 93 |
+ sys-devel/gettext |
| 94 |
+ virtual/pkgconfig |
| 95 |
+ test? ( |
| 96 |
+ dev-qt/qttest:5 |
| 97 |
+ gnome-base/gsettings-desktop-schemas |
| 98 |
+ ) |
| 99 |
+" |
| 100 |
+ |
| 101 |
+PATCHES=( |
| 102 |
+ "${FILESDIR}/clementine-1.4.0_rc2-lz.patch" |
| 103 |
+) |
| 104 |
|
| 105 |
DOCS=( Changelog README.md ) |
| 106 |
|
| 107 |
@@ -116,9 +119,6 @@ src_configure() { |
| 108 |
# spotify is not in portage |
| 109 |
local mycmakeargs=( |
| 110 |
-DBUILD_WERROR=OFF |
| 111 |
- # force to find crypto++ see bug #548544 |
| 112 |
- -DCRYPTOPP_LIBRARIES="cryptopp" |
| 113 |
- -DCRYPTOPP_FOUND=ON |
| 114 |
# avoid automagically enabling of ccache (bug #611010) |
| 115 |
-DCCACHE_EXECUTABLE=OFF |
| 116 |
-DENABLE_BREAKPAD=OFF #< disable crash reporting |
| 117 |
@@ -144,6 +144,7 @@ src_configure() { |
| 118 |
-DENABLE_LIBPULSE="$(usex pulseaudio)" |
| 119 |
-DENABLE_UDISKS2="$(usex udisks)" |
| 120 |
-DENABLE_WIIMOTEDEV="$(usex wiimote)" |
| 121 |
+ "$(cmake_use_find_package alsa ALSA)" |
| 122 |
) |
| 123 |
|
| 124 |
use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT |
| 125 |
|
| 126 |
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild |
| 127 |
index 395332d8f569..249aacb20819 100644 |
| 128 |
--- a/media-sound/clementine/clementine-9999.ebuild |
| 129 |
+++ b/media-sound/clementine/clementine-9999.ebuild |
| 130 |
@@ -1,4 +1,4 @@ |
| 131 |
-# Copyright 1999-2022 Gentoo Authors |
| 132 |
+# Copyright 1999-2023 Gentoo Authors |
| 133 |
# Distributed under the terms of the GNU General Public License v2 |
| 134 |
|
| 135 |
EAPI=8 |
| 136 |
@@ -14,8 +14,8 @@ if [[ ${PV} == *9999* ]]; then |
| 137 |
EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" |
| 138 |
inherit git-r3 |
| 139 |
else |
| 140 |
- S="${WORKDIR}/Clementine-${PV/_}" |
| 141 |
SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz" |
| 142 |
+ S="${WORKDIR}/Clementine-${PV/_}" |
| 143 |
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
| 144 |
fi |
| 145 |
|
| 146 |
@@ -29,19 +29,8 @@ REQUIRED_USE=" |
| 147 |
wiimote? ( dbus ) |
| 148 |
" |
| 149 |
|
| 150 |
-BDEPEND=" |
| 151 |
- >=dev-cpp/gtest-1.8.0 |
| 152 |
- dev-qt/linguist-tools:5 |
| 153 |
- sys-devel/gettext |
| 154 |
- virtual/pkgconfig |
| 155 |
- test? ( |
| 156 |
- dev-qt/qttest:5 |
| 157 |
- gnome-base/gsettings-desktop-schemas |
| 158 |
- ) |
| 159 |
-" |
| 160 |
COMMON_DEPEND=" |
| 161 |
dev-db/sqlite:3 |
| 162 |
- dev-libs/crypto++:= |
| 163 |
dev-libs/glib:2 |
| 164 |
dev-libs/protobuf:= |
| 165 |
dev-qt/qtconcurrent:5 |
| 166 |
@@ -64,12 +53,13 @@ COMMON_DEPEND=" |
| 167 |
ipod? ( >=media-libs/libgpod-0.8.0 ) |
| 168 |
lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) |
| 169 |
moodbar? ( sci-libs/fftw:3.0= ) |
| 170 |
- mtp? ( >=media-libs/libmtp-1.0.0 ) |
| 171 |
+ mtp? ( >=media-libs/libmtp-1.0.0:= ) |
| 172 |
projectm? ( |
| 173 |
media-libs/glew:= |
| 174 |
>=media-libs/libprojectm-3.1.12:0= |
| 175 |
virtual/opengl |
| 176 |
) |
| 177 |
+ pulseaudio? ( media-libs/libpulse ) |
| 178 |
" |
| 179 |
RDEPEND="${COMMON_DEPEND} |
| 180 |
media-plugins/gst-plugins-meta:1.0 |
| 181 |
@@ -88,10 +78,19 @@ DEPEND="${COMMON_DEPEND} |
| 182 |
box? ( dev-cpp/sparsehash ) |
| 183 |
dropbox? ( dev-cpp/sparsehash ) |
| 184 |
googledrive? ( dev-cpp/sparsehash ) |
| 185 |
- pulseaudio? ( media-sound/pulseaudio ) |
| 186 |
seafile? ( dev-cpp/sparsehash ) |
| 187 |
skydrive? ( dev-cpp/sparsehash ) |
| 188 |
" |
| 189 |
+BDEPEND=" |
| 190 |
+ >=dev-cpp/gtest-1.8.0 |
| 191 |
+ dev-qt/linguist-tools:5 |
| 192 |
+ sys-devel/gettext |
| 193 |
+ virtual/pkgconfig |
| 194 |
+ test? ( |
| 195 |
+ dev-qt/qttest:5 |
| 196 |
+ gnome-base/gsettings-desktop-schemas |
| 197 |
+ ) |
| 198 |
+" |
| 199 |
|
| 200 |
DOCS=( Changelog README.md ) |
| 201 |
|
| 202 |
@@ -115,9 +114,6 @@ src_prepare() { |
| 203 |
src_configure() { |
| 204 |
local mycmakeargs=( |
| 205 |
-DBUILD_WERROR=OFF |
| 206 |
- # force to find crypto++ see bug #548544 |
| 207 |
- -DCRYPTOPP_LIBRARIES="cryptopp" |
| 208 |
- -DCRYPTOPP_FOUND=ON |
| 209 |
# avoid automagically enabling of ccache (bug #611010) |
| 210 |
-DCCACHE_EXECUTABLE=OFF |
| 211 |
-DENABLE_BREAKPAD=OFF #< disable crash reporting |
| 212 |
@@ -141,6 +137,7 @@ src_configure() { |
| 213 |
-DENABLE_LIBPULSE="$(usex pulseaudio)" |
| 214 |
-DENABLE_UDISKS2="$(usex udisks)" |
| 215 |
-DENABLE_WIIMOTEDEV="$(usex wiimote)" |
| 216 |
+ "$(cmake_use_find_package alsa ALSA)" |
| 217 |
) |
| 218 |
|
| 219 |
use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT |
| 220 |
|
| 221 |
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-lz.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-lz.patch |
| 222 |
new file mode 100644 |
| 223 |
index 000000000000..a33f07d5a5f9 |
| 224 |
--- /dev/null |
| 225 |
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-lz.patch |
| 226 |
@@ -0,0 +1,33 @@ |
| 227 |
+https://github.com/clementine-player/Clementine/pull/7238 |
| 228 |
+https://bugs.gentoo.org/887105 |
| 229 |
+ |
| 230 |
+--- a/3rdparty/qtiocompressor/CMakeLists.txt |
| 231 |
++++ b/3rdparty/qtiocompressor/CMakeLists.txt |
| 232 |
+@@ -15,4 +15,4 @@ ADD_LIBRARY(qtiocompressor STATIC |
| 233 |
+ ${IOCOMPRESSOR-SOURCES-MOC} |
| 234 |
+ ) |
| 235 |
+ |
| 236 |
+-target_link_libraries(qtiocompressor Qt5::Core) |
| 237 |
++target_link_libraries(qtiocompressor Qt5::Core ${ZLIB_LIBRARIES}) |
| 238 |
+--- a/CMakeLists.txt |
| 239 |
++++ b/CMakeLists.txt |
| 240 |
+@@ -78,9 +78,7 @@ pkg_check_modules(LIBXML libxml-2.0) |
| 241 |
+ pkg_check_modules(LIBSPOTIFY libspotify>=12.1.45) |
| 242 |
+ pkg_check_modules(TAGLIB taglib) |
| 243 |
+ |
| 244 |
+-if (WIN32) |
| 245 |
+ find_package(ZLIB REQUIRED) |
| 246 |
+-endif (WIN32) |
| 247 |
+ |
| 248 |
+ find_library(LASTFM5_LIBRARIES lastfm5) |
| 249 |
+ find_path(LASTFM5_INCLUDE_DIRS lastfm5/ws.h) |
| 250 |
+--- a/src/CMakeLists.txt |
| 251 |
++++ b/src/CMakeLists.txt |
| 252 |
+@@ -1303,7 +1303,6 @@ target_link_libraries(clementine_lib |
| 253 |
+ ${SQLITE_LIBRARIES} |
| 254 |
+ |
| 255 |
+ Qocoa |
| 256 |
+- z |
| 257 |
+ ) |
| 258 |
+ |
| 259 |
+ link_directories( |
Archives