diff options
Diffstat (limited to 'media-sound/clementine')
-rw-r--r-- | media-sound/clementine/Manifest | 6 | ||||
-rw-r--r-- | media-sound/clementine/clementine-1.3.1_p20181201.ebuild (renamed from media-sound/clementine/clementine-1.3.1_p20181112.ebuild) | 10 | ||||
-rw-r--r-- | media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch | 41 | ||||
-rw-r--r-- | media-sound/clementine/files/clementine-1.3.1_p20181201-cmake.patch | 165 |
4 files changed, 173 insertions, 49 deletions
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest index 360d13cf6994..a1c16b3f58f1 100644 --- a/media-sound/clementine/Manifest +++ b/media-sound/clementine/Manifest @@ -1,8 +1,8 @@ -AUX clementine-1.3.1_p20181112-no-dbus.patch 1356 BLAKE2B eda2e90798f5028cc5406df9b5ba5b2be01c16d6644d6f2a2416af46e8e8dbadf6a7fd7b5b6e6d32393589ef9d3e2b73ee5a37290f8265fbb7f3e03405825224 SHA512 a001f42b6c4352a0d01eea769959383b4674a1988ae07d6754bd85546b8343f793f8ab86a865c86a6bb7ce2a4c8f99f921e7e1cc61b624bdae4f5bf36865d6b2 +AUX clementine-1.3.1_p20181201-cmake.patch 5224 BLAKE2B bd5ca791fc6d67f2ae1e73389b8c947b55ab7d4f0ab4a2187cb9c8473486d0e9466493afd33c0d4d403c6209c16288edb7fcadb4e950005715e746b46584b144 SHA512 c65970a2278e2b62d46ac6349fce53213b57efcb5621fb6459c123d6dbea806c34849ab68e6e85ba1e1a003e5d50e0d6f51949cf80466f58383940e37d69bf76 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76 SHA512 8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62 -DIST clementine-1.3.1_p20181112.tar.gz 8526632 BLAKE2B da3f155006ef5e94233104011aadad41e974ec339827b91bd3c5c0c2420b23199be852a9d0cb7c9b0112ba2d43ff3e3e87388db92679f8e64da5c3fa3e578c1d SHA512 eed16cec7323b142e4602a4bd81d7363e9cf4fc203c3b8b341aadbe883fdbd571dff0792260eec8af2f91e79fe905c3510d1e7ce1b06e9d4698016820cc771fa +DIST clementine-1.3.1_p20181201.tar.gz 8535075 BLAKE2B c4b6660ee9718054cc13c6b4fc2e1dccf9c117319f5b682dc5de2861fc40cc129e079449e1c2e15733faf14b6e18b42f37c228000a8e6c121b7fdcb2e48bc7b9 SHA512 fcc062857b95a5cabc41449143bb876df9955cdaaa59868f147d7a165dea13e2e4e1c11ea23f4309c8af7bef42d694a82867420245513af8e4dfbd91ab6f9a2c EBUILD clementine-1.3.1_p20180416.ebuild 5175 BLAKE2B b66494abab89a91ed12929a31c5253ab9c2190f3a95f5443a15ec8244a51704cafa734d754dc6928393addccfbfe1f081c9ecfe217a83e15e808a79207878e8e SHA512 302a93dc77c533bc65c10de9f82d1ed5da2f42c40c83392b4b1a32da3fd4e25f530e07edcf704780a93abce026ddc41c4b3054ea94964f4a1cc79658eb5e5ad7 -EBUILD clementine-1.3.1_p20181112.ebuild 5219 BLAKE2B acda6fd2baaaa86a1366bbc8f3be825fffd0238e70a14529b991aae4637a63a6770726eeb7ec357cabc08e9d38bbc9d28231fee57351f31032ed826bf27fb1ce SHA512 083866c2400177d690263387dbe6384a33b24fda7822bc6f687b5214511ec4ac74cdd88aca6faa0c77af2dc5a0e603736a6d33fa7b9c00b9493179289cfb5f8a +EBUILD clementine-1.3.1_p20181201.ebuild 5254 BLAKE2B 71f4a4ac2cdbcd23cf1a5e4f9e098e0841872306db1fef39189ee53ff2e18aa086095cbdcaf1977932e61be509213edbcd0783054b683ec9d7dcdc78ba8f2178 SHA512 40a9aa0d2bf16e68cd4b749adfeb0ebf46987a84554371f3c85d959f3c46eaf8c48067a9643cfb827850d0a2a3b51e82fb2eb5d90598386bf4394b6bdf2358e7 EBUILD clementine-9999.ebuild 5106 BLAKE2B 173f32354a9891b77909bee7e617b39b6b90005d7dc40a1da8e271dbc7aeb28421e7b9aeaaf1e075de0be9801df98a8233e89e4b669efb2891854ec3b5fae55b SHA512 6b2a173785f473e5290f673a42d55092bf1e184eff3eed0fabef238758395f7a21d9a090cd29efb36e3db3fd2b52dc55d53a271edf1c8d7038ff5a516cefe39a MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b diff --git a/media-sound/clementine/clementine-1.3.1_p20181112.ebuild b/media-sound/clementine/clementine-1.3.1_p20181201.ebuild index 0840a685935d..3d3061880f8c 100644 --- a/media-sound/clementine/clementine-1.3.1_p20181112.ebuild +++ b/media-sound/clementine/clementine-1.3.1_p20181201.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" GIT_ECLASS="git-r3" else - COMMIT=b8eea8ccc116388b67e4b042a5b81e87bf7a24e5 + COMMIT=d87307fbc718a57ca38b5354f196db05b560036c SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -50,7 +50,6 @@ COMMON_DEPEND=" >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu - virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) @@ -61,6 +60,7 @@ COMMON_DEPEND=" projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 + virtual/opengl ) " # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; @@ -81,7 +81,6 @@ DEPEND="${COMMON_DEPEND} >=dev-cpp/gtest-1.8.0 dev-libs/boost dev-qt/linguist-tools:5 - dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-devel/gettext @@ -89,6 +88,7 @@ DEPEND="${COMMON_DEPEND} box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) + projectm? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) @@ -104,7 +104,7 @@ S="${WORKDIR}/${PN^}-${COMMIT}" DOCS=( Changelog README.md ) -PATCHES=( "${FILESDIR}"/${P}-no-dbus.patch ) +PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) src_prepare() { l10n_find_plocales_changes "src/translations" "" ".po" @@ -142,7 +142,7 @@ src_configure() { -DLINGUAS="$(l10n_get_locales)" -DENABLE_BOX="$(usex box)" -DENABLE_AUDIOCD="$(usex cdda)" - -DENABLE_DBUS="$(usex dbus)" + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus) -DENABLE_DROPBOX="$(usex dropbox)" -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" -DENABLE_LIBGPOD="$(usex ipod)" diff --git a/media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch b/media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch deleted file mode 100644 index d03db2451ad3..000000000000 --- a/media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d940136d0ae2a98ea72d842df0099bebcd361426 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Fri, 2 Nov 2018 12:58:08 +0100 -Subject: [PATCH] Fix build without Qt5DBus - ---- - CMakeLists.txt | 2 +- - src/CMakeLists.txt | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c1de26e3e..eaf794c27 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -304,7 +304,7 @@ endif () - if(WIN32) - set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent) - else(WIN32) -- set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent Qt5::X11Extras Qt5::DBus) -+ set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent Qt5::X11Extras) - endif(WIN32) - - # Remove GLU and GL from the link line - they're not really required -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 120f09949..88f1ac6c3 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1249,6 +1249,10 @@ target_link_libraries(clementine_lib - Qocoa - ) - -+if (HAVE_DBUS) -+ target_link_libraries(clementine_lib Qt5::DBus) -+endif () -+ - if(ENABLE_VISUALISATIONS) - target_link_libraries(clementine_lib ${LIBPROJECTM_LIBRARIES}) - endif(ENABLE_VISUALISATIONS) --- -2.19.1 - diff --git a/media-sound/clementine/files/clementine-1.3.1_p20181201-cmake.patch b/media-sound/clementine/files/clementine-1.3.1_p20181201-cmake.patch new file mode 100644 index 000000000000..633bf39be9d1 --- /dev/null +++ b/media-sound/clementine/files/clementine-1.3.1_p20181201-cmake.patch @@ -0,0 +1,165 @@ +From 940fcb260b345d2598d04fd07c6718566b3adda1 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sat, 1 Dec 2018 23:29:43 +0100 +Subject: [PATCH 1/3] Qt5::Test is not required in the global QT_LIBRARIES + definition + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e660a376a..e18e008c0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -110,7 +110,7 @@ if(WIN32) + find_package(Qt5 REQUIRED COMPONENTS WinExtras) + endif() + +-set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::Xml Qt5::OpenGL Qt5::Test) ++set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::Xml Qt5::OpenGL) + + if(DBUS_FOUND) + set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::DBus) +-- +2.19.2 + + +From 4e11613088d24f248046d449f63bfd245f1e82cc Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sat, 1 Dec 2018 23:44:35 +0100 +Subject: [PATCH 2/3] Qt5::DBus had already been optional, drop bogus pkgconfig + search + +This partially reverts commit 4321ecf7d26c5eed577a97d230786bb9f56ea37f. +--- + CMakeLists.txt | 17 +++++++---------- + 1 file changed, 7 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e18e008c0..0d1403e04 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,6 @@ find_package(PkgConfig REQUIRED) + find_package(Protobuf REQUIRED) + find_package(FFTW3) + find_package(ALSA) +-pkg_check_modules(DBUS dbus-1) + if (NOT APPLE) + find_package(X11) + endif() +@@ -96,13 +95,10 @@ find_path(SPARSEHASH_INCLUDE_DIRS google/sparsetable) + # QT + set(QT_MIN_VERSION 5.6.0) + find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Concurrent Widgets Network Sql Xml OpenGL Test) ++find_package(Qt5DBus ${QT_MIN_VERSION}) + if(X11_FOUND) + find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras) + endif() +-if(DBUS_FOUND) +- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS DBus) +- get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt5::qdbusxml2cpp LOCATION) +-endif() + if(APPLE) + find_package(Qt5 REQUIRED COMPONENTS MacExtras) + endif() +@@ -112,8 +108,9 @@ endif() + + set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::Xml Qt5::OpenGL) + +-if(DBUS_FOUND) ++if(Qt5DBus_FOUND) + set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::DBus) ++ get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt5::qdbusxml2cpp LOCATION) + endif() + if(X11_FOUND) + set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::X11Extras) +@@ -286,19 +283,19 @@ optional_component(LIBLASTFM ON "Last.fm support" + ) + + optional_component(DBUS ON "D-Bus support" +- DEPENDS "D-Bus" DBUS_FOUND ++ DEPENDS "Qt5DBus" Qt5DBus_FOUND + ) + + optional_component(WIIMOTEDEV ON "Wiimote support" +- DEPENDS "D-Bus support" DBUS_FOUND ++ DEPENDS "D-Bus support" Qt5DBus_FOUND + ) + + optional_component(DEVICEKIT ON "Devices: DeviceKit backend" +- DEPENDS "D-Bus support" DBUS_FOUND ++ DEPENDS "D-Bus support" Qt5DBus_FOUND + ) + + optional_component(UDISKS2 ON "Devices: UDisks2 backend" +- DEPENDS "D-Bus support" DBUS_FOUND ++ DEPENDS "D-Bus support" Qt5DBus_FOUND + ) + + if (CRYPTOPP_FOUND OR HAVE_SPOTIFY_BLOB) +-- +2.19.2 + + +From 21e9f8be5b986581ab04869d28c335f949423ef5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 2 Dec 2018 00:21:17 +0100 +Subject: [PATCH 3/3] Find X11 only once, in root CMakeLists.txt + +Since we have HAVE_X11, use HAVE_X11 in cmake. +--- + 3rdparty/qxt/CMakeLists.txt | 1 - + CMakeLists.txt | 4 ++-- + src/CMakeLists.txt | 1 - + 3 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/3rdparty/qxt/CMakeLists.txt b/3rdparty/qxt/CMakeLists.txt +index 8fd9220ae..73c67a9fa 100644 +--- a/3rdparty/qxt/CMakeLists.txt ++++ b/3rdparty/qxt/CMakeLists.txt +@@ -10,7 +10,6 @@ set(QXT-MOC-HEADERS + qxtglobalshortcut.h + ) + +-find_package(X11) + include_directories(${X11_INCLUDE_DIR}) + include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS}) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0d1403e04..bd191b59e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -96,7 +96,7 @@ find_path(SPARSEHASH_INCLUDE_DIRS google/sparsetable) + set(QT_MIN_VERSION 5.6.0) + find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Concurrent Widgets Network Sql Xml OpenGL Test) + find_package(Qt5DBus ${QT_MIN_VERSION}) +-if(X11_FOUND) ++if(HAVE_X11) + find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras) + endif() + if(APPLE) +@@ -112,7 +112,7 @@ if(Qt5DBus_FOUND) + set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::DBus) + get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt5::qdbusxml2cpp LOCATION) + endif() +-if(X11_FOUND) ++if(HAVE_X11) + set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::X11Extras) + endif() + if(APPLE) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 0eb14e28c..4a612d5bd 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1364,7 +1364,6 @@ if (UNIX AND NOT APPLE) + # command but they're actually used by libraries that appear after them, so + # they end up getting ignored. This appends them to the very end of the link + # line, ensuring they're always used. +- find_package(X11) + if (FREEBSD) + target_link_libraries(clementine_lib ${X11_X11_LIB}) + else () +-- +2.19.2 + |