summaryrefslogtreecommitdiff
path: root/media-sound/clementine
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-02-24 19:58:07 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-02-24 19:58:07 +0000
commit99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
treeda76713365257a445f3ae3b95470917f59d46728 /media-sound/clementine
parent4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)
gentoo resync : 24.02.2018
Diffstat (limited to 'media-sound/clementine')
-rw-r--r--media-sound/clementine/Manifest6
-rw-r--r--media-sound/clementine/clementine-1.3.1_p20180219.ebuild (renamed from media-sound/clementine/clementine-1.3.1_p20180203.ebuild)16
-rw-r--r--media-sound/clementine/clementine-9999.ebuild14
3 files changed, 26 insertions, 10 deletions
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index d43d6951fb29..7d88f372ec69 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,8 +1,8 @@
AUX clementine-1.3-fix-tokenizer.patch 674 BLAKE2B 6f5b0c6bd71887cbe9ce0f85a85db134710f5aaf62c4e8105ab1b8ab0e69a0953b6177fb91dd89fcdcf5493dfc1e634f51658eea9f050689aa1e219dbd8db189 SHA512 4f520dcd4937634ebf5bb814ec64267d42473886fc5abd4924ac551bbae8ecc7643ddbacd9e2f9a5b0d8c7b0f67cf5aec420b5eb73162b248cbf6b3eafafbbd8
AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
-DIST clementine-1.3.1_p20180203.tar.gz 8483246 BLAKE2B d338a93d4111be2b4d118df40bfca5fb1107cff68e62a82c387dcf83da8f34b2eeb5649fa16cf2f94cdbfc455ab01982b81091344e82d1c4eef5d7bc23008cf6 SHA512 72589c525c5c2452f09fd023df03bc7cfe45278a13d42d76678108ea2c02bf078529cf0169882cd3774ecdf65bbd6443fc1c93336148570c9a1b2a7757af61f4
+DIST clementine-1.3.1_p20180219.tar.gz 8486446 BLAKE2B f0d34dae90acfd41a4dad6943ea088fb64d16308caf8dce569c0c5a900c149a0c40838b8f420a42e9e5cf6718965cec8fe7f9bb2ed7489719f3d8316308f2d49 SHA512 7464f03be6894202ecfeb9f2dd97821cd76cec1285be2dc82155b023406c57ec1a94e3659438726b6bf3c667579ab43f668f03e12c261aea05aa468e73a05146
EBUILD clementine-1.3.1_p20171113.ebuild 4949 BLAKE2B c191c95fe3eeed9a429120b212e449b6bec7de077f0da771612fb5a3d04c3b3d64f34c92ba48fb13037f930a243695fe0768ce0df03b877f7f4479dd8bcc6d48 SHA512 5a6038ab815b894e46c1f5d84c73754a3265e105b7aca76e4cb828749d3fad64fd2ea5ea153dd26ebb602bcdd6510a185c6547df5d5e4950372a1e8ce7cc6020
-EBUILD clementine-1.3.1_p20180203.ebuild 5181 BLAKE2B 9b72a071d0bf32b6c6fb84a270e8cb4185d8c90737c4edf98226ed3432b513001dc4d123d190a988e952e84d3420bc5d0c885b7e05a0ba03113886367705cc7a SHA512 ed300896e0020255bb1003d10cc9748c6fd724c083ced82ca389d32fafae470e6b0f30aad075c19cea83d01da30239b401c8ff2e1addd06884703b7b195fd722
-EBUILD clementine-9999.ebuild 5151 BLAKE2B 3fd15cc126cf7e9e4021195d3dce0d7e2b5bd80d9cc2914c9b65c1eee766dab52792dc10f38402ba36d6ad3283a315c89d786294068839fa08227a44c3284eb7 SHA512 a5283a018f0fa14f7df6cdffcd2c767d411b6f0292938e91ca6f7f84b22a80aefbe4dcdc8006ea4785fa1103b59f4b976136d48b2c97428a721cd815d7e3fc1e
+EBUILD clementine-1.3.1_p20180219.ebuild 5580 BLAKE2B 6f6abf5ea7b7b86a5579854a42c194d4fb20e625cfb6e3fd6559bdd73869eae815a09948d4f3587788f88376a4d13bce73511e3b5c1963e81b850aa4ba8d8cdd SHA512 bdb8c69e0e949a0b14b5bfa27fd9764cdfb17357dc2d5c54dd4522743f4697906e91bc4e640a8d264eac9b33664d89b149999fd334482d05ac4416024c271fc2
+EBUILD clementine-9999.ebuild 5550 BLAKE2B 22ddba254824fe67400394ff564ca2f29e404ca74e130aea7b769e6df0a6d12952f515dfd4ffbda59727e2dedae5de46f8c82ea5ff200204f885b2154fbe8b6e SHA512 211b269365c423b0d1df92b6dfbfa5bfcc5a8c811fa7a13ab7de58112163ed34871a84977402f372af23cffbdd2e6bfd385e0c44331a8438812910da718fba65
MISC metadata.xml 1270 BLAKE2B 42b3ad43defebc30898db95bac41edde89d345e4776fa81f84581f8f35df8fa962024f0d08e84bfceba1080966988308434c7aac90d244ead02cc3a1fe01c58e SHA512 9d69291b66803e4dbe1ca50309891fcd9ee5ad5264bb7827a88a550367d770482744f3b5689f60a584b3fda7614cd27743085492dc72727275b470b225b96cf4
diff --git a/media-sound/clementine/clementine-1.3.1_p20180203.ebuild b/media-sound/clementine/clementine-1.3.1_p20180219.ebuild
index 8a8acf0c01cb..7b677eabc6e3 100644
--- a/media-sound/clementine/clementine-1.3.1_p20180203.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20180219.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
GIT_ECLASS="git-r3"
else
- COMMIT=b04367937a3160e15543a07631e36213db7b6048
+ COMMIT=4273c0313298c2f7cb6f1b02cb5461fb66865c30
SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -48,8 +48,8 @@ COMMON_DEPEND="
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[mp4(+)]
+ >=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+ media-libs/taglib
sys-libs/zlib
virtual/glu
virtual/opengl
@@ -57,7 +57,7 @@ COMMON_DEPEND="
cdda? ( dev-libs/libcdio:= )
dbus? ( dev-qt/qtdbus:5 )
ipod? ( >=media-libs/libgpod-0.8.0 )
- lastfm? ( >=media-libs/liblastfm-1[qt5] )
+ lastfm? ( >=media-libs/liblastfm-1[qt5(+)] )
moodbar? ( sci-libs/fftw:3.0 )
mtp? ( >=media-libs/libmtp-1.0.0 )
projectm? (
@@ -117,6 +117,14 @@ src_prepare() {
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() {
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index caae648812d0..e8465de79999 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -48,8 +48,8 @@ COMMON_DEPEND="
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[mp4(+)]
+ >=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+ media-libs/taglib
sys-libs/zlib
virtual/glu
virtual/opengl
@@ -57,7 +57,7 @@ COMMON_DEPEND="
cdda? ( dev-libs/libcdio:= )
dbus? ( dev-qt/qtdbus:5 )
ipod? ( >=media-libs/libgpod-0.8.0 )
- lastfm? ( >=media-libs/liblastfm-1[qt5] )
+ lastfm? ( >=media-libs/liblastfm-1[qt5(+)] )
moodbar? ( sci-libs/fftw:3.0 )
mtp? ( >=media-libs/libmtp-1.0.0 )
projectm? (
@@ -117,6 +117,14 @@ src_prepare() {
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() {