* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2016-03-16 0:48 Jason Donenfeld
0 siblings, 0 replies; 16+ messages in thread
From: Jason Donenfeld @ 2016-03-16 0:48 UTC (permalink / raw
To: gentoo-commits
commit: bd4a5b8e468ba801b5f6d5f790af73d0cbc84c52
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 00:42:39 2016 +0000
Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 00:48:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4a5b8e
media-sound/clementine: fix tokenizer segfault
Package-Manager: portage-2.2.28
.../clementine/clementine-1.3_rc1-r1.ebuild | 168 +++++++++++++++++++++
.../files/clementine-1.3_rc1-fix-tokenizer.patch | 21 +++
2 files changed, 189 insertions(+)
diff --git a/media-sound/clementine/clementine-1.3_rc1-r1.ebuild b/media-sound/clementine/clementine-1.3_rc1-r1.ebuild
new file mode 100644
index 0000000..debdf11
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3_rc1-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+
+LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
+
+inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
+[[ ${PV} == *9999* ]] && inherit git-2
+
+DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
+HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote"
+IUSE+="${LANGS// / linguas_}"
+
+REQUIRED_USE="
+ udisks? ( dbus )
+ wiimote? ( dbus )
+"
+
+# qca dep is temporary for bug #489850
+COMMON_DEPEND="
+ dev-db/sqlite:=
+ >=dev-libs/glib-2.24.1-r1
+ dev-libs/libxml2
+ dev-libs/protobuf:=
+ dev-libs/qjson
+ >=dev-qt/qtcore-4.5:4
+ >=dev-qt/qtgui-4.5:4
+ >=dev-qt/qtopengl-4.5:4
+ >=dev-qt/qtsql-4.5:4[sqlite]
+ >=media-libs/chromaprint-0.6
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/libechonest:=[qt4]
+ >=media-libs/libmygpo-qt-1.0.8
+ >=media-libs/taglib-1.8[mp4]
+ sys-libs/zlib
+ virtual/glu
+ virtual/opengl
+ x11-libs/libX11
+ cdda? ( dev-libs/libcdio )
+ dbus? ( >=dev-qt/qtdbus-4.5:4 )
+ ipod? ( >=media-libs/libgpod-0.8.0 )
+ lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
+ mtp? ( >=media-libs/libmtp-1.0.0 )
+ moodbar? ( sci-libs/fftw:3.0 )
+ projectm? ( media-libs/glew:= )
+"
+# now only presets are used, libprojectm is internal
+# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
+RDEPEND="${COMMON_DEPEND}
+ dbus? ( udisks? ( sys-fs/udisks:2 ) )
+ mms? ( media-plugins/gst-plugins-libmms:1.0 )
+ mtp? ( gnome-base/gvfs )
+ projectm? ( >=media-libs/libprojectm-1.2.0 )
+ media-plugins/gst-plugins-meta:1.0
+ media-plugins/gst-plugins-soup:1.0
+ media-plugins/gst-plugins-taglib:1.0
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.39
+ virtual/pkgconfig
+ sys-devel/gettext
+ dev-qt/qttest:4
+ dev-cpp/gmock
+ box? ( dev-cpp/sparsehash )
+ dropbox? ( dev-cpp/sparsehash )
+ googledrive? ( dev-cpp/sparsehash )
+ skydrive? ( dev-cpp/sparsehash )
+ ubuntu-one? ( dev-cpp/sparsehash )
+ test? ( gnome-base/gsettings-desktop-schemas )
+"
+DOCS="Changelog"
+
+# https://github.com/clementine-player/Clementine/issues/3935
+RESTRICT="test"
+
+MY_P="${P/_}"
+# Switch to ^ when we switch to EAPI=6.
+[[ ${PV} == *9999* ]] || \
+S="${WORKDIR}/C${MY_P:1}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3_rc1-cmake.patch
+ "${FILESDIR}"/${PN}-1.3_rc1-fix-tokenizer.patch
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # some tests fail or hang
+ sed -i \
+ -e '/add_test_file(translations_test.cpp/d' \
+ tests/CMakeLists.txt || die
+}
+
+src_configure() {
+ local langs x
+ for x in ${LANGS}; do
+ use linguas_${x} && langs+=" ${x}"
+ done
+
+ # spotify is not in portage
+ local mycmakeargs=(
+ -DBUILD_WERROR=OFF
+ -DLINGUAS="${langs}"
+ -DBUNDLE_PROJECTM_PRESETS=OFF
+ -DUSE_SYSTEM_PROJECTM=ON
+ $(cmake-utils_use cdda ENABLE_AUDIOCD)
+ $(cmake-utils_use dbus ENABLE_DBUS)
+ $(cmake-utils_use udisks ENABLE_DEVICEKIT)
+ $(cmake-utils_use ipod ENABLE_LIBGPOD)
+ $(cmake-utils_use lastfm ENABLE_LIBLASTFM)
+ $(cmake-utils_use mtp ENABLE_LIBMTP)
+ $(cmake-utils_use moodbar ENABLE_MOODBAR)
+ -DENABLE_GIO=ON
+ $(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
+ $(cmake-utils_use projectm ENABLE_VISUALISATIONS)
+ $(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '')
+ $(cmake-utils_use box ENABLE_BOX)
+ $(cmake-utils_use dropbox ENABLE_DROPBOX)
+ $(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
+ $(cmake-utils_use skydrive ENABLE_SKYDRIVE)
+ $(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
+ -DENABLE_SPOTIFY_BLOB=OFF
+ -DENABLE_BREAKPAD=OFF
+ #$(cmake-utils_use !system-sqlite STATIC_SQLITE)
+ #$(cmake-utils_use system-sqlite I_HATE_MY_USERS)
+ #$(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
+ -DUSE_BUILTIN_TAGLIB=OFF
+ -DUSE_SYSTEM_GMOCK=ON
+ )
+
+ use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ cd "${CMAKE_BUILD_DIR}" || die
+ Xemake test
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
diff --git a/media-sound/clementine/files/clementine-1.3_rc1-fix-tokenizer.patch b/media-sound/clementine/files/clementine-1.3_rc1-fix-tokenizer.patch
new file mode 100644
index 0000000..6413bf7
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3_rc1-fix-tokenizer.patch
@@ -0,0 +1,21 @@
+https://github.com/clementine-player/Clementine/issues/5297
+
+--- src/core/database.cpp
++++ src/core/database.cpp
+@@ -265,6 +265,16 @@
+ StaticInit();
+
+ {
++#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
++ QVariant v = db.driver()->handle();
++ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
++ sqlite3* handle = *static_cast<sqlite3**>(v.data());
++ if (handle) {
++ sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
++ }
++ }
++#endif
++
+ QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db);
+ set_fts_tokenizer.bindValue(":name", "unicode");
+ set_fts_tokenizer.bindValue(
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2016-04-17 4:33 Jason Donenfeld
0 siblings, 0 replies; 16+ messages in thread
From: Jason Donenfeld @ 2016-04-17 4:33 UTC (permalink / raw
To: gentoo-commits
commit: 829f315b73c749c00f47d6b67886bf2935523cd7
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 04:31:51 2016 +0000
Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 04:32:57 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=829f315b
media-sound/clementine: version bump
Package-Manager: portage-2.2.28
media-sound/clementine/Manifest | 2 +-
...entine-1.3_rc1.ebuild => clementine-1.3.ebuild} | 5 +-
.../clementine/clementine-1.3_rc1-r1.ebuild | 168 ---------------------
media-sound/clementine/clementine-9999.ebuild | 1 -
.../files/clementine-1.3_rc1-cmake.patch | 41 -----
.../files/clementine-1.3_rc1-fix-tokenizer.patch | 21 ---
6 files changed, 2 insertions(+), 236 deletions(-)
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 9a18ea5..da3271b 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,3 +1,3 @@
DIST clementine-1.2.2.tar.gz 9076752 SHA256 1f674c42f05c476baf74f1dd37b1aa357ff9199e4493173052c856a53e5f0a96 SHA512 48e934ed1f18724c4cc79eaf7ac16dcb2ecc9d268a4986a8a421c6518d7a13bd81a5b7d249b4ff146c860bed520a59d2062139fb57672609019b8c2c84e495ca WHIRLPOOL 13c3f129566c0789e67b23b2382d7ed1f756221647c4b2cc1b4b1b1efcb5e04571837a843c8ff7c099f9bcd3f9b1dd481b1fa75fe1c4b27e90169026e8880840
DIST clementine-1.2.3.tar.gz 9076977 SHA256 7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf SHA512 fd43a7dcfec360d4478a56d0600300b6913b294f127afb0249971b45b54b48475d128861e06885c482bbdd37b09aa56b1c238675763fdb8c50329005b066bec3 WHIRLPOOL 23d0fb971118b0d73ec4a52cfa3f8829118ab65c12fb01ce30433541f5da081b52c5dd485aa0efdda2b4b57b286f59702aa686f9b7ce17a0a2595b208b95d524
-DIST clementine-1.3_rc1.tar.gz 8477665 SHA256 f08b797b47305b8a0b7e1713d11977df12e09911f05c577c9f81641369f252a0 SHA512 973410a0d2baf0646a77eb5bcbea2af3f34a4baa5671f7a81fa99203703c478d38dd2f32ce0ccac9babf8add56717fd5fdec8a4bacefe8b9b8fa0256ec509edb WHIRLPOOL 968ca43b4a15169926ad68a009c568ae03ef17e8b0542fe6c4ebd07fc4e64ae6782ab63d3a05851064e288522e44e885a9a1dc52b94246e016c60c91e41e0a76
+DIST clementine-1.3.tar.gz 8500723 SHA256 55e8d283ed02e3f2376a88b012cd2003e00fef95a98b6a919d67cb57e96b8617 SHA512 eccebb8a4d7e4abf39af7b75f40d38d184650932d2c40859cdfb3cfda24d2a35fea8518b03d9fb24f21c4dae6f11baffe2b00fe6989ec14fed99a4ccbb85ca54 WHIRLPOOL cbd6922fa586cce6be29ef0fd6151d6d89ce95aa6e237cf2716e7493ba6be2026d11a44012dc84be2e033c606c79c3e9e0338cbbd5927d7f16f358718c016895
diff --git a/media-sound/clementine/clementine-1.3_rc1.ebuild b/media-sound/clementine/clementine-1.3.ebuild
similarity index 98%
rename from media-sound/clementine/clementine-1.3_rc1.ebuild
rename to media-sound/clementine/clementine-1.3.ebuild
index 79b9c7d..3eb1742 100644
--- a/media-sound/clementine/clementine-1.3_rc1.ebuild
+++ b/media-sound/clementine/clementine-1.3.ebuild
@@ -56,6 +56,7 @@ COMMON_DEPEND="
mtp? ( >=media-libs/libmtp-1.0.0 )
moodbar? ( sci-libs/fftw:3.0 )
projectm? ( media-libs/glew:= )
+ >=dev-libs/crypto++-5.6.2-r4
"
# now only presets are used, libprojectm is internal
# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
@@ -92,10 +93,6 @@ MY_P="${P/_}"
[[ ${PV} == *9999* ]] || \
S="${WORKDIR}/C${MY_P:1}"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3_rc1-cmake.patch
-)
-
src_prepare() {
cmake-utils_src_prepare
diff --git a/media-sound/clementine/clementine-1.3_rc1-r1.ebuild b/media-sound/clementine/clementine-1.3_rc1-r1.ebuild
deleted file mode 100644
index debdf11..0000000
--- a/media-sound/clementine/clementine-1.3_rc1-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == *9999* ]] && inherit git-2
-
-DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
-HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote"
-IUSE+="${LANGS// / linguas_}"
-
-REQUIRED_USE="
- udisks? ( dbus )
- wiimote? ( dbus )
-"
-
-# qca dep is temporary for bug #489850
-COMMON_DEPEND="
- dev-db/sqlite:=
- >=dev-libs/glib-2.24.1-r1
- dev-libs/libxml2
- dev-libs/protobuf:=
- dev-libs/qjson
- >=dev-qt/qtcore-4.5:4
- >=dev-qt/qtgui-4.5:4
- >=dev-qt/qtopengl-4.5:4
- >=dev-qt/qtsql-4.5:4[sqlite]
- >=media-libs/chromaprint-0.6
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/libechonest:=[qt4]
- >=media-libs/libmygpo-qt-1.0.8
- >=media-libs/taglib-1.8[mp4]
- sys-libs/zlib
- virtual/glu
- virtual/opengl
- x11-libs/libX11
- cdda? ( dev-libs/libcdio )
- dbus? ( >=dev-qt/qtdbus-4.5:4 )
- ipod? ( >=media-libs/libgpod-0.8.0 )
- lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- moodbar? ( sci-libs/fftw:3.0 )
- projectm? ( media-libs/glew:= )
-"
-# now only presets are used, libprojectm is internal
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
-RDEPEND="${COMMON_DEPEND}
- dbus? ( udisks? ( sys-fs/udisks:2 ) )
- mms? ( media-plugins/gst-plugins-libmms:1.0 )
- mtp? ( gnome-base/gvfs )
- projectm? ( >=media-libs/libprojectm-1.2.0 )
- media-plugins/gst-plugins-meta:1.0
- media-plugins/gst-plugins-soup:1.0
- media-plugins/gst-plugins-taglib:1.0
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.39
- virtual/pkgconfig
- sys-devel/gettext
- dev-qt/qttest:4
- dev-cpp/gmock
- box? ( dev-cpp/sparsehash )
- dropbox? ( dev-cpp/sparsehash )
- googledrive? ( dev-cpp/sparsehash )
- skydrive? ( dev-cpp/sparsehash )
- ubuntu-one? ( dev-cpp/sparsehash )
- test? ( gnome-base/gsettings-desktop-schemas )
-"
-DOCS="Changelog"
-
-# https://github.com/clementine-player/Clementine/issues/3935
-RESTRICT="test"
-
-MY_P="${P/_}"
-# Switch to ^ when we switch to EAPI=6.
-[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/C${MY_P:1}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3_rc1-cmake.patch
- "${FILESDIR}"/${PN}-1.3_rc1-fix-tokenizer.patch
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # some tests fail or hang
- sed -i \
- -e '/add_test_file(translations_test.cpp/d' \
- tests/CMakeLists.txt || die
-}
-
-src_configure() {
- local langs x
- for x in ${LANGS}; do
- use linguas_${x} && langs+=" ${x}"
- done
-
- # spotify is not in portage
- local mycmakeargs=(
- -DBUILD_WERROR=OFF
- -DLINGUAS="${langs}"
- -DBUNDLE_PROJECTM_PRESETS=OFF
- -DUSE_SYSTEM_PROJECTM=ON
- $(cmake-utils_use cdda ENABLE_AUDIOCD)
- $(cmake-utils_use dbus ENABLE_DBUS)
- $(cmake-utils_use udisks ENABLE_DEVICEKIT)
- $(cmake-utils_use ipod ENABLE_LIBGPOD)
- $(cmake-utils_use lastfm ENABLE_LIBLASTFM)
- $(cmake-utils_use mtp ENABLE_LIBMTP)
- $(cmake-utils_use moodbar ENABLE_MOODBAR)
- -DENABLE_GIO=ON
- $(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
- $(cmake-utils_use projectm ENABLE_VISUALISATIONS)
- $(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '')
- $(cmake-utils_use box ENABLE_BOX)
- $(cmake-utils_use dropbox ENABLE_DROPBOX)
- $(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
- $(cmake-utils_use skydrive ENABLE_SKYDRIVE)
- $(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
- -DENABLE_SPOTIFY_BLOB=OFF
- -DENABLE_BREAKPAD=OFF
- #$(cmake-utils_use !system-sqlite STATIC_SQLITE)
- #$(cmake-utils_use system-sqlite I_HATE_MY_USERS)
- #$(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
- -DUSE_BUILTIN_TAGLIB=OFF
- -DUSE_SYSTEM_GMOCK=ON
- )
-
- use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd "${CMAKE_BUILD_DIR}" || die
- Xemake test
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index debdf11..79b9c7d 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -94,7 +94,6 @@ S="${WORKDIR}/C${MY_P:1}"
PATCHES=(
"${FILESDIR}"/${PN}-1.3_rc1-cmake.patch
- "${FILESDIR}"/${PN}-1.3_rc1-fix-tokenizer.patch
)
src_prepare() {
diff --git a/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch b/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch
deleted file mode 100644
index 8aefe97..0000000
--- a/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- Clementine-1.3rc1/CMakeLists.txt
-+++ Clementine-1.3rc1/CMakeLists.txt
-@@ -60,7 +60,7 @@
-
- pkg_check_modules(CDIO libcdio)
- pkg_check_modules(CHROMAPRINT REQUIRED libchromaprint)
--pkg_search_module(CRYPTOPP cryptopp libcrypto++)
-+#pkg_search_module(CRYPTOPP cryptopp libcrypto++)
- pkg_check_modules(GIO gio-2.0)
- pkg_check_modules(GLIB REQUIRED glib-2.0)
- pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
-@@ -71,7 +71,7 @@
- pkg_check_modules(GSTREAMER_TAG REQUIRED gstreamer-tag-1.0)
- pkg_check_modules(LIBGPOD libgpod-1.0>=0.7.92)
- pkg_check_modules(LIBMTP libmtp>=1.0)
--pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.9)
-+pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.8)
- pkg_check_modules(LIBPULSE libpulse)
- pkg_check_modules(LIBXML libxml-2.0)
- pkg_check_modules(QJSON REQUIRED QJson)
-@@ -275,13 +275,14 @@
-
- optional_component(VISUALISATIONS ON "Visualisations")
-
--if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
-- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
-- "code must be compiled in")
--elseif(CRYPTOPP_FOUND)
-+#if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
-+# message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
-+# "code must be compiled in")
-+#elseif(CRYPTOPP_FOUND)
- set(HAVE_CRYPTOPP ON)
-- set(HAVE_SPOTIFY_DOWNLOADER ON)
--endif()
-+ set(HAVE_SPOTIFY_DOWNLOADER OFF)
-+ set(HAVE_SPOTIFY_BLOB OFF)
-+#endif()
-
- # Find DBus if it's enabled
- if (HAVE_DBUS)
diff --git a/media-sound/clementine/files/clementine-1.3_rc1-fix-tokenizer.patch b/media-sound/clementine/files/clementine-1.3_rc1-fix-tokenizer.patch
deleted file mode 100644
index 6413bf7..0000000
--- a/media-sound/clementine/files/clementine-1.3_rc1-fix-tokenizer.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/clementine-player/Clementine/issues/5297
-
---- src/core/database.cpp
-+++ src/core/database.cpp
-@@ -265,6 +265,16 @@
- StaticInit();
-
- {
-+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
-+ QVariant v = db.driver()->handle();
-+ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
-+ sqlite3* handle = *static_cast<sqlite3**>(v.data());
-+ if (handle) {
-+ sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
-+ }
-+ }
-+#endif
-+
- QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db);
- set_fts_tokenizer.bindValue(":name", "unicode");
- set_fts_tokenizer.bindValue(
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2016-04-27 12:22 Lars Wendler
0 siblings, 0 replies; 16+ messages in thread
From: Lars Wendler @ 2016-04-27 12:22 UTC (permalink / raw
To: gentoo-commits
commit: df9bc12fb6abbbb7b2c33a9b608e3859b4a063ad
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 12:21:40 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 12:21:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df9bc12f
media-sound/clementine: Removed old.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-sound/clementine/Manifest | 1 -
media-sound/clementine/clementine-1.2.2.ebuild | 167 ---------------------
.../files/clementine-1.2.2-fix-build.patch | 25 ---
.../files/clementine-1.2.2-fix-build2.patch | 38 -----
.../clementine/files/clementine-1.2.2-gcc49.patch | 17 ---
5 files changed, 248 deletions(-)
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 624eb88..3839234 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,4 +1,3 @@
-DIST clementine-1.2.2.tar.gz 9076752 SHA256 1f674c42f05c476baf74f1dd37b1aa357ff9199e4493173052c856a53e5f0a96 SHA512 48e934ed1f18724c4cc79eaf7ac16dcb2ecc9d268a4986a8a421c6518d7a13bd81a5b7d249b4ff146c860bed520a59d2062139fb57672609019b8c2c84e495ca WHIRLPOOL 13c3f129566c0789e67b23b2382d7ed1f756221647c4b2cc1b4b1b1efcb5e04571837a843c8ff7c099f9bcd3f9b1dd481b1fa75fe1c4b27e90169026e8880840
DIST clementine-1.2.3.tar.gz 9076977 SHA256 7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf SHA512 fd43a7dcfec360d4478a56d0600300b6913b294f127afb0249971b45b54b48475d128861e06885c482bbdd37b09aa56b1c238675763fdb8c50329005b066bec3 WHIRLPOOL 23d0fb971118b0d73ec4a52cfa3f8829118ab65c12fb01ce30433541f5da081b52c5dd485aa0efdda2b4b57b286f59702aa686f9b7ce17a0a2595b208b95d524
DIST clementine-1.3.1.tar.gz 8501827 SHA256 f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c SHA512 1942a046be24a583b5e2095dd39dc736c1b14a47dc4aad61d6252c1fccf745c26d7b35da907a220d5dc8c0736f5b589d050ed9582de343aa3cb5abc607001790 WHIRLPOOL 20a57177dc740865f35c407b981e146d9ddec6aff39e662a27dfe0e238f3baa87b331cc6dc50eebf848279c8860fb74454b4997924e2d4d93357a870364af1a7
DIST clementine-1.3.tar.gz 8500723 SHA256 55e8d283ed02e3f2376a88b012cd2003e00fef95a98b6a919d67cb57e96b8617 SHA512 eccebb8a4d7e4abf39af7b75f40d38d184650932d2c40859cdfb3cfda24d2a35fea8518b03d9fb24f21c4dae6f11baffe2b00fe6989ec14fed99a4ccbb85ca54 WHIRLPOOL cbd6922fa586cce6be29ef0fd6151d6d89ce95aa6e237cf2716e7493ba6be2026d11a44012dc84be2e033c606c79c3e9e0338cbbd5927d7f16f358718c016895
diff --git a/media-sound/clementine/clementine-1.2.2.ebuild b/media-sound/clementine/clementine-1.2.2.ebuild
deleted file mode 100644
index 9e0a825..0000000
--- a/media-sound/clementine/clementine-1.2.2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es es_AR et eu fa fi fr ga gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa pl pt pt_BR ro ru sk sl sr sr@latin sv te tr uk uz vi zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == *9999* ]] && inherit git-2
-
-DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
-HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote"
-IUSE+="${LANGS// / linguas_}"
-
-REQUIRED_USE="
- udisks? ( dbus )
- wiimote? ( dbus )
-"
-
-# qca dep is temporary for bug #489850
-COMMON_DEPEND="
- app-crypt/qca:2[qt4(+)]
- >=dev-qt/qtgui-4.5:4
- dbus? ( >=dev-qt/qtdbus-4.5:4 )
- >=dev-qt/qtopengl-4.5:4
- >=dev-qt/qtsql-4.5:4[sqlite]
- system-sqlite? ( dev-db/sqlite[fts3(+)] )
- >=media-libs/taglib-1.8[mp4]
- >=dev-libs/glib-2.24.1-r1
- dev-libs/libxml2
- dev-libs/protobuf:=
- dev-libs/qjson
- media-libs/libechonest:=
- >=media-libs/libmygpo-qt-1.0.7
- >=media-libs/chromaprint-0.6
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
- virtual/glu
- virtual/opengl
- ayatana? ( dev-libs/libindicate-qt )
- cdda? ( dev-libs/libcdio )
- ipod? ( >=media-libs/libgpod-0.8.0 )
- lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- moodbar? ( sci-libs/fftw:3.0 )
- projectm? ( media-libs/glew )
-"
-# now only presets are used, libprojectm is internal
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
-RDEPEND="${COMMON_DEPEND}
- dbus? ( udisks? ( sys-fs/udisks:2 ) )
- mms? ( media-plugins/gst-plugins-libmms:0.10 )
- mtp? ( gnome-base/gvfs )
- projectm? ( >=media-libs/libprojectm-1.2.0 )
- media-plugins/gst-plugins-meta:0.10
- media-plugins/gst-plugins-gio:0.10
- media-plugins/gst-plugins-soup:0.10
- media-plugins/gst-plugins-taglib:0.10
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.39
- virtual/pkgconfig
- sys-devel/gettext
- dev-qt/qttest:4
- dev-cpp/gmock
- box? ( dev-cpp/sparsehash )
- dropbox? ( dev-cpp/sparsehash )
- googledrive? ( dev-cpp/sparsehash )
- skydrive? ( dev-cpp/sparsehash )
- ubuntu-one? ( dev-cpp/sparsehash )
- test? ( gnome-base/gsettings-desktop-schemas )
-"
-DOCS="Changelog"
-
-# https://github.com/clementine-player/Clementine/issues/3935
-RESTRICT="test"
-
-# Switch to ^ when we switch to EAPI=6.
-[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/C${P:1}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-build.patch
- "${FILESDIR}"/${P}-fix-build2.patch
- "${FILESDIR}"/${P}-gcc49.patch
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # some tests fail or hang
- sed -i \
- -e '/add_test_file(translations_test.cpp/d' \
- tests/CMakeLists.txt || die
-}
-
-src_configure() {
- local langs x
- for x in ${LANGS}; do
- use linguas_${x} && langs+=" ${x}"
- done
-
- # spotify is not in portage
- local mycmakeargs=(
- -DBUILD_WERROR=OFF
- -DLINGUAS="${langs}"
- -DBUNDLE_PROJECTM_PRESETS=OFF
- $(cmake-utils_use cdda ENABLE_AUDIOCD)
- $(cmake-utils_use dbus ENABLE_DBUS)
- $(cmake-utils_use udisks ENABLE_DEVICEKIT)
- $(cmake-utils_use ipod ENABLE_LIBGPOD)
- $(cmake-utils_use lastfm ENABLE_LIBLASTFM)
- $(cmake-utils_use mtp ENABLE_LIBMTP)
- $(cmake-utils_use moodbar ENABLE_MOODBAR)
- -DENABLE_GIO=ON
- $(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
- $(cmake-utils_use projectm ENABLE_VISUALISATIONS)
- $(cmake-utils_use ayatana ENABLE_SOUNDMENU)
- $(cmake-utils_use box ENABLE_BOX)
- $(cmake-utils_use dropbox ENABLE_DROPBOX)
- $(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
- $(cmake-utils_use skydrive ENABLE_SKYDRIVE)
- $(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
- -DENABLE_SPOTIFY_BLOB=OFF
- -DENABLE_BREAKPAD=OFF
- $(cmake-utils_use !system-sqlite STATIC_SQLITE)
- $(cmake-utils_use system-sqlite I_HATE_MY_USERS)
- $(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
- -DUSE_BUILTIN_TAGLIB=OFF
- -DUSE_SYSTEM_GMOCK=ON
- )
-
- use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd "${CMAKE_BUILD_DIR}" || die
- Xemake test
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-sound/clementine/files/clementine-1.2.2-fix-build.patch b/media-sound/clementine/files/clementine-1.2.2-fix-build.patch
deleted file mode 100644
index 7a83e31..0000000
--- a/media-sound/clementine/files/clementine-1.2.2-fix-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3df3a5b645737603af6bda844db04c431b9c8064 Mon Sep 17 00:00:00 2001
-From: John Maguire <john.maguire@gmail.com>
-Date: Thu, 6 Feb 2014 19:03:10 +0100
-Subject: [PATCH] Add missing header for syscall().
-
-This is cunningly not defined in syscall.h
----
- src/core/utilities.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
-index 6fce753..cb9a94d 100644
---- a/src/core/utilities.cpp
-+++ b/src/core/utilities.cpp
-@@ -52,6 +52,7 @@
- #endif
-
- #ifdef Q_OS_LINUX
-+# include <unistd.h>
- # include <sys/syscall.h>
- #endif
- #ifdef Q_OS_DARWIN
---
-1.8.5.5
-
diff --git a/media-sound/clementine/files/clementine-1.2.2-fix-build2.patch b/media-sound/clementine/files/clementine-1.2.2-fix-build2.patch
deleted file mode 100644
index 05ec92f..0000000
--- a/media-sound/clementine/files/clementine-1.2.2-fix-build2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7671108aa8d02658cd35cacf4337507cc80ea03a Mon Sep 17 00:00:00 2001
-From: John Maguire <john.maguire@gmail.com>
-Date: Thu, 6 Feb 2014 19:46:08 +0100
-Subject: [PATCH] Add missing include for symlink()
-
----
- src/internet/spotifyblobdownloader.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/internet/spotifyblobdownloader.cpp b/src/internet/spotifyblobdownloader.cpp
-index 9827d65..5bd12a0 100644
---- a/src/internet/spotifyblobdownloader.cpp
-+++ b/src/internet/spotifyblobdownloader.cpp
-@@ -15,8 +15,9 @@
- along with Clementine. If not, see <http://www.gnu.org/licenses/>.
- */
-
--#include "config.h"
- #include "spotifyblobdownloader.h"
-+
-+#include "config.h"
- #include "spotifyservice.h"
- #include "core/logging.h"
- #include "core/network.h"
-@@ -32,6 +33,10 @@
- #include <QtCrypto>
- #endif // HAVE_QCA
-
-+#ifdef Q_OS_UNIX
-+ #include <unistd.h>
-+#endif
-+
- const char* SpotifyBlobDownloader::kSignatureSuffix = ".sha1";
-
-
---
-1.8.5.5
-
diff --git a/media-sound/clementine/files/clementine-1.2.2-gcc49.patch b/media-sound/clementine/files/clementine-1.2.2-gcc49.patch
deleted file mode 100644
index 1192987..0000000
--- a/media-sound/clementine/files/clementine-1.2.2-gcc49.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-In file included from ../../Clementine-1.2.2/src/core/mergedproxymodel.cpp:18:0:
-../../Clementine-1.2.2/src/core/mergedproxymodel.h:23:12: error: 'std::placeholders' has not been declared
- using std::placeholders::_1;
-../../Clementine-1.2.2/src/core/mergedproxymodel.h:24:12: error: 'std::placeholders' has not been declared
- using std::placeholders::_2;
-
-
---- a/src/core/mergedproxymodel.h
-+++ b/src/core/mergedproxymodel.h
-@@ -19,6 +19,7 @@
- #define MERGEDPROXYMODEL_H
-
- #include <QAbstractProxyModel>
-+#include <functional>
-
- using std::placeholders::_1;
- using std::placeholders::_2;
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2016-05-03 14:59 Lars Wendler
0 siblings, 0 replies; 16+ messages in thread
From: Lars Wendler @ 2016-05-03 14:59 UTC (permalink / raw
To: gentoo-commits
commit: 30db61f8b0b251adb75237b0535199436e04a71e
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Sat Apr 30 15:21:30 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 3 14:48:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30db61f8
media-sound/clementine: several cleanups and fixes
- Clean up dependencies
- Fix dependencies upon dev-libs/crypto++ (see 580134)
- Synchronise live ebuild with latest release
- Remove obsolte comments
- Reorder cmake params
- Reenable testing
- add missing USE flags:
* added 3 missing USE flags in ebuilds of recent version: amazoncloud,
pulseaudio and vkontakte
* removed USE=ubuntu-one due to remove in upstream
* slightly change description for other USEs
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-sound/clementine/clementine-1.3.1.ebuild | 49 +++++++-------
media-sound/clementine/clementine-1.3.ebuild | 49 +++++++-------
media-sound/clementine/clementine-9999.ebuild | 78 +++++++++++-----------
.../files/clementine-1.3_rc1-cmake.patch | 32 ---------
media-sound/clementine/metadata.xml | 4 +-
5 files changed, 92 insertions(+), 120 deletions(-)
diff --git a/media-sound/clementine/clementine-1.3.1.ebuild b/media-sound/clementine/clementine-1.3.1.ebuild
index 2e12657..b348bfe 100644
--- a/media-sound/clementine/clementine-1.3.1.ebuild
+++ b/media-sound/clementine/clementine-1.3.1.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == *9999* ]] && inherit git-2
+[[ ${PV} == *9999* ]] && inherit git-r3
DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
@@ -20,7 +20,7 @@ LICENSE="GPL-3"
SLOT="0"
[[ ${PV} == *9999* ]] || \
KEYWORDS="~amd64 ~x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote"
+IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote"
IUSE+="${LANGS// / linguas_}"
REQUIRED_USE="
@@ -28,7 +28,6 @@ REQUIRED_USE="
wiimote? ( dbus )
"
-# qca dep is temporary for bug #489850
COMMON_DEPEND="
dev-db/sqlite:=
>=dev-libs/glib-2.24.1-r1
@@ -38,7 +37,7 @@ COMMON_DEPEND="
>=dev-qt/qtcore-4.5:4
>=dev-qt/qtgui-4.5:4
>=dev-qt/qtopengl-4.5:4
- >=dev-qt/qtsql-4.5:4[sqlite]
+ >=dev-qt/qtsql-4.5:4
>=media-libs/chromaprint-0.6
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -46,6 +45,7 @@ COMMON_DEPEND="
>=media-libs/libmygpo-qt-1.0.8
>=media-libs/taglib-1.8[mp4]
sys-libs/zlib
+ dev-libs/crypto++
virtual/glu
virtual/opengl
x11-libs/libX11
@@ -55,16 +55,19 @@ COMMON_DEPEND="
lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
mtp? ( >=media-libs/libmtp-1.0.0 )
moodbar? ( sci-libs/fftw:3.0 )
- projectm? ( media-libs/glew:= )
+ projectm? ( media-libs/glew:=
+ >=media-libs/libprojectm-1.2.0 )
"
-# now only presets are used, libprojectm is internal
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches:
# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
RDEPEND="${COMMON_DEPEND}
dbus? ( udisks? ( sys-fs/udisks:2 ) )
mms? ( media-plugins/gst-plugins-libmms:1.0 )
mtp? ( gnome-base/gvfs )
- projectm? ( >=media-libs/libprojectm-1.2.0 )
media-plugins/gst-plugins-meta:1.0
media-plugins/gst-plugins-soup:1.0
media-plugins/gst-plugins-taglib:1.0
@@ -75,27 +78,21 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext
dev-qt/qttest:4
dev-cpp/gmock
+ amazoncloud? ( dev-cpp/sparsehash )
box? ( dev-cpp/sparsehash )
dropbox? ( dev-cpp/sparsehash )
googledrive? ( dev-cpp/sparsehash )
+ pulseaudio? ( media-sound/pulseaudio )
skydrive? ( dev-cpp/sparsehash )
- ubuntu-one? ( dev-cpp/sparsehash )
test? ( gnome-base/gsettings-desktop-schemas )
"
-DOCS="Changelog"
-
-# https://github.com/clementine-player/Clementine/issues/3935
-RESTRICT="test"
+DOCS=(Changelog README.md)
MY_P="${P/_}"
-# Switch to ^ when we switch to EAPI=6.
[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/C${MY_P:1}"
+S="${WORKDIR}/${MY_P^}"
-PATCHES=(
- "${FILESDIR}/${PN}-1.3_rc1-cmake.patch"
- "${FILESDIR}/${PN}-1.3-fix-tokenizer.patch"
-)
+PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
src_prepare() {
cmake-utils_src_prepare
@@ -116,8 +113,7 @@ src_configure() {
local mycmakeargs=(
-DBUILD_WERROR=OFF
-DLINGUAS="${langs}"
- -DBUNDLE_PROJECTM_PRESETS=OFF
- -DUSE_SYSTEM_PROJECTM=ON
+ -DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)"
-DENABLE_AUDIOCD="$(usex cdda)"
-DENABLE_DBUS="$(usex dbus)"
-DENABLE_DEVICEKIT="$(usex udisks)"
@@ -128,16 +124,21 @@ src_configure() {
-DENABLE_GIO=ON
-DENABLE_WIIMOTEDEV="$(usex wiimote)"
-DENABLE_VISUALISATIONS="$(usex projectm)"
- $(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '')
-DENABLE_BOX="$(usex box)"
-DENABLE_DROPBOX="$(usex dropbox)"
-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+ -DENABLE_LIBPULSE="$(usex pulseaudio)"
-DENABLE_SKYDRIVE="$(usex skydrive)"
- -DENABLE_UBUNTU_ONE="$(usex ubuntu-one)"
+ -DENABLE_VK="$(usex vkontakte)"
-DENABLE_SPOTIFY_BLOB=OFF
- -DENABLE_BREAKPAD=OFF
+ -DENABLE_BREAKPAD=OFF #< disable crash reporting
-DUSE_BUILTIN_TAGLIB=OFF
-DUSE_SYSTEM_GMOCK=ON
+ -DUSE_SYSTEM_PROJECTM=ON
+ -DBUNDLE_PROJECTM_PRESETS=OFF
+ # force to find crypto++ see bug #548544
+ -DCRYPTOPP_LIBRARIES="crypto++"
+ -DCRYPTOPP_FOUND=ON
)
use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
diff --git a/media-sound/clementine/clementine-1.3.ebuild b/media-sound/clementine/clementine-1.3.ebuild
index 2e12657..b348bfe 100644
--- a/media-sound/clementine/clementine-1.3.ebuild
+++ b/media-sound/clementine/clementine-1.3.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == *9999* ]] && inherit git-2
+[[ ${PV} == *9999* ]] && inherit git-r3
DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
@@ -20,7 +20,7 @@ LICENSE="GPL-3"
SLOT="0"
[[ ${PV} == *9999* ]] || \
KEYWORDS="~amd64 ~x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote"
+IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote"
IUSE+="${LANGS// / linguas_}"
REQUIRED_USE="
@@ -28,7 +28,6 @@ REQUIRED_USE="
wiimote? ( dbus )
"
-# qca dep is temporary for bug #489850
COMMON_DEPEND="
dev-db/sqlite:=
>=dev-libs/glib-2.24.1-r1
@@ -38,7 +37,7 @@ COMMON_DEPEND="
>=dev-qt/qtcore-4.5:4
>=dev-qt/qtgui-4.5:4
>=dev-qt/qtopengl-4.5:4
- >=dev-qt/qtsql-4.5:4[sqlite]
+ >=dev-qt/qtsql-4.5:4
>=media-libs/chromaprint-0.6
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -46,6 +45,7 @@ COMMON_DEPEND="
>=media-libs/libmygpo-qt-1.0.8
>=media-libs/taglib-1.8[mp4]
sys-libs/zlib
+ dev-libs/crypto++
virtual/glu
virtual/opengl
x11-libs/libX11
@@ -55,16 +55,19 @@ COMMON_DEPEND="
lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
mtp? ( >=media-libs/libmtp-1.0.0 )
moodbar? ( sci-libs/fftw:3.0 )
- projectm? ( media-libs/glew:= )
+ projectm? ( media-libs/glew:=
+ >=media-libs/libprojectm-1.2.0 )
"
-# now only presets are used, libprojectm is internal
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches:
# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
RDEPEND="${COMMON_DEPEND}
dbus? ( udisks? ( sys-fs/udisks:2 ) )
mms? ( media-plugins/gst-plugins-libmms:1.0 )
mtp? ( gnome-base/gvfs )
- projectm? ( >=media-libs/libprojectm-1.2.0 )
media-plugins/gst-plugins-meta:1.0
media-plugins/gst-plugins-soup:1.0
media-plugins/gst-plugins-taglib:1.0
@@ -75,27 +78,21 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext
dev-qt/qttest:4
dev-cpp/gmock
+ amazoncloud? ( dev-cpp/sparsehash )
box? ( dev-cpp/sparsehash )
dropbox? ( dev-cpp/sparsehash )
googledrive? ( dev-cpp/sparsehash )
+ pulseaudio? ( media-sound/pulseaudio )
skydrive? ( dev-cpp/sparsehash )
- ubuntu-one? ( dev-cpp/sparsehash )
test? ( gnome-base/gsettings-desktop-schemas )
"
-DOCS="Changelog"
-
-# https://github.com/clementine-player/Clementine/issues/3935
-RESTRICT="test"
+DOCS=(Changelog README.md)
MY_P="${P/_}"
-# Switch to ^ when we switch to EAPI=6.
[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/C${MY_P:1}"
+S="${WORKDIR}/${MY_P^}"
-PATCHES=(
- "${FILESDIR}/${PN}-1.3_rc1-cmake.patch"
- "${FILESDIR}/${PN}-1.3-fix-tokenizer.patch"
-)
+PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
src_prepare() {
cmake-utils_src_prepare
@@ -116,8 +113,7 @@ src_configure() {
local mycmakeargs=(
-DBUILD_WERROR=OFF
-DLINGUAS="${langs}"
- -DBUNDLE_PROJECTM_PRESETS=OFF
- -DUSE_SYSTEM_PROJECTM=ON
+ -DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)"
-DENABLE_AUDIOCD="$(usex cdda)"
-DENABLE_DBUS="$(usex dbus)"
-DENABLE_DEVICEKIT="$(usex udisks)"
@@ -128,16 +124,21 @@ src_configure() {
-DENABLE_GIO=ON
-DENABLE_WIIMOTEDEV="$(usex wiimote)"
-DENABLE_VISUALISATIONS="$(usex projectm)"
- $(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '')
-DENABLE_BOX="$(usex box)"
-DENABLE_DROPBOX="$(usex dropbox)"
-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+ -DENABLE_LIBPULSE="$(usex pulseaudio)"
-DENABLE_SKYDRIVE="$(usex skydrive)"
- -DENABLE_UBUNTU_ONE="$(usex ubuntu-one)"
+ -DENABLE_VK="$(usex vkontakte)"
-DENABLE_SPOTIFY_BLOB=OFF
- -DENABLE_BREAKPAD=OFF
+ -DENABLE_BREAKPAD=OFF #< disable crash reporting
-DUSE_BUILTIN_TAGLIB=OFF
-DUSE_SYSTEM_GMOCK=ON
+ -DUSE_SYSTEM_PROJECTM=ON
+ -DBUNDLE_PROJECTM_PRESETS=OFF
+ # force to find crypto++ see bug #548544
+ -DCRYPTOPP_LIBRARIES="crypto++"
+ -DCRYPTOPP_FOUND=ON
)
use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index bfac234..b348bfe 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -2,14 +2,14 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == *9999* ]] && inherit git-2
+[[ ${PV} == *9999* ]] && inherit git-r3
DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
@@ -20,7 +20,7 @@ LICENSE="GPL-3"
SLOT="0"
[[ ${PV} == *9999* ]] || \
KEYWORDS="~amd64 ~x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote"
+IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote"
IUSE+="${LANGS// / linguas_}"
REQUIRED_USE="
@@ -28,7 +28,6 @@ REQUIRED_USE="
wiimote? ( dbus )
"
-# qca dep is temporary for bug #489850
COMMON_DEPEND="
dev-db/sqlite:=
>=dev-libs/glib-2.24.1-r1
@@ -38,7 +37,7 @@ COMMON_DEPEND="
>=dev-qt/qtcore-4.5:4
>=dev-qt/qtgui-4.5:4
>=dev-qt/qtopengl-4.5:4
- >=dev-qt/qtsql-4.5:4[sqlite]
+ >=dev-qt/qtsql-4.5:4
>=media-libs/chromaprint-0.6
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -46,6 +45,7 @@ COMMON_DEPEND="
>=media-libs/libmygpo-qt-1.0.8
>=media-libs/taglib-1.8[mp4]
sys-libs/zlib
+ dev-libs/crypto++
virtual/glu
virtual/opengl
x11-libs/libX11
@@ -55,17 +55,19 @@ COMMON_DEPEND="
lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
mtp? ( >=media-libs/libmtp-1.0.0 )
moodbar? ( sci-libs/fftw:3.0 )
- projectm? ( media-libs/glew:= )
- >=dev-libs/crypto++-5.6.2-r4
+ projectm? ( media-libs/glew:=
+ >=media-libs/libprojectm-1.2.0 )
"
-# now only presets are used, libprojectm is internal
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches:
# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
RDEPEND="${COMMON_DEPEND}
dbus? ( udisks? ( sys-fs/udisks:2 ) )
mms? ( media-plugins/gst-plugins-libmms:1.0 )
mtp? ( gnome-base/gvfs )
- projectm? ( >=media-libs/libprojectm-1.2.0 )
media-plugins/gst-plugins-meta:1.0
media-plugins/gst-plugins-soup:1.0
media-plugins/gst-plugins-taglib:1.0
@@ -76,22 +78,19 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext
dev-qt/qttest:4
dev-cpp/gmock
+ amazoncloud? ( dev-cpp/sparsehash )
box? ( dev-cpp/sparsehash )
dropbox? ( dev-cpp/sparsehash )
googledrive? ( dev-cpp/sparsehash )
+ pulseaudio? ( media-sound/pulseaudio )
skydrive? ( dev-cpp/sparsehash )
- ubuntu-one? ( dev-cpp/sparsehash )
test? ( gnome-base/gsettings-desktop-schemas )
"
-DOCS="Changelog"
-
-# https://github.com/clementine-player/Clementine/issues/3935
-RESTRICT="test"
+DOCS=(Changelog README.md)
MY_P="${P/_}"
-# Switch to ^ when we switch to EAPI=6.
[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/C${MY_P:1}"
+S="${WORKDIR}/${MY_P^}"
PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
@@ -114,31 +113,32 @@ src_configure() {
local mycmakeargs=(
-DBUILD_WERROR=OFF
-DLINGUAS="${langs}"
- -DBUNDLE_PROJECTM_PRESETS=OFF
- -DUSE_SYSTEM_PROJECTM=ON
- $(cmake-utils_use cdda ENABLE_AUDIOCD)
- $(cmake-utils_use dbus ENABLE_DBUS)
- $(cmake-utils_use udisks ENABLE_DEVICEKIT)
- $(cmake-utils_use ipod ENABLE_LIBGPOD)
- $(cmake-utils_use lastfm ENABLE_LIBLASTFM)
- $(cmake-utils_use mtp ENABLE_LIBMTP)
- $(cmake-utils_use moodbar ENABLE_MOODBAR)
+ -DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)"
+ -DENABLE_AUDIOCD="$(usex cdda)"
+ -DENABLE_DBUS="$(usex dbus)"
+ -DENABLE_DEVICEKIT="$(usex udisks)"
+ -DENABLE_LIBGPOD="$(usex ipod)"
+ -DENABLE_LIBLASTFM="$(usex lastfm)"
+ -DENABLE_LIBMTP="$(usex mtp)"
+ -DENABLE_MOODBAR="$(usex moodbar)"
-DENABLE_GIO=ON
- $(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
- $(cmake-utils_use projectm ENABLE_VISUALISATIONS)
- $(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '')
- $(cmake-utils_use box ENABLE_BOX)
- $(cmake-utils_use dropbox ENABLE_DROPBOX)
- $(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
- $(cmake-utils_use skydrive ENABLE_SKYDRIVE)
- $(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
+ -DENABLE_WIIMOTEDEV="$(usex wiimote)"
+ -DENABLE_VISUALISATIONS="$(usex projectm)"
+ -DENABLE_BOX="$(usex box)"
+ -DENABLE_DROPBOX="$(usex dropbox)"
+ -DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+ -DENABLE_LIBPULSE="$(usex pulseaudio)"
+ -DENABLE_SKYDRIVE="$(usex skydrive)"
+ -DENABLE_VK="$(usex vkontakte)"
-DENABLE_SPOTIFY_BLOB=OFF
- -DENABLE_BREAKPAD=OFF
- #$(cmake-utils_use !system-sqlite STATIC_SQLITE)
- #$(cmake-utils_use system-sqlite I_HATE_MY_USERS)
- #$(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
+ -DENABLE_BREAKPAD=OFF #< disable crash reporting
-DUSE_BUILTIN_TAGLIB=OFF
-DUSE_SYSTEM_GMOCK=ON
+ -DUSE_SYSTEM_PROJECTM=ON
+ -DBUNDLE_PROJECTM_PRESETS=OFF
+ # force to find crypto++ see bug #548544
+ -DCRYPTOPP_LIBRARIES="crypto++"
+ -DCRYPTOPP_FOUND=ON
)
use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
@@ -148,7 +148,7 @@ src_configure() {
src_test() {
cd "${CMAKE_BUILD_DIR}" || die
- Xemake test
+ virtx emake test
}
pkg_preinst() {
diff --git a/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch b/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch
deleted file mode 100644
index 22a922b..0000000
--- a/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- Clementine-1.3rc1/CMakeLists.txt
-+++ Clementine-1.3rc1/CMakeLists.txt
-@@ -60,7 +60,7 @@
-
- pkg_check_modules(CDIO libcdio)
- pkg_check_modules(CHROMAPRINT REQUIRED libchromaprint)
--pkg_search_module(CRYPTOPP cryptopp libcrypto++)
-+#pkg_search_module(CRYPTOPP cryptopp libcrypto++)
- pkg_check_modules(GIO gio-2.0)
- pkg_check_modules(GLIB REQUIRED glib-2.0)
- pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
-@@ -275,13 +275,14 @@
-
- optional_component(VISUALISATIONS ON "Visualisations")
-
--if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
-- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
-- "code must be compiled in")
--elseif(CRYPTOPP_FOUND)
-+#if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
-+# message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
-+# "code must be compiled in")
-+#elseif(CRYPTOPP_FOUND)
- set(HAVE_CRYPTOPP ON)
-- set(HAVE_SPOTIFY_DOWNLOADER ON)
--endif()
-+ set(HAVE_SPOTIFY_DOWNLOADER OFF)
-+ set(HAVE_SPOTIFY_BLOB OFF)
-+#endif()
-
- # Find DBus if it's enabled
- if (HAVE_DBUS)
diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml
index eda2d27..64bd4a1 100644
--- a/media-sound/clementine/metadata.xml
+++ b/media-sound/clementine/metadata.xml
@@ -14,7 +14,8 @@
<name>Gentoo Sound project</name>
</maintainer>
<use>
- <flag name="box">Enable Box support</flag>
+ <flag name="amazoncloud">Enable Amazon cloud drive support</flag>
+ <flag name="box">Enable filesharing via Box.com</flag>
<flag name="dropbox">Enable Dropbox support</flag>
<flag name="googledrive">Enable Google Drive support</flag>
<flag name="lastfm">Use liblastfm for fetching song info, scrobbling and radio streams</flag>
@@ -23,6 +24,7 @@
<flag name="skydrive">Enable Skydrive support</flag>
<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg> installation</flag>
<flag name="ubuntu-one">Enable Ubuntu One support</flag>
+ <flag name="vkontakte">Enable vk.com support</flag>
<flag name="wiimote">Enable support for Wii remote</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2016-09-13 8:04 David Seifert
0 siblings, 0 replies; 16+ messages in thread
From: David Seifert @ 2016-09-13 8:04 UTC (permalink / raw
To: gentoo-commits
commit: 1d8124918ec0cf8cec6dbac8aa84cbd84855b2ea
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Mon Sep 12 17:27:32 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 07:49:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d812491
media-sound/clementine: fix desktop file QA notice
This fixes QA notice complaning that OnlyShowIn key for action groups is
deprecated.
See gentoo bug 460412#3
Closes: https://github.com/gentoo/gentoo/pull/2311
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...-1.3.1-r2.ebuild => clementine-1.3.1-r3.ebuild} | 1 +
.../files/clementine-1.3.1-fix-desktop-file.patch | 52 ++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/media-sound/clementine/clementine-1.3.1-r2.ebuild b/media-sound/clementine/clementine-1.3.1-r3.ebuild
similarity index 99%
rename from media-sound/clementine/clementine-1.3.1-r2.ebuild
rename to media-sound/clementine/clementine-1.3.1-r3.ebuild
index 18f42ef..d0baf97 100644
--- a/media-sound/clementine/clementine-1.3.1-r2.ebuild
+++ b/media-sound/clementine/clementine-1.3.1-r3.ebuild
@@ -94,6 +94,7 @@ S="${WORKDIR}/${MY_P^}"
PATCHES=(
"${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch
+ "${FILESDIR}"/${P}-fix-desktop-file.patch
)
src_prepare() {
diff --git a/media-sound/clementine/files/clementine-1.3.1-fix-desktop-file.patch b/media-sound/clementine/files/clementine-1.3.1-fix-desktop-file.patch
new file mode 100644
index 00000000..bb56131
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3.1-fix-desktop-file.patch
@@ -0,0 +1,52 @@
+This patch fixes gentoo QA notices against the desktop file (see gentoo bug 460412#3)
+Based upon patch extracted from upstream git; original patch info:
+commit 04f73d125365d97fa6f72677ec5d220292690e56
+Author: Golubev Alexander <fatzer2@gmail.com>
+Date: Mon Jul 18 13:45:03 2016 +0400
+
+ Remove OnlyShowIn=Unity from clementine.desktop's action sections (#5444)
+
+diff --git a/dist/clementine.desktop b/dist/clementine.desktop
+index 2fb9559..9ee881e 100644
+--- a/dist/clementine.desktop
++++ b/dist/clementine.desktop
+@@ -38,7 +38,6 @@ Actions=Play;Pause;Stop;Previous;Next;
+ [Desktop Action Play]
+ Name=Play
+ Exec=clementine --play
+-OnlyShowIn=Unity;
+ Name[af]=Speel
+ Name[be]=Прайграць
+ Name[bg]=Възпроизвеждане
+@@ -89,7 +88,6 @@ Name[zh_TW]=播放
+ [Desktop Action Pause]
+ Name=Pause
+ Exec=clementine --pause
+-OnlyShowIn=Unity;
+ Name[be]=Прыпыніць
+ Name[bg]=Пауза
+ Name[br]=Ehan
+@@ -135,7 +133,6 @@ Name[zh_TW]=暫停
+ [Desktop Action Stop]
+ Name=Stop
+ Exec=clementine --stop
+-OnlyShowIn=Unity;
+ Name[be]=Спыніць
+ Name[bg]=Спиране
+ Name[br]=Paouez
+@@ -184,7 +181,6 @@ Name[zh_TW]=停止
+ [Desktop Action Previous]
+ Name=Previous
+ Exec=clementine --previous
+-OnlyShowIn=Unity;
+ Name[af]=Vorige
+ Name[be]=Папярэдні
+ Name[bg]=Предишна
+@@ -232,7 +228,6 @@ Name[zh_TW]=往前
+ [Desktop Action Next]
+ Name=Next
+ Exec=clementine --next
+-OnlyShowIn=Unity;
+ Name[af]=Volgende
+ Name[be]=Далей
+ Name[bg]=Следваща
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2016-12-26 16:14 Lars Wendler
0 siblings, 0 replies; 16+ messages in thread
From: Lars Wendler @ 2016-12-26 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 38d0e53184badc23e1fa9f2d532f276b2f729e0f
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 16:13:27 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 16:13:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d0e531
media-sound/clementine: Fixed building against >=media-libs/chromaprint-1.4
This fixes Gentoo bug #603662
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-sound/clementine/clementine-1.3.1-r4.ebuild | 1 +
.../files/clementine-chromaprint14.patch | 41 ++++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/media-sound/clementine/clementine-1.3.1-r4.ebuild b/media-sound/clementine/clementine-1.3.1-r4.ebuild
index ed118c2..a61c2fe 100644
--- a/media-sound/clementine/clementine-1.3.1-r4.ebuild
+++ b/media-sound/clementine/clementine-1.3.1-r4.ebuild
@@ -95,6 +95,7 @@ S="${WORKDIR}/${MY_P^}"
PATCHES=(
"${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch
"${FILESDIR}"/${P}-fix-desktop-file.patch
+ "${FILESDIR}"/${PN}-chromaprint14.patch #603662
)
src_prepare() {
diff --git a/media-sound/clementine/files/clementine-chromaprint14.patch b/media-sound/clementine/files/clementine-chromaprint14.patch
new file mode 100644
index 00000000..bfdc492
--- /dev/null
+++ b/media-sound/clementine/files/clementine-chromaprint14.patch
@@ -0,0 +1,41 @@
+From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001
+From: Chocobozzz <florian.bigard@gmail.com>
+Date: Thu, 8 Dec 2016 23:12:17 +0100
+Subject: [PATCH] Add compatibility with chromaprint >= 1.4
+
+---
+ src/musicbrainz/chromaprinter.cpp | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp
+index 9579b62..c7ad99e 100644
+--- a/src/musicbrainz/chromaprinter.cpp
++++ b/src/musicbrainz/chromaprinter.cpp
+@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() {
+ ChromaprintContext* chromaprint =
+ chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT);
+ chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels);
+- chromaprint_feed(chromaprint, reinterpret_cast<void*>(data.data()),
++ chromaprint_feed(chromaprint, reinterpret_cast<int16_t *>(data.data()),
+ data.size() / 2);
+ chromaprint_finish(chromaprint);
+
+- void* fprint = nullptr;
+ int size = 0;
++
++#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4
++ u_int32_t *fprint = nullptr;
++ char *encoded = nullptr;
++#else
++ void *fprint = nullptr;
++ void *encoded = nullptr;
++#endif
++
+ int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size);
++
+ QByteArray fingerprint;
+ if (ret == 1) {
+- void* encoded = nullptr;
+ int encoded_size = 0;
+ chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT,
+ &encoded, &encoded_size, 1);
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2017-01-04 15:07 Lars Wendler
0 siblings, 0 replies; 16+ messages in thread
From: Lars Wendler @ 2017-01-04 15:07 UTC (permalink / raw
To: gentoo-commits
commit: aae3b9701faba2fce4d87edb8f53a7a56a3d0df5
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 4 15:07:10 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 15:07:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aae3b970
media-sound/clementine: Removed old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-sound/clementine/Manifest | 1 -
media-sound/clementine/clementine-1.2.3-r2.ebuild | 169 -------------------
media-sound/clementine/clementine-1.2.3.ebuild | 169 -------------------
...tine-1.2.3-hide_boost_includes_from_q_moc.patch | 181 ---------------------
.../files/clementine-1.2.3-namespaces.patch | 36 ----
5 files changed, 556 deletions(-)
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index c30a99a..cc01afb 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,2 +1 @@
-DIST clementine-1.2.3.tar.gz 9076977 SHA256 7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf SHA512 fd43a7dcfec360d4478a56d0600300b6913b294f127afb0249971b45b54b48475d128861e06885c482bbdd37b09aa56b1c238675763fdb8c50329005b066bec3 WHIRLPOOL 23d0fb971118b0d73ec4a52cfa3f8829118ab65c12fb01ce30433541f5da081b52c5dd485aa0efdda2b4b57b286f59702aa686f9b7ce17a0a2595b208b95d524
DIST clementine-1.3.1.tar.gz 8501827 SHA256 f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c SHA512 1942a046be24a583b5e2095dd39dc736c1b14a47dc4aad61d6252c1fccf745c26d7b35da907a220d5dc8c0736f5b589d050ed9582de343aa3cb5abc607001790 WHIRLPOOL 20a57177dc740865f35c407b981e146d9ddec6aff39e662a27dfe0e238f3baa87b331cc6dc50eebf848279c8860fb74454b4997924e2d4d93357a870364af1a7
diff --git a/media-sound/clementine/clementine-1.2.3-r2.ebuild b/media-sound/clementine/clementine-1.2.3-r2.ebuild
deleted file mode 100644
index 7b60fa8..00000000
--- a/media-sound/clementine/clementine-1.2.3-r2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es es_AR et eu fa fi fr ga gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa pl pt pt_BR ro ru sk sl sr sr@latin sv te tr uk uz vi zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == *9999* ]] && inherit git-2
-
-DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
-HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote"
-IUSE+="${LANGS// / linguas_}"
-
-REQUIRED_USE="
- udisks? ( dbus )
- wiimote? ( dbus )
-"
-
-# qca dep is temporary for bug #489850
-COMMON_DEPEND="
- app-crypt/qca:2[qt4(+)]
- >=dev-qt/qtcore-4.5:4[ssl]
- >=dev-qt/qtgui-4.5:4
- dbus? ( >=dev-qt/qtdbus-4.5:4 )
- >=dev-qt/qtopengl-4.5:4
- >=dev-qt/qtsql-4.5:4[sqlite]
- system-sqlite? ( dev-db/sqlite:3[fts3(+)] )
- >=media-libs/taglib-1.8[mp4(+)]
- >=dev-libs/glib-2.24.1-r1
- dev-libs/libxml2
- dev-libs/protobuf:=
- dev-libs/qjson
- media-libs/libechonest:=[qt4(+)]
- >=media-libs/libmygpo-qt-1.0.7[qt4(+)]
- >=media-libs/chromaprint-0.6
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
- sys-libs/zlib
- virtual/glu
- virtual/opengl
- x11-libs/libX11
- ayatana? ( dev-libs/libindicate-qt )
- cdda? ( dev-libs/libcdio )
- ipod? ( >=media-libs/libgpod-0.8.0 )
- lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- moodbar? ( sci-libs/fftw:3.0 )
- projectm? ( media-libs/glew:= )
-"
-# now only presets are used, libprojectm is internal
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
-RDEPEND="${COMMON_DEPEND}
- dbus? ( udisks? ( sys-fs/udisks:0 ) )
- mms? ( media-plugins/gst-plugins-libmms:0.10 )
- mtp? ( gnome-base/gvfs[mtp] )
- projectm? ( >=media-libs/libprojectm-1.2.0 )
- media-plugins/gst-plugins-meta:0.10
- media-plugins/gst-plugins-gio:0.10
- media-plugins/gst-plugins-soup:0.10
- media-plugins/gst-plugins-taglib:0.10
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.39:=
- virtual/pkgconfig
- sys-devel/gettext
- dev-qt/qttest:4
- dev-cpp/gmock
- box? ( dev-cpp/sparsehash )
- dropbox? ( dev-cpp/sparsehash )
- googledrive? ( dev-cpp/sparsehash )
- skydrive? ( dev-cpp/sparsehash )
- ubuntu-one? ( dev-cpp/sparsehash )
- test? ( gnome-base/gsettings-desktop-schemas )
-"
-DOCS="Changelog"
-
-# https://github.com/clementine-player/Clementine/issues/3935
-RESTRICT="test"
-
-# Switch to ^ when we switch to EAPI=6.
-[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/C${P:1}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.2.3-namespaces.patch"
- "${FILESDIR}/${P}-hide_boost_includes_from_q_moc.patch"
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # some tests fail or hang
- sed -i \
- -e '/add_test_file(translations_test.cpp/d' \
- tests/CMakeLists.txt || die
-}
-
-src_configure() {
- local langs x
- for x in ${LANGS}; do
- use linguas_${x} && langs+=" ${x}"
- done
-
- # spotify is not in portage
- local mycmakeargs=(
- -DBUILD_WERROR=OFF
- -DLINGUAS="${langs}"
- -DBUNDLE_PROJECTM_PRESETS=OFF
- $(cmake-utils_use cdda ENABLE_AUDIOCD)
- $(cmake-utils_use dbus ENABLE_DBUS)
- $(cmake-utils_use udisks ENABLE_DEVICEKIT)
- $(cmake-utils_use ipod ENABLE_LIBGPOD)
- $(cmake-utils_use lastfm ENABLE_LIBLASTFM)
- $(cmake-utils_use mtp ENABLE_LIBMTP)
- $(cmake-utils_use moodbar ENABLE_MOODBAR)
- -DENABLE_GIO=ON
- $(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
- $(cmake-utils_use projectm ENABLE_VISUALISATIONS)
- $(cmake-utils_use ayatana ENABLE_SOUNDMENU)
- $(cmake-utils_use box ENABLE_BOX)
- $(cmake-utils_use dropbox ENABLE_DROPBOX)
- $(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
- $(cmake-utils_use skydrive ENABLE_SKYDRIVE)
- $(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
- -DENABLE_SPOTIFY_BLOB=OFF
- -DENABLE_BREAKPAD=OFF
- $(cmake-utils_use !system-sqlite STATIC_SQLITE)
- $(cmake-utils_use system-sqlite I_HATE_MY_USERS)
- $(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
- -DUSE_BUILTIN_TAGLIB=OFF
- -DUSE_SYSTEM_GMOCK=ON
- )
-
- use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd "${CMAKE_BUILD_DIR}" || die
- Xemake test
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-sound/clementine/clementine-1.2.3.ebuild b/media-sound/clementine/clementine-1.2.3.ebuild
deleted file mode 100644
index 7c4c956..00000000
--- a/media-sound/clementine/clementine-1.2.3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es es_AR et eu fa fi fr ga gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa pl pt pt_BR ro ru sk sl sr sr@latin sv te tr uk uz vi zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
-[[ ${PV} == *9999* ]] && inherit git-2
-
-DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
-HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote"
-IUSE+="${LANGS// / linguas_}"
-
-REQUIRED_USE="
- udisks? ( dbus )
- wiimote? ( dbus )
-"
-
-# qca dep is temporary for bug #489850
-COMMON_DEPEND="
- app-crypt/qca:2[qt4(+)]
- >=dev-qt/qtcore-4.5:4[ssl]
- >=dev-qt/qtgui-4.5:4
- dbus? ( >=dev-qt/qtdbus-4.5:4 )
- >=dev-qt/qtopengl-4.5:4
- >=dev-qt/qtsql-4.5:4[sqlite]
- system-sqlite? ( dev-db/sqlite:3[fts3(+)] )
- >=media-libs/taglib-1.8[mp4(+)]
- >=dev-libs/glib-2.24.1-r1
- dev-libs/libxml2
- dev-libs/protobuf:=
- dev-libs/qjson
- media-libs/libechonest:=[qt4(+)]
- >=media-libs/libmygpo-qt-1.0.7[qt4(+)]
- >=media-libs/chromaprint-0.6
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
- sys-libs/zlib
- virtual/glu
- virtual/opengl
- x11-libs/libX11
- ayatana? ( dev-libs/libindicate-qt )
- cdda? ( dev-libs/libcdio )
- ipod? ( >=media-libs/libgpod-0.8.0 )
- lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- moodbar? ( sci-libs/fftw:3.0 )
- projectm? ( media-libs/glew:= )
-"
-# now only presets are used, libprojectm is internal
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
-RDEPEND="${COMMON_DEPEND}
- dbus? ( udisks? ( sys-fs/udisks:2 ) )
- mms? ( media-plugins/gst-plugins-libmms:0.10 )
- mtp? ( gnome-base/gvfs )
- projectm? ( >=media-libs/libprojectm-1.2.0 )
- media-plugins/gst-plugins-meta:0.10
- media-plugins/gst-plugins-gio:0.10
- media-plugins/gst-plugins-soup:0.10
- media-plugins/gst-plugins-taglib:0.10
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.39
- virtual/pkgconfig
- sys-devel/gettext
- dev-qt/qttest:4
- dev-cpp/gmock
- box? ( dev-cpp/sparsehash )
- dropbox? ( dev-cpp/sparsehash )
- googledrive? ( dev-cpp/sparsehash )
- skydrive? ( dev-cpp/sparsehash )
- ubuntu-one? ( dev-cpp/sparsehash )
- test? ( gnome-base/gsettings-desktop-schemas )
-"
-DOCS="Changelog"
-
-# https://github.com/clementine-player/Clementine/issues/3935
-RESTRICT="test"
-
-# Switch to ^ when we switch to EAPI=6.
-[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/C${P:1}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.2.3-namespaces.patch"
- "${FILESDIR}/${P}-hide_boost_includes_from_q_moc.patch"
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # some tests fail or hang
- sed -i \
- -e '/add_test_file(translations_test.cpp/d' \
- tests/CMakeLists.txt || die
-}
-
-src_configure() {
- local langs x
- for x in ${LANGS}; do
- use linguas_${x} && langs+=" ${x}"
- done
-
- # spotify is not in portage
- local mycmakeargs=(
- -DBUILD_WERROR=OFF
- -DLINGUAS="${langs}"
- -DBUNDLE_PROJECTM_PRESETS=OFF
- $(cmake-utils_use cdda ENABLE_AUDIOCD)
- $(cmake-utils_use dbus ENABLE_DBUS)
- $(cmake-utils_use udisks ENABLE_DEVICEKIT)
- $(cmake-utils_use ipod ENABLE_LIBGPOD)
- $(cmake-utils_use lastfm ENABLE_LIBLASTFM)
- $(cmake-utils_use mtp ENABLE_LIBMTP)
- $(cmake-utils_use moodbar ENABLE_MOODBAR)
- -DENABLE_GIO=ON
- $(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
- $(cmake-utils_use projectm ENABLE_VISUALISATIONS)
- $(cmake-utils_use ayatana ENABLE_SOUNDMENU)
- $(cmake-utils_use box ENABLE_BOX)
- $(cmake-utils_use dropbox ENABLE_DROPBOX)
- $(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
- $(cmake-utils_use skydrive ENABLE_SKYDRIVE)
- $(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
- -DENABLE_SPOTIFY_BLOB=OFF
- -DENABLE_BREAKPAD=OFF
- $(cmake-utils_use !system-sqlite STATIC_SQLITE)
- $(cmake-utils_use system-sqlite I_HATE_MY_USERS)
- $(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
- -DUSE_BUILTIN_TAGLIB=OFF
- -DUSE_SYSTEM_GMOCK=ON
- )
-
- use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd "${CMAKE_BUILD_DIR}" || die
- Xemake test
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-sound/clementine/files/clementine-1.2.3-hide_boost_includes_from_q_moc.patch b/media-sound/clementine/files/clementine-1.2.3-hide_boost_includes_from_q_moc.patch
deleted file mode 100644
index c582d7a..00000000
--- a/media-sound/clementine/files/clementine-1.2.3-hide_boost_includes_from_q_moc.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-Description: Wrap boost includes to avoid FTBFS due to qt4 moc.
-Author: Robert Bruce Park <robert.park@canonical.com>
-Bug-Debian: https://bugs.debian.org/795144
-Last-Update: <2015-04-13>
-
---- a/src/core/boundfuturewatcher.h
-+++ b/src/core/boundfuturewatcher.h
-@@ -3,7 +3,9 @@
-
- #include <QFutureWatcher>
-
-+#ifndef Q_MOC_RUN
- #include <boost/noncopyable.hpp>
-+#endif
-
- template <typename T, typename D>
- class BoundFutureWatcher : public QFutureWatcher<T>, boost::noncopyable {
---- a/src/core/database.cpp
-+++ b/src/core/database.cpp
-@@ -23,7 +23,9 @@
- #include "core/logging.h"
- #include "core/taskmanager.h"
-
-+#ifndef Q_MOC_RUN
- #include <boost/scope_exit.hpp>
-+#endif
-
- #include <QCoreApplication>
- #include <QDir>
---- a/src/core/macglobalshortcutbackend.mm
-+++ b/src/core/macglobalshortcutbackend.mm
-@@ -22,7 +22,9 @@
- #include "mac_startup.h"
- #import "mac_utilities.h"
-
-+#ifndef Q_MOC_RUN
- #include <boost/noncopyable.hpp>
-+#endif
-
- #include <QAction>
- #include <QList>
---- a/src/core/mergedproxymodel.h
-+++ b/src/core/mergedproxymodel.h
-@@ -25,10 +25,12 @@
- using std::placeholders::_1;
- using std::placeholders::_2;
-
-+#ifndef Q_MOC_RUN
- #include <boost/multi_index_container.hpp>
- #include <boost/multi_index/member.hpp>
- #include <boost/multi_index/ordered_index.hpp>
- #include <boost/multi_index/hashed_index.hpp>
-+#endif
-
- using boost::multi_index::multi_index_container;
- using boost::multi_index::indexed_by;
---- a/src/core/scopedtransaction.h
-+++ b/src/core/scopedtransaction.h
-@@ -18,7 +18,9 @@
- #ifndef SCOPEDTRANSACTION_H
- #define SCOPEDTRANSACTION_H
-
-+#ifndef Q_MOC_RUN
- #include <boost/noncopyable.hpp>
-+#endif
-
- class QSqlDatabase;
-
---- a/src/core/signalchecker.h
-+++ b/src/core/signalchecker.h
-@@ -20,8 +20,10 @@
-
- #include <glib-object.h>
-
-+#ifndef Q_MOC_RUN
- #include <boost/function_types/function_arity.hpp>
- #include <boost/typeof/typeof.hpp>
-+#endif
-
- // Do not call this directly, use CHECKED_GCONNECT instead.
- bool CheckedGConnect(
---- a/src/devices/macdevicelister.mm
-+++ b/src/devices/macdevicelister.mm
-@@ -38,7 +38,9 @@
- #import <Foundation/NSString.h>
- #import <Foundation/NSURL.h>
-
-+#ifndef Q_MOC_RUN
- #include <boost/scope_exit.hpp>
-+#endif
-
- #include <libmtp.h>
-
---- a/src/library/groupbydialog.h
-+++ b/src/library/groupbydialog.h
-@@ -25,9 +25,11 @@
- using std::placeholders::_1;
- using std::placeholders::_2;
-
-+#ifndef Q_MOC_RUN
- #include <boost/multi_index_container.hpp>
- #include <boost/multi_index/member.hpp>
- #include <boost/multi_index/ordered_index.hpp>
-+#endif
-
- #include "librarymodel.h"
-
---- a/tests/database_test.cpp
-+++ b/tests/database_test.cpp
-@@ -20,7 +20,9 @@
-
- #include "core/database.h"
-
-+#ifndef Q_MOC_RUN
- #include <boost/scoped_ptr.hpp>
-+#endif
-
- #include <QtDebug>
- #include <QSqlQuery>
---- a/tests/librarybackend_test.cpp
-+++ b/tests/librarybackend_test.cpp
-@@ -23,7 +23,9 @@
- #include "core/song.h"
- #include "core/database.h"
-
-+#ifndef Q_MOC_RUN
- #include <boost/scoped_ptr.hpp>
-+#endif
-
- #include <QFileInfo>
- #include <QSignalSpy>
---- a/tests/plsparser_test.cpp
-+++ b/tests/plsparser_test.cpp
-@@ -27,7 +27,9 @@
- #include <QUrl>
- #include <QtDebug>
-
-+#ifndef Q_MOC_RUN
- #include <boost/shared_ptr.hpp>
-+#endif
-
- using boost::shared_ptr;
-
---- a/tests/songloader_test.cpp
-+++ b/tests/songloader_test.cpp
-@@ -29,7 +29,10 @@
- #include <QSignalSpy>
- #include <QtDebug>
-
-+#ifndef Q_MOC_RUN
- #include <boost/scoped_ptr.hpp>
-+#endif
-+
- #include <cstdlib>
-
- using ::testing::_;
---- a/tests/songplaylistitem_test.cpp
-+++ b/tests/songplaylistitem_test.cpp
-@@ -19,7 +19,10 @@
- #include "test_utils.h"
-
- #include <gtest/gtest.h>
-+
-+#ifndef Q_MOC_RUN
- #include <boost/scoped_ptr.hpp>
-+#endif
-
- #include <QTemporaryFile>
- #include <QFileInfo>
---- a/tests/utilities_test.cpp
-+++ b/tests/utilities_test.cpp
-@@ -21,7 +21,9 @@
-
- #include "core/utilities.h"
-
-+#ifndef Q_MOC_RUN
- #include <boost/scoped_ptr.hpp>
-+#endif
-
- #include <QtDebug>
-
diff --git a/media-sound/clementine/files/clementine-1.2.3-namespaces.patch b/media-sound/clementine/files/clementine-1.2.3-namespaces.patch
deleted file mode 100644
index 2240deb..00000000
--- a/media-sound/clementine/files/clementine-1.2.3-namespaces.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001
-From: Chocobozzz <florian.chocobo@gmail.com>
-Date: Wed, 16 Jul 2014 15:57:25 +0200
-Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401
-
----
- src/CMakeLists.txt | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 650fa74..775b0a5 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
- if(HAVE_DBUS)
- file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
-
-- # Hack to get it to generate interfaces without namespaces - required
-- # because otherwise org::freedesktop::UDisks and
-- # org::freedesktop::UDisks::Device conflict.
-- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
--
- # MPRIS DBUS interfaces
- qt4_add_dbus_adaptor(SOURCES
- dbus/org.freedesktop.MediaPlayer.player.xml
-@@ -964,6 +959,10 @@ if(HAVE_DBUS)
-
- # DeviceKit DBUS interfaces
- if(HAVE_DEVICEKIT)
-+ set_source_files_properties(dbus/org.freedesktop.UDisks.xml
-+ PROPERTIES NO_NAMESPACE dbus/udisks)
-+ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
-+ PROPERTIES NO_NAMESPACE dbus/udisksdevice)
- qt4_add_dbus_interface(SOURCES
- dbus/org.freedesktop.UDisks.xml
- dbus/udisks)
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2017-05-16 19:53 Lars Wendler
0 siblings, 0 replies; 16+ messages in thread
From: Lars Wendler @ 2017-05-16 19:53 UTC (permalink / raw
To: gentoo-commits
commit: 520806d82fc698f86da9f1d35761327e9a3c5dbd
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Tue May 16 03:30:31 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 16 19:52:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=520806d8
media-sound/clementine: fix compilation with gcc-7.1
Gentoo-Bug: 618214
Closes: https://github.com/gentoo/gentoo/pull/4640
media-sound/clementine/clementine-1.3.1-r6.ebuild | 3 +-
...ine-1.3.1-add-missing-functional-includes.patch | 51 ++++++++++++++++++++++
2 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/media-sound/clementine/clementine-1.3.1-r6.ebuild b/media-sound/clementine/clementine-1.3.1-r6.ebuild
index 6dfba6c726c..6d4916f0f57 100644
--- a/media-sound/clementine/clementine-1.3.1-r6.ebuild
+++ b/media-sound/clementine/clementine-1.3.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -95,6 +95,7 @@ PATCHES=(
"${FILESDIR}"/${P}-fix-desktop-file.patch
"${FILESDIR}"/${P}-chromaprint14.patch #603662
"${FILESDIR}"/${P}-libechonest_removal.patch
+ "${FILESDIR}"/${P}-add-missing-functional-includes.patch #618214
)
src_prepare() {
diff --git a/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch b/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch
new file mode 100644
index 00000000000..e480212b883
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch
@@ -0,0 +1,51 @@
+From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001
+From: Morris Hafner <mmha@users.noreply.github.com>
+Date: Mon, 13 Feb 2017 17:46:46 +0100
+Subject: [PATCH] Add missing <functional> includes (#5630)
+
+---
+ src/core/mergedproxymodel.cpp | 1 +
+ src/devices/giolister.cpp | 1 +
+ src/library/groupbydialog.cpp | 2 ++
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp
+index 56217f6..8c210d3 100644
+--- a/src/core/mergedproxymodel.cpp
++++ b/src/core/mergedproxymodel.cpp
+@@ -23,6 +23,7 @@
+
+ #include <QStringList>
+
++#include <functional>
+ #include <limits>
+
+ // boost::multi_index still relies on these being in the global namespace.
+diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp
+index aa3bddb..5f63ef2 100644
+--- a/src/devices/giolister.cpp
++++ b/src/devices/giolister.cpp
+@@ -17,6 +17,7 @@
+
+ #include "config.h"
+
++#include <functional>
+ #include <memory>
+
+ #include <QFile>
+diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp
+index 5efdc9f..e5f711b 100644
+--- a/src/library/groupbydialog.cpp
++++ b/src/library/groupbydialog.cpp
+@@ -20,6 +20,8 @@
+
+ #include <QPushButton>
+
++#include <functional>
++
+ // boost::multi_index still relies on these being in the global namespace.
+ using std::placeholders::_1;
+ using std::placeholders::_2;
+--
+2.10.2
+
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2017-11-21 10:19 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2017-11-21 10:19 UTC (permalink / raw
To: gentoo-commits
commit: bd2bf56ec969421c7e8b112c1c8342e1efc295a5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 21 10:18:36 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 10:19:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2bf56e
media-sound/clementine: qt5-lconvert.patch upstreamed
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-sound/clementine/clementine-9999.ebuild | 5 +---
.../clementine/files/clementine-qt5-lconvert.patch | 28 ----------------------
2 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 50ae57df046..b0f63f84244 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -106,10 +106,7 @@ MY_P="${P/_}"
[[ ${PV} == *9999* ]] || \
S="${WORKDIR}/${MY_P^}"
-PATCHES=(
- "${FILESDIR}"/${PN}-fts3-tokenizer.patch
- "${FILESDIR}"/${PN}-qt5-lconvert.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch )
src_prepare() {
l10n_find_plocales_changes "src/translations" "" ".po"
diff --git a/media-sound/clementine/files/clementine-qt5-lconvert.patch b/media-sound/clementine/files/clementine-qt5-lconvert.patch
deleted file mode 100644
index 8565f30cee0..00000000000
--- a/media-sound/clementine/files/clementine-qt5-lconvert.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5f75801a08a606073c700bd829ea694950de0729 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 19 Nov 2017 16:00:55 +0100
-Subject: [PATCH] Properly find Qt5LinguistTools
-
----
- CMakeLists.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4022c383b..5bdb2a00e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,9 +45,8 @@ if(NOT APPLE)
- find_package(Qt5 COMPONENTS WebKitWidgets)
- endif(NOT APPLE)
-
--# Find Qt's lconvert binary. Try qt's binary dir first, fall back to looking in PATH
--find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH)
--find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5)
-+find_package(Qt5LinguistTools CONFIG REQUIRED)
-+set(QT_LCONVERT_EXECUTABLE Qt5::lconvert)
-
- if(APPLE)
- if(NOT QT_MAC_USE_COCOA)
---
-2.15.0
-
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2017-12-08 18:32 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2017-12-08 18:32 UTC (permalink / raw
To: gentoo-commits
commit: d62fad681f5f95e386f11fe247df81b2ba3b7a19
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 8 16:58:07 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 8 18:30:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d62fad68
media-sound/clementine: Drop old
Package-Manager: Portage-2.3.17, Repoman-2.3.6
media-sound/clementine/clementine-1.3.1-r6.ebuild | 180 ---------------------
...ine-1.3.1-add-missing-functional-includes.patch | 51 ------
2 files changed, 231 deletions(-)
diff --git a/media-sound/clementine/clementine-1.3.1-r6.ebuild b/media-sound/clementine/clementine-1.3.1-r6.ebuild
deleted file mode 100644
index 13b223ccee9..00000000000
--- a/media-sound/clementine/clementine-1.3.1-r6.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-
-LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic xdg-utils gnome2-utils virtualx
-[[ ${PV} == *9999* ]] && inherit git-r3
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks wiimote"
-IUSE+="${LANGS// / linguas_}"
-
-REQUIRED_USE="
- udisks? ( dbus )
- wiimote? ( dbus )
-"
-
-COMMON_DEPEND="
- dev-db/sqlite:=
- >=dev-libs/glib-2.24.1-r1
- dev-libs/libxml2
- dev-libs/protobuf:=
- dev-libs/qjson
- >=dev-qt/qtcore-4.5:4[ssl]
- >=dev-qt/qtgui-4.5:4
- >=dev-qt/qtopengl-4.5:4
- >=dev-qt/qtsql-4.5:4
- >=media-libs/chromaprint-0.6
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- >=media-libs/libmygpo-qt-1.0.9[qt4(+)]
- >=media-libs/taglib-1.8[mp4(+)]
- sys-libs/zlib
- dev-libs/crypto++
- virtual/glu
- virtual/opengl
- x11-libs/libX11
- cdda? ( dev-libs/libcdio )
- dbus? ( >=dev-qt/qtdbus-4.5:4 )
- ipod? ( >=media-libs/libgpod-0.8.0 )
- lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- moodbar? ( sci-libs/fftw:3.0 )
- projectm? ( media-libs/glew:=
- >=media-libs/libprojectm-1.2.0 )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches:
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
-RDEPEND="${COMMON_DEPEND}
- dbus? ( udisks? ( sys-fs/udisks:0 ) )
- mms? ( media-plugins/gst-plugins-libmms:1.0 )
- mtp? ( gnome-base/gvfs[mtp] )
- media-plugins/gst-plugins-meta:1.0
- media-plugins/gst-plugins-soup:1.0
- media-plugins/gst-plugins-taglib:1.0
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.39:=
- virtual/pkgconfig
- sys-devel/gettext
- dev-qt/qttest:4
- || (
- >=dev-cpp/gtest-1.8.0
- dev-cpp/gmock
- )
- amazoncloud? ( dev-cpp/sparsehash )
- box? ( dev-cpp/sparsehash )
- dropbox? ( dev-cpp/sparsehash )
- googledrive? ( dev-cpp/sparsehash )
- pulseaudio? ( media-sound/pulseaudio )
- skydrive? ( dev-cpp/sparsehash )
- test? ( gnome-base/gsettings-desktop-schemas )
-"
-DOCS=( Changelog README.md )
-
-MY_P="${P/_}"
-[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/${MY_P^}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch
- "${FILESDIR}"/${P}-fix-desktop-file.patch
- "${FILESDIR}"/${P}-chromaprint14.patch #603662
- "${FILESDIR}"/${P}-libechonest_removal.patch
- "${FILESDIR}"/${P}-add-missing-functional-includes.patch #618214
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # some tests fail or hang
- sed -i \
- -e '/add_test_file(translations_test.cpp/d' \
- tests/CMakeLists.txt || die
-}
-
-src_configure() {
- local langs x
- for x in ${LANGS}; do
- use linguas_${x} && langs+=" ${x}"
- done
-
- # spotify is not in portage
- local mycmakeargs=(
- -DBUILD_WERROR=OFF
- -DLINGUAS="${langs}"
- -DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)"
- -DENABLE_AUDIOCD="$(usex cdda)"
- -DENABLE_DBUS="$(usex dbus)"
- -DENABLE_DEVICEKIT="$(usex udisks)"
- -DENABLE_LIBGPOD="$(usex ipod)"
- -DENABLE_LIBLASTFM="$(usex lastfm)"
- -DENABLE_LIBMTP="$(usex mtp)"
- -DENABLE_MOODBAR="$(usex moodbar)"
- -DENABLE_GIO=ON
- -DENABLE_WIIMOTEDEV="$(usex wiimote)"
- -DENABLE_VISUALISATIONS="$(usex projectm)"
- -DENABLE_BOX="$(usex box)"
- -DENABLE_DROPBOX="$(usex dropbox)"
- -DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
- -DENABLE_LIBPULSE="$(usex pulseaudio)"
- -DENABLE_SKYDRIVE="$(usex skydrive)"
- -DENABLE_SPOTIFY_BLOB=OFF
- -DENABLE_BREAKPAD=OFF #< disable crash reporting
- -DUSE_BUILTIN_TAGLIB=OFF
- -DUSE_SYSTEM_GMOCK=ON
- -DUSE_SYSTEM_PROJECTM=ON
- -DBUNDLE_PROJECTM_PRESETS=OFF
- # force to find crypto++ see bug #548544
- -DCRYPTOPP_LIBRARIES="crypto++"
- -DCRYPTOPP_FOUND=ON
- # avoid automagically enabling of ccache (bug #611010)
- -DCCACHE_EXECUTABLE=OFF
- # see https://github.com/clementine-player/Clementine/issues/5591
- -DENABLE_VK=OFF
- )
-
- use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd "${CMAKE_BUILD_DIR}" || die
- virtx emake test
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-
- elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
- elog "USE flags. You may be intrested in setting aac, flac, mp3, ogg or wavpack USE flags "
- elog "depending on your preferences"
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch b/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch
deleted file mode 100644
index e480212b883..00000000000
--- a/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001
-From: Morris Hafner <mmha@users.noreply.github.com>
-Date: Mon, 13 Feb 2017 17:46:46 +0100
-Subject: [PATCH] Add missing <functional> includes (#5630)
-
----
- src/core/mergedproxymodel.cpp | 1 +
- src/devices/giolister.cpp | 1 +
- src/library/groupbydialog.cpp | 2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp
-index 56217f6..8c210d3 100644
---- a/src/core/mergedproxymodel.cpp
-+++ b/src/core/mergedproxymodel.cpp
-@@ -23,6 +23,7 @@
-
- #include <QStringList>
-
-+#include <functional>
- #include <limits>
-
- // boost::multi_index still relies on these being in the global namespace.
-diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp
-index aa3bddb..5f63ef2 100644
---- a/src/devices/giolister.cpp
-+++ b/src/devices/giolister.cpp
-@@ -17,6 +17,7 @@
-
- #include "config.h"
-
-+#include <functional>
- #include <memory>
-
- #include <QFile>
-diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp
-index 5efdc9f..e5f711b 100644
---- a/src/library/groupbydialog.cpp
-+++ b/src/library/groupbydialog.cpp
-@@ -20,6 +20,8 @@
-
- #include <QPushButton>
-
-+#include <functional>
-+
- // boost::multi_index still relies on these being in the global namespace.
- using std::placeholders::_1;
- using std::placeholders::_2;
---
-2.10.2
-
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2018-03-22 18:02 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2018-03-22 18:02 UTC (permalink / raw
To: gentoo-commits
commit: cea612c3ab27af4fa0c42df97e9b3c5aae345e15
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 17:55:20 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 18:02:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea612c3
media-sound/clementine: Drop old snapshot
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-sound/clementine/Manifest | 1 -
.../clementine/clementine-1.3.1_p20180314.ebuild | 192 ---------------------
.../files/clementine-1.3.1_p20180314-qt-5.11.patch | 51 ------
3 files changed, 244 deletions(-)
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index c0358b6dd38..71bcdbbfc07 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,3 +1,2 @@
DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
-DIST clementine-1.3.1_p20180314.tar.gz 8486396 BLAKE2B 978651924c50ee3669f82a51f98978869103edac3f7f7cfef372dc1f1483caa2f543d9d626a4552647acaeabb4f329a69cb5c76d8c6e9b8d605de2f86025344c SHA512 5c21540a91dae9f0db336947552548e44eec80fc9e6ebf95cbca3d2ab60cd096be963aec105f0c8d72d2628777cb6628e4a7e50f54a3edbcc22708c59f620e4a
DIST clementine-1.3.1_p20180319.tar.gz 8488685 BLAKE2B 2f4c412f9274a8957584bbc2d6482144fd6892adc629cdc0aeb750d592d8e4e62ad5b7bbb56288ecb993a9f5221b54e47e18c3f2b76c7a80670ead37ba5be3b0 SHA512 bbe288ca654ad0ed36abca288187abe452524e8fec23839973ff3f1d61ce479a979cbc45edcba10d6d15ff9baaaa23e95bb7e6d31a0090ca8e32bd547114e1ec
diff --git a/media-sound/clementine/clementine-1.3.1_p20180314.ebuild b/media-sound/clementine/clementine-1.3.1_p20180314.ebuild
deleted file mode 100644
index 296ae7151df..00000000000
--- a/media-sound/clementine/clementine-1.3.1_p20180314.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
-
-MY_P="${P/_}"
-if [[ ${PV} == *9999* ]]; then
- EGIT_BRANCH="qt5"
- EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
- GIT_ECLASS="git-r3"
-else
- COMMIT=2d7894915dfc9043da9282d216775ef75041c773
- SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} vcs-snapshot
-unset GIT_ECLASS
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
-
-REQUIRED_USE="
- udisks? ( dbus )
- wiimote? ( dbus )
-"
-
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+)]
- dev-db/sqlite:=
- dev-libs/crypto++
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/protobuf:=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtsql:5[sqlite]
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- dev-qt/qtxml:5
- media-libs/chromaprint:=
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- >=media-libs/libmygpo-qt-1.0.9[qt5(+)]
- media-libs/taglib
- sys-libs/zlib
- virtual/glu
- virtual/opengl
- x11-libs/libX11
- cdda? ( dev-libs/libcdio:= )
- dbus? ( dev-qt/qtdbus:5 )
- ipod? ( >=media-libs/libgpod-0.8.0 )
- lastfm? ( >=media-libs/liblastfm-1[qt5(+)] )
- moodbar? ( sci-libs/fftw:3.0 )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- projectm? (
- media-libs/glew:=
- >=media-libs/libprojectm-1.2.0
- )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
-RDEPEND="${COMMON_DEPEND}
- media-plugins/gst-plugins-meta:1.0
- media-plugins/gst-plugins-soup:1.0
- media-plugins/gst-plugins-taglib:1.0
- mms? ( media-plugins/gst-plugins-libmms:1.0 )
- mtp? ( gnome-base/gvfs[mtp] )
- udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-cpp/gtest-1.8.0
- dev-libs/boost
- dev-qt/linguist-tools:5
- dev-qt/qtopengl:5
- sys-devel/gettext
- virtual/pkgconfig
- box? ( dev-cpp/sparsehash )
- dropbox? ( dev-cpp/sparsehash )
- googledrive? ( dev-cpp/sparsehash )
- pulseaudio? ( media-sound/pulseaudio )
- seafile? ( dev-cpp/sparsehash )
- skydrive? ( dev-cpp/sparsehash )
- test? (
- dev-qt/qttest:5
- gnome-base/gsettings-desktop-schemas
- )
-"
-
-DOCS=( Changelog README.md )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-fts3-tokenizer.patch
- "${FILESDIR}"/${P}-qt-5.11.patch
-)
-
-src_prepare() {
- l10n_find_plocales_changes "src/translations" "" ".po"
-
- cmake-utils_src_prepare
- # some tests fail or hang
- sed -i \
- -e '/add_test_file(translations_test.cpp/d' \
- tests/CMakeLists.txt || die
-
- if ! use test; then
- sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
- cmake_comment_add_subdirectory tests
- fi
-
- # Fix clementine relying on downstream renaming of lastfm header dir
- sed -i -e "/^#include/s/lastfm5/lastfm/" \
- tests/albumcoverfetcher_test.cpp \
- src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \
- src/core/song.cpp || die "Failed to sed lastfm header suffix"
- sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \
- -i CMakeLists.txt || die "Failed to sed lastfm header suffix"
-}
-
-src_configure() {
- # spotify is not in portage
- local mycmakeargs=(
- -DBUILD_WERROR=OFF
- # force to find crypto++ see bug #548544
- -DCRYPTOPP_LIBRARIES="crypto++"
- -DCRYPTOPP_FOUND=ON
- # avoid automagically enabling of ccache (bug #611010)
- -DCCACHE_EXECUTABLE=OFF
- -DENABLE_BREAKPAD=OFF #< disable crash reporting
- -DENABLE_DEVICEKIT=OFF
- -DENABLE_GIO=ON
- -DENABLE_SPOTIFY_BLOB=OFF
- -DUSE_BUILTIN_TAGLIB=OFF
- -DUSE_SYSTEM_GMOCK=ON
- -DUSE_SYSTEM_PROJECTM=ON
- -DBUNDLE_PROJECTM_PRESETS=OFF
- -DLINGUAS="$(l10n_get_locales)"
- -DENABLE_BOX="$(usex box)"
- -DENABLE_AUDIOCD="$(usex cdda)"
- -DENABLE_DBUS="$(usex dbus)"
- -DENABLE_DROPBOX="$(usex dropbox)"
- -DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
- -DENABLE_LIBGPOD="$(usex ipod)"
- -DENABLE_LIBLASTFM="$(usex lastfm)"
- -DENABLE_MOODBAR="$(usex moodbar)"
- -DENABLE_LIBMTP="$(usex mtp)"
- -DENABLE_VISUALISATIONS="$(usex projectm)"
- -DENABLE_SEAFILE="$(usex seafile)"
- -DENABLE_SKYDRIVE="$(usex skydrive)"
- -DENABLE_LIBPULSE="$(usex pulseaudio)"
- -DENABLE_UDISKS2="$(usex udisks)"
- -DENABLE_WIIMOTEDEV="$(usex wiimote)"
- )
-
- use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd "${CMAKE_BUILD_DIR}" || die
- virtx emake test
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-
- elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
- elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
- elog "depending on your preferences"
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-sound/clementine/files/clementine-1.3.1_p20180314-qt-5.11.patch b/media-sound/clementine/files/clementine-1.3.1_p20180314-qt-5.11.patch
deleted file mode 100644
index 8903da17498..00000000000
--- a/media-sound/clementine/files/clementine-1.3.1_p20180314-qt-5.11.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b0b72ccfee2484ec05861879cca45d62d87055ae Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sat, 17 Mar 2018 00:29:11 +0100
-Subject: [PATCH] Fix build with Qt 5.11
-
----
- src/playlist/playlistcontainer.cpp | 1 +
- src/ui/globalshortcutssettingspage.cpp | 1 +
- src/widgets/errordialog.cpp | 2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/src/playlist/playlistcontainer.cpp b/src/playlist/playlistcontainer.cpp
-index 58f1ad2d6..2ba1a3ff1 100644
---- a/src/playlist/playlistcontainer.cpp
-+++ b/src/playlist/playlistcontainer.cpp
-@@ -23,6 +23,7 @@
- #include "playlistparsers/playlistparser.h"
- #include "ui/iconloader.h"
-
-+#include <QAction>
- #include <QFileDialog>
- #include <QInputDialog>
- #include <QKeyEvent>
-diff --git a/src/ui/globalshortcutssettingspage.cpp b/src/ui/globalshortcutssettingspage.cpp
-index ec5d29b28..c60a9561d 100644
---- a/src/ui/globalshortcutssettingspage.cpp
-+++ b/src/ui/globalshortcutssettingspage.cpp
-@@ -24,6 +24,7 @@
- #include "ui/iconloader.h"
- #include "ui/settingsdialog.h"
-
-+#include <QAction>
- #include <QKeyEvent>
- #include <QMessageBox>
- #include <QProcess>
-diff --git a/src/widgets/errordialog.cpp b/src/widgets/errordialog.cpp
-index 1086305f3..3fd590840 100644
---- a/src/widgets/errordialog.cpp
-+++ b/src/widgets/errordialog.cpp
-@@ -18,6 +18,8 @@
- #include "errordialog.h"
- #include "ui_errordialog.h"
-
-+#include <QStyle>
-+
- ErrorDialog::ErrorDialog(QWidget* parent)
- : QDialog(parent), ui_(new Ui_ErrorDialog) {
- ui_->setupUi(this);
---
-2.16.2
-
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2018-04-26 3:32 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2018-04-26 3:32 UTC (permalink / raw
To: gentoo-commits
commit: c50ce6be0d1de5a792daa90fe043026c49f1ad0b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 19:39:58 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 03:29:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c50ce6be
media-sound/clementine: Drop old Qt4-based
Bug: https://bugs.gentoo.org/650692
Package-Manager: Portage-2.3.31, Repoman-2.3.9
media-sound/clementine/Manifest | 1 -
.../clementine-1.3.1_p20171113-r1.ebuild | 167 ---------------------
.../files/clementine-1.3-fix-tokenizer.patch | 21 ---
3 files changed, 189 deletions(-)
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index ab3c9e5fb0c..4b0aa4198c4 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,2 +1 @@
-DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76 SHA512 8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62
diff --git a/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild b/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild
deleted file mode 100644
index fe90073e56b..00000000000
--- a/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=83e860eabd9f4a864c553f110742027cdd01b76f
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic gnome2-utils l10n vcs-snapshot virtualx xdg-utils
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
-SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
-
-REQUIRED_USE="
- udisks? ( dbus )
- wiimote? ( dbus )
-"
-
-COMMON_DEPEND="
- dev-db/sqlite:=
- dev-libs/crypto++
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/protobuf:=
- dev-libs/qjson
- dev-qt/qtcore:4[ssl]
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- dev-qt/qtsql:4
- media-libs/chromaprint:=
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- >=media-libs/libmygpo-qt-1.0.9[qt4]
- media-libs/taglib[mp4(+)]
- sys-libs/zlib
- virtual/glu
- virtual/opengl
- x11-libs/libX11
- cdda? ( dev-libs/libcdio:= )
- dbus? ( dev-qt/qtdbus:4 )
- ipod? ( >=media-libs/libgpod-0.8.0 )
- lastfm? ( >=media-libs/liblastfm-1[qt4] )
- moodbar? ( sci-libs/fftw:3.0 )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- projectm? (
- media-libs/glew:=
- >=media-libs/libprojectm-1.2.0
- )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
-RDEPEND="${COMMON_DEPEND}
- media-plugins/gst-plugins-meta:1.0
- media-plugins/gst-plugins-soup:1.0
- media-plugins/gst-plugins-taglib:1.0
- mms? ( media-plugins/gst-plugins-libmms:1.0 )
- mtp? ( gnome-base/gvfs[mtp] )
- udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-cpp/gtest-1.8.0
- dev-libs/boost
- sys-devel/gettext
- virtual/pkgconfig
- box? ( dev-cpp/sparsehash )
- dropbox? ( dev-cpp/sparsehash )
- googledrive? ( dev-cpp/sparsehash )
- pulseaudio? ( media-sound/pulseaudio )
- seafile? ( dev-cpp/sparsehash )
- skydrive? ( dev-cpp/sparsehash )
- test? (
- dev-qt/qttest:4
- gnome-base/gsettings-desktop-schemas
- )
-"
-
-DOCS=( Changelog README.md )
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
-
-src_prepare() {
- l10n_find_plocales_changes "src/translations" "" ".po"
-
- cmake-utils_src_prepare
- # some tests fail or hang
- sed -i \
- -e '/add_test_file(translations_test.cpp/d' \
- tests/CMakeLists.txt || die
-
- use test || cmake_comment_add_subdirectory tests
- rm -r 3rdparty/{gmock,google-breakpad,libprojectm,taglib} || die
-}
-
-src_configure() {
- # spotify is not in portage
- local mycmakeargs=(
- -DBUILD_WERROR=OFF
- # force to find crypto++ see bug #548544
- -DCRYPTOPP_LIBRARIES="crypto++"
- -DCRYPTOPP_FOUND=ON
- # avoid automagically enabling of ccache (bug #611010)
- -DCCACHE_EXECUTABLE=OFF
- -DENABLE_BREAKPAD=OFF #< disable crash reporting
- -DENABLE_DEVICEKIT=OFF
- -DENABLE_GIO=ON
- -DENABLE_SPOTIFY_BLOB=OFF
- -DUSE_BUILTIN_TAGLIB=OFF
- -DUSE_SYSTEM_PROJECTM=ON
- -DBUNDLE_PROJECTM_PRESETS=OFF
- -DLINGUAS="$(l10n_get_locales)"
- -DENABLE_BOX="$(usex box)"
- -DENABLE_AUDIOCD="$(usex cdda)"
- -DENABLE_DBUS="$(usex dbus)"
- -DENABLE_DROPBOX="$(usex dropbox)"
- -DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
- -DENABLE_LIBGPOD="$(usex ipod)"
- -DENABLE_LIBLASTFM="$(usex lastfm)"
- -DENABLE_MOODBAR="$(usex moodbar)"
- -DENABLE_LIBMTP="$(usex mtp)"
- -DENABLE_VISUALISATIONS="$(usex projectm)"
- -DENABLE_SEAFILE="$(usex seafile)"
- -DENABLE_SKYDRIVE="$(usex skydrive)"
- -DENABLE_LIBPULSE="$(usex pulseaudio)"
- -DENABLE_UDISKS2="$(usex udisks)"
- -DENABLE_WIIMOTEDEV="$(usex wiimote)"
- )
-
- use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
- use test && mycmakeargs+=( -DUSE_SYSTEM_GMOCK=ON )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd "${CMAKE_BUILD_DIR}" || die
- virtx emake test
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-
- elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
- elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
- elog "depending on your preferences"
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch b/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
deleted file mode 100644
index 437518695a3..00000000000
--- a/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/clementine-player/Clementine/issues/5297
-
---- a/src/core/database.cpp
-+++ b/src/core/database.cpp
-@@ -265,6 +265,16 @@
- StaticInit();
-
- {
-+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
-+ QVariant v = db.driver()->handle();
-+ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
-+ sqlite3* handle = *static_cast<sqlite3**>(v.data());
-+ if (handle) {
-+ sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
-+ }
-+ }
-+#endif
-+
- QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db);
- set_fts_tokenizer.bindValue(":name", "unicode");
- set_fts_tokenizer.bindValue(
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2018-12-02 18:43 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2018-12-02 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 6f170caf208f8995d0b81f4a031e2906db459ed4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 00:05:13 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 18:43:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f170caf
media-sound/clementine: 1.3.1_p20181201 snapshot bump
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/clementine/Manifest | 1 +
.../clementine/clementine-1.3.1_p20181201.ebuild | 182 +++++++++++++++++++++
.../files/clementine-1.3.1_p20181201-cmake.patch | 165 +++++++++++++++++++
3 files changed, 348 insertions(+)
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 914ef63abe0..cd11a00b680 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/media-sound/clementine/clementine-1.3.1_p20181201.ebuild b/media-sound/clementine/clementine-1.3.1_p20181201.ebuild
new file mode 100644
index 00000000000..3d3061880f8
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3.1_p20181201.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
+
+MY_P="${P/_}"
+if [[ ${PV} == *9999* ]]; then
+ EGIT_BRANCH="qt5"
+ EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+ GIT_ECLASS="git-r3"
+else
+ COMMIT=d87307fbc718a57ca38b5354f196db05b560036c
+ SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS}
+unset GIT_ECLASS
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
+HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
+
+REQUIRED_USE="
+ udisks? ( dbus )
+ wiimote? ( dbus )
+"
+
+COMMON_DEPEND="
+ app-crypt/qca:2[qt5(+)]
+ dev-db/sqlite:=
+ dev-libs/crypto++[asm]
+ dev-libs/glib:2
+ dev-libs/libxml2
+ dev-libs/protobuf:=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtwidgets:5
+ media-libs/chromaprint:=
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ >=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+ >=media-libs/taglib-1.11.1_p20181028
+ sys-libs/zlib
+ virtual/glu
+ x11-libs/libX11
+ cdda? ( dev-libs/libcdio:= )
+ dbus? ( dev-qt/qtdbus:5 )
+ 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 )
+ 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;
+# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
+# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
+RDEPEND="${COMMON_DEPEND}
+ media-plugins/gst-plugins-meta:1.0
+ media-plugins/gst-plugins-soup:1.0
+ media-plugins/gst-plugins-taglib:1.0
+ mms? ( media-plugins/gst-plugins-libmms:1.0 )
+ mtp? ( gnome-base/gvfs[mtp] )
+ udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-cpp/gtest-1.8.0
+ dev-libs/boost
+ dev-qt/linguist-tools:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtxml:5
+ sys-devel/gettext
+ virtual/pkgconfig
+ 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 )
+ test? (
+ dev-qt/qttest:5
+ gnome-base/gsettings-desktop-schemas
+ )
+"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${PN^}-${COMMIT}"
+
+DOCS=( Changelog README.md )
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
+src_prepare() {
+ l10n_find_plocales_changes "src/translations" "" ".po"
+
+ cmake-utils_src_prepare
+ # some tests fail or hang
+ sed -i \
+ -e '/add_test_file(translations_test.cpp/d' \
+ tests/CMakeLists.txt || die
+
+ if ! use test; then
+ sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
+ cmake_comment_add_subdirectory tests
+ fi
+
+ rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
+}
+
+src_configure() {
+ # spotify is not in portage
+ 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
+ -DENABLE_DEVICEKIT=OFF
+ -DENABLE_GIO=ON
+ -DENABLE_SPOTIFY_BLOB=OFF
+ -DUSE_SYSTEM_GMOCK=ON
+ -DUSE_SYSTEM_PROJECTM=ON
+ -DBUNDLE_PROJECTM_PRESETS=OFF
+ -DLINGUAS="$(l10n_get_locales)"
+ -DENABLE_BOX="$(usex box)"
+ -DENABLE_AUDIOCD="$(usex cdda)"
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+ -DENABLE_DROPBOX="$(usex dropbox)"
+ -DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+ -DENABLE_LIBGPOD="$(usex ipod)"
+ -DENABLE_LIBLASTFM="$(usex lastfm)"
+ -DENABLE_MOODBAR="$(usex moodbar)"
+ -DENABLE_LIBMTP="$(usex mtp)"
+ -DENABLE_VISUALISATIONS="$(usex projectm)"
+ -DENABLE_SEAFILE="$(usex seafile)"
+ -DENABLE_SKYDRIVE="$(usex skydrive)"
+ -DENABLE_LIBPULSE="$(usex pulseaudio)"
+ -DENABLE_UDISKS2="$(usex udisks)"
+ -DENABLE_WIIMOTEDEV="$(usex wiimote)"
+ )
+
+ use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ cd "${CMAKE_BUILD_DIR}" || die
+ virtx emake test
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+
+ elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+ elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+ elog "depending on your preferences"
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
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 00000000000..633bf39be9d
--- /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
+
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2018-12-02 18:43 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2018-12-02 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 2539602e02f8797712d44f12f5f5fd5871fa8b81
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 17:03:48 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 18:43:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2539602e
media-sound/clementine: Drop 1.3.1_p20181112 snapshot
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/clementine/Manifest | 1 -
.../clementine/clementine-1.3.1_p20181112.ebuild | 182 ---------------------
.../files/clementine-1.3.1_p20181112-no-dbus.patch | 41 -----
3 files changed, 224 deletions(-)
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index cd11a00b680..20346bcffb3 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,3 +1,2 @@
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
diff --git a/media-sound/clementine/clementine-1.3.1_p20181112.ebuild b/media-sound/clementine/clementine-1.3.1_p20181112.ebuild
deleted file mode 100644
index 0840a685935..00000000000
--- a/media-sound/clementine/clementine-1.3.1_p20181112.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
-
-MY_P="${P/_}"
-if [[ ${PV} == *9999* ]]; then
- EGIT_BRANCH="qt5"
- EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
- GIT_ECLASS="git-r3"
-else
- COMMIT=b8eea8ccc116388b67e4b042a5b81e87bf7a24e5
- SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS}
-unset GIT_ECLASS
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
-
-REQUIRED_USE="
- udisks? ( dbus )
- wiimote? ( dbus )
-"
-
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+)]
- dev-db/sqlite:=
- dev-libs/crypto++[asm]
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/protobuf:=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtsql:5[sqlite]
- dev-qt/qtwidgets:5
- media-libs/chromaprint:=
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- >=media-libs/libmygpo-qt-1.0.9[qt5(+)]
- >=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 )
- 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 )
- projectm? (
- media-libs/glew:=
- >=media-libs/libprojectm-1.2.0
- )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
-RDEPEND="${COMMON_DEPEND}
- media-plugins/gst-plugins-meta:1.0
- media-plugins/gst-plugins-soup:1.0
- media-plugins/gst-plugins-taglib:1.0
- mms? ( media-plugins/gst-plugins-libmms:1.0 )
- mtp? ( gnome-base/gvfs[mtp] )
- udisks? ( sys-fs/udisks:2 )
-"
-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
- virtual/pkgconfig
- box? ( dev-cpp/sparsehash )
- dropbox? ( dev-cpp/sparsehash )
- googledrive? ( dev-cpp/sparsehash )
- pulseaudio? ( media-sound/pulseaudio )
- seafile? ( dev-cpp/sparsehash )
- skydrive? ( dev-cpp/sparsehash )
- test? (
- dev-qt/qttest:5
- gnome-base/gsettings-desktop-schemas
- )
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${PN^}-${COMMIT}"
-
-DOCS=( Changelog README.md )
-
-PATCHES=( "${FILESDIR}"/${P}-no-dbus.patch )
-
-src_prepare() {
- l10n_find_plocales_changes "src/translations" "" ".po"
-
- cmake-utils_src_prepare
- # some tests fail or hang
- sed -i \
- -e '/add_test_file(translations_test.cpp/d' \
- tests/CMakeLists.txt || die
-
- if ! use test; then
- sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
- cmake_comment_add_subdirectory tests
- fi
-
- rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
-}
-
-src_configure() {
- # spotify is not in portage
- 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
- -DENABLE_DEVICEKIT=OFF
- -DENABLE_GIO=ON
- -DENABLE_SPOTIFY_BLOB=OFF
- -DUSE_SYSTEM_GMOCK=ON
- -DUSE_SYSTEM_PROJECTM=ON
- -DBUNDLE_PROJECTM_PRESETS=OFF
- -DLINGUAS="$(l10n_get_locales)"
- -DENABLE_BOX="$(usex box)"
- -DENABLE_AUDIOCD="$(usex cdda)"
- -DENABLE_DBUS="$(usex dbus)"
- -DENABLE_DROPBOX="$(usex dropbox)"
- -DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
- -DENABLE_LIBGPOD="$(usex ipod)"
- -DENABLE_LIBLASTFM="$(usex lastfm)"
- -DENABLE_MOODBAR="$(usex moodbar)"
- -DENABLE_LIBMTP="$(usex mtp)"
- -DENABLE_VISUALISATIONS="$(usex projectm)"
- -DENABLE_SEAFILE="$(usex seafile)"
- -DENABLE_SKYDRIVE="$(usex skydrive)"
- -DENABLE_LIBPULSE="$(usex pulseaudio)"
- -DENABLE_UDISKS2="$(usex udisks)"
- -DENABLE_WIIMOTEDEV="$(usex wiimote)"
- )
-
- use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd "${CMAKE_BUILD_DIR}" || die
- virtx emake test
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-
- elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
- elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
- elog "depending on your preferences"
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
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 d03db2451ad..00000000000
--- 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
-
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2020-05-28 8:56 Lars Wendler
0 siblings, 0 replies; 16+ messages in thread
From: Lars Wendler @ 2020-05-28 8:56 UTC (permalink / raw
To: gentoo-commits
commit: 922013719ab545531b37dcb72a743c3b98db38be
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 28 08:37:37 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 28 08:56:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92201371
media-sound/clementine: Fixed build with qt-5.15
Thanks-to: Nick Andrade <SDNick484 <AT> gmail.com>
Closes: https://bugs.gentoo.org/725678
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-sound/clementine/clementine-1.4.0_rc1.ebuild | 4 ++
...clementine-1.4.0_rc1-QPainterPath_include.patch | 50 ++++++++++++++++++++++
2 files changed, 54 insertions(+)
diff --git a/media-sound/clementine/clementine-1.4.0_rc1.ebuild b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
index 7ee8c3edfb6..0808dceb128 100644
--- a/media-sound/clementine/clementine-1.4.0_rc1.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
@@ -106,6 +106,10 @@ RESTRICT="test"
DOCS=( Changelog README.md )
+PATCHES=(
+ "${FILESDIR}/${P}-QPainterPath_include.patch" #725678
+)
+
src_prepare() {
l10n_find_plocales_changes "src/translations" "" ".po"
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch b/media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch
new file mode 100644
index 00000000000..3a441412ba2
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch
@@ -0,0 +1,50 @@
+From 7715ae5c01528213a97369e14d5461efd264cc27 Mon Sep 17 00:00:00 2001
+From: SDNick484 <SDNick484@gmail.com>
+Date: Thu, 28 May 2020 10:34:31 +0200
+Subject: [PATCH] Adds missing QPainterPath include
+
+---
+ src/widgets/freespacebar.cpp | 1 +
+ src/widgets/osdpretty.cpp | 1 +
+ src/widgets/sliderwidget.cpp | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp
+index 3067f722b..c9789d353 100644
+--- a/src/widgets/freespacebar.cpp
++++ b/src/widgets/freespacebar.cpp
+@@ -20,6 +20,7 @@
+
+ #include <QLinearGradient>
+ #include <QPainter>
++#include <QPainterPath>
+
+ const int FreeSpaceBar::kBarHeight = 20;
+ const int FreeSpaceBar::kBarBorderRadius = 8;
+diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp
+index 9d95716d8..30cef7dae 100644
+--- a/src/widgets/osdpretty.cpp
++++ b/src/widgets/osdpretty.cpp
+@@ -26,6 +26,7 @@
+ #include <QLayout>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QSettings>
+ #include <QTimer>
+ #include <QTimeLine>
+diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp
+index 581a0de7b..96bbc0e5e 100644
+--- a/src/widgets/sliderwidget.cpp
++++ b/src/widgets/sliderwidget.cpp
+@@ -27,6 +27,7 @@
+ #include <QSize>
+ #include <QTimer>
+ #include <QStyle>
++#include <QtGui>
+ #include <QMenu>
+ #include <QWheelEvent>
+ #include <QMouseEvent>
+--
+2.27.0.rc2
+
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
@ 2023-01-02 12:32 Viorel Munteanu
0 siblings, 0 replies; 16+ messages in thread
From: Viorel Munteanu @ 2023-01-02 12:32 UTC (permalink / raw
To: gentoo-commits
commit: 80c425d6a843dda3f36264fa06241b31de6bc6f9
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Wed Dec 21 01:37:17 2022 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Jan 2 12:29:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80c425d6
media-sound/clementine: fix deps and link
crypto++ was required only for spotify which is gone
(https://bugs.gentoo.org/885529)
Closes: https://bugs.gentoo.org/887105
Closes: https://bugs.gentoo.org/887163
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/28722
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
...c2-r1.ebuild => clementine-1.4.0_rc2-r2.ebuild} | 37 +++++++++++-----------
media-sound/clementine/clementine-9999.ebuild | 33 +++++++++----------
.../clementine/files/clementine-1.4.0_rc2-lz.patch | 33 +++++++++++++++++++
3 files changed, 67 insertions(+), 36 deletions(-)
diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r1.ebuild b/media-sound/clementine/clementine-1.4.0_rc2-r2.ebuild
similarity index 94%
rename from media-sound/clementine/clementine-1.4.0_rc2-r1.ebuild
rename to media-sound/clementine/clementine-1.4.0_rc2-r2.ebuild
index 68143124af82..c10ccef43172 100644
--- a/media-sound/clementine/clementine-1.4.0_rc2-r1.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -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
@@ -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
@@ -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
@@ -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 )
@@ -116,9 +119,6 @@ src_configure() {
# spotify is not in portage
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
@@ -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
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 395332d8f569..249aacb20819 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -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
@@ -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
@@ -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
@@ -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 )
@@ -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
@@ -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
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
new file mode 100644
index 000000000000..a33f07d5a5f9
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-lz.patch
@@ -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(
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2023-01-02 12:32 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-26 3:32 [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-01-02 12:32 Viorel Munteanu
2020-05-28 8:56 Lars Wendler
2018-12-02 18:43 Andreas Sturmlechner
2018-12-02 18:43 Andreas Sturmlechner
2018-03-22 18:02 Andreas Sturmlechner
2017-12-08 18:32 Andreas Sturmlechner
2017-11-21 10:19 Andreas Sturmlechner
2017-05-16 19:53 Lars Wendler
2017-01-04 15:07 Lars Wendler
2016-12-26 16:14 Lars Wendler
2016-09-13 8:04 David Seifert
2016-05-03 14:59 Lars Wendler
2016-04-27 12:22 Lars Wendler
2016-04-17 4:33 Jason Donenfeld
2016-03-16 0:48 Jason Donenfeld
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox