Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

media-sound/clementine: fix deps and link #28722

Closed
wants to merge 1 commit into from
Closed

media-sound/clementine: fix deps and link #28722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 18 additions & 17 deletions ...clementine/clementine-1.4.0_rc2-r1.ebuild → ...clementine/clementine-1.4.0_rc2-r2.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
inherit git-r3
else
S="${WORKDIR}/Clementine-${PV/_}"
SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/Clementine-${PV/_}"
DarthGandalf marked this conversation as resolved.
Show resolved Hide resolved
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi

Expand All @@ -29,19 +29,8 @@ REQUIRED_USE="
wiimote? ( dbus )
"

BDEPEND="
>=dev-cpp/gtest-1.8.0
dev-qt/linguist-tools:5
sys-devel/gettext
virtual/pkgconfig
test? (
dev-qt/qttest:5
gnome-base/gsettings-desktop-schemas
)
"
COMMON_DEPEND="
dev-db/sqlite:3
dev-libs/crypto++:=
dev-libs/glib:2
dev-libs/protobuf:=
dev-qt/qtconcurrent:5
Expand All @@ -64,12 +53,13 @@ COMMON_DEPEND="
ipod? ( >=media-libs/libgpod-0.8.0 )
lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
moodbar? ( sci-libs/fftw:3.0= )
mtp? ( >=media-libs/libmtp-1.0.0 )
mtp? ( >=media-libs/libmtp-1.0.0:= )
projectm? (
media-libs/glew:=
>=media-libs/libprojectm-3.1.12:0=
virtual/opengl
)
pulseaudio? ( media-libs/libpulse )
"
RDEPEND="${COMMON_DEPEND}
media-plugins/gst-plugins-meta:1.0
Expand All @@ -88,10 +78,23 @@ DEPEND="${COMMON_DEPEND}
box? ( dev-cpp/sparsehash )
dropbox? ( dev-cpp/sparsehash )
googledrive? ( dev-cpp/sparsehash )
pulseaudio? ( media-sound/pulseaudio )
seafile? ( dev-cpp/sparsehash )
skydrive? ( dev-cpp/sparsehash )
"
BDEPEND="
>=dev-cpp/gtest-1.8.0
dev-qt/linguist-tools:5
sys-devel/gettext
virtual/pkgconfig
test? (
dev-qt/qttest:5
gnome-base/gsettings-desktop-schemas
)
"

PATCHES=(
"${FILESDIR}/clementine-1.4.0_rc2-lz.patch"
)

DOCS=( Changelog README.md )

Expand All @@ -116,9 +119,6 @@ src_configure() {
# spotify is not in portage
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The spotify part is missing from the live ebuild. Is that intended?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's correct. In the release we disable it, but in live ebuild there's nothing to disable, because it's removed upstream.

local mycmakeargs=(
-DBUILD_WERROR=OFF
# force to find crypto++ see bug #548544
-DCRYPTOPP_LIBRARIES="cryptopp"
-DCRYPTOPP_FOUND=ON
# avoid automagically enabling of ccache (bug #611010)
-DCCACHE_EXECUTABLE=OFF
-DENABLE_BREAKPAD=OFF #< disable crash reporting
Expand All @@ -144,6 +144,7 @@ src_configure() {
-DENABLE_LIBPULSE="$(usex pulseaudio)"
-DENABLE_UDISKS2="$(usex udisks)"
-DENABLE_WIIMOTEDEV="$(usex wiimote)"
"$(cmake_use_find_package alsa ALSA)"
)

use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
Expand Down
31 changes: 14 additions & 17 deletions media-sound/clementine/clementine-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
inherit git-r3
else
S="${WORKDIR}/Clementine-${PV/_}"
SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/Clementine-${PV/_}"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi

Expand All @@ -29,19 +29,8 @@ REQUIRED_USE="
wiimote? ( dbus )
"

BDEPEND="
>=dev-cpp/gtest-1.8.0
dev-qt/linguist-tools:5
sys-devel/gettext
virtual/pkgconfig
test? (
dev-qt/qttest:5
gnome-base/gsettings-desktop-schemas
)
"
COMMON_DEPEND="
dev-db/sqlite:3
dev-libs/crypto++:=
dev-libs/glib:2
dev-libs/protobuf:=
dev-qt/qtconcurrent:5
Expand All @@ -64,12 +53,13 @@ COMMON_DEPEND="
ipod? ( >=media-libs/libgpod-0.8.0 )
lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
moodbar? ( sci-libs/fftw:3.0= )
mtp? ( >=media-libs/libmtp-1.0.0 )
mtp? ( >=media-libs/libmtp-1.0.0:= )
projectm? (
media-libs/glew:=
>=media-libs/libprojectm-3.1.12:0=
virtual/opengl
)
pulseaudio? ( media-libs/libpulse )
"
RDEPEND="${COMMON_DEPEND}
media-plugins/gst-plugins-meta:1.0
Expand All @@ -88,10 +78,19 @@ DEPEND="${COMMON_DEPEND}
box? ( dev-cpp/sparsehash )
dropbox? ( dev-cpp/sparsehash )
googledrive? ( dev-cpp/sparsehash )
pulseaudio? ( media-sound/pulseaudio )
seafile? ( dev-cpp/sparsehash )
skydrive? ( dev-cpp/sparsehash )
"
BDEPEND="
>=dev-cpp/gtest-1.8.0
dev-qt/linguist-tools:5
sys-devel/gettext
virtual/pkgconfig
test? (
dev-qt/qttest:5
gnome-base/gsettings-desktop-schemas
)
"

DOCS=( Changelog README.md )

Expand All @@ -115,9 +114,6 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
-DBUILD_WERROR=OFF
# force to find crypto++ see bug #548544
-DCRYPTOPP_LIBRARIES="cryptopp"
-DCRYPTOPP_FOUND=ON
# avoid automagically enabling of ccache (bug #611010)
-DCCACHE_EXECUTABLE=OFF
-DENABLE_BREAKPAD=OFF #< disable crash reporting
Expand All @@ -141,6 +137,7 @@ src_configure() {
-DENABLE_LIBPULSE="$(usex pulseaudio)"
-DENABLE_UDISKS2="$(usex udisks)"
-DENABLE_WIIMOTEDEV="$(usex wiimote)"
"$(cmake_use_find_package alsa ALSA)"
)

use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
Expand Down
33 changes: 33 additions & 0 deletions media-sound/clementine/files/clementine-1.4.0_rc2-lz.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
https://github.com/clementine-player/Clementine/pull/7238
https://bugs.gentoo.org/887105

--- a/3rdparty/qtiocompressor/CMakeLists.txt
+++ b/3rdparty/qtiocompressor/CMakeLists.txt
@@ -15,4 +15,4 @@ ADD_LIBRARY(qtiocompressor STATIC
${IOCOMPRESSOR-SOURCES-MOC}
)

-target_link_libraries(qtiocompressor Qt5::Core)
+target_link_libraries(qtiocompressor Qt5::Core ${ZLIB_LIBRARIES})
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,9 +78,7 @@ pkg_check_modules(LIBXML libxml-2.0)
pkg_check_modules(LIBSPOTIFY libspotify>=12.1.45)
pkg_check_modules(TAGLIB taglib)

-if (WIN32)
find_package(ZLIB REQUIRED)
-endif (WIN32)

find_library(LASTFM5_LIBRARIES lastfm5)
find_path(LASTFM5_INCLUDE_DIRS lastfm5/ws.h)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1303,7 +1303,6 @@ target_link_libraries(clementine_lib
${SQLITE_LIBRARIES}

Qocoa
- z
)

link_directories(