From 1cada4cd0549a53f3c009e6d0562ff0cef76ebd4 Mon Sep 17 00:00:00 2001 From: AstroFloyd Date: Fri, 12 Jan 2018 08:12:06 +0100 Subject: media-sound/amarok (+3 deps): copy from portage to keep until Plasma-5 version of Amarok is released Package-Manager: Portage-2.3.13, Repoman-2.3.3 --- media-sound/amarok/ChangeLog | 9 ++ media-sound/amarok/Manifest | 11 ++ media-sound/amarok/amarok-2.8.90-r5.ebuild | 137 +++++++++++++++++++++ .../amarok/files/amarok-2.8.0-taglib110.patch | 40 ++++++ .../amarok/files/amarok-2.8.90-ffmpeg3.patch | 60 +++++++++ media-sound/amarok/files/amarok-2.8.90-gcc6.patch | 36 ++++++ .../files/amarok-2.8.90-mysql-embedded.patch | 34 +++++ .../amarok/files/amarok-2.8.90-mysqld-rpath.patch | 12 ++ .../amarok/files/amarok-2.8.90-no-webkit.patch | 39 ++++++ .../amarok/files/amarok-2.8.90-scriptconsole.patch | 33 +++++ media-sound/amarok/metadata.xml | 33 +++++ 11 files changed, 444 insertions(+) create mode 100644 media-sound/amarok/ChangeLog create mode 100644 media-sound/amarok/Manifest create mode 100644 media-sound/amarok/amarok-2.8.90-r5.ebuild create mode 100644 media-sound/amarok/files/amarok-2.8.0-taglib110.patch create mode 100644 media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch create mode 100644 media-sound/amarok/files/amarok-2.8.90-gcc6.patch create mode 100644 media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch create mode 100644 media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch create mode 100644 media-sound/amarok/files/amarok-2.8.90-no-webkit.patch create mode 100644 media-sound/amarok/files/amarok-2.8.90-scriptconsole.patch create mode 100644 media-sound/amarok/metadata.xml (limited to 'media-sound') diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog new file mode 100644 index 0000000..f6dcd4a --- /dev/null +++ b/media-sound/amarok/ChangeLog @@ -0,0 +1,9 @@ +*amarok-2.8.90-r5 (12 Jan 2018) + + 12 Jan 2018; AstroFloyd +amarok-2.8.90-r5.ebuild, + +files/amarok-2.8.0-taglib110.patch, +files/amarok-2.8.90-ffmpeg3.patch, + +files/amarok-2.8.90-gcc6.patch, +files/amarok-2.8.90-mysql-embedded.patch, + +files/amarok-2.8.90-mysqld-rpath.patch, +files/amarok-2.8.90-no-webkit.patch, + +files/amarok-2.8.90-scriptconsole.patch, +metadata.xml: + media-sound/amarok (+3 deps): copy from portage to keep until Plasma-5 version + of Amarok is released diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest new file mode 100644 index 0000000..31b228c --- /dev/null +++ b/media-sound/amarok/Manifest @@ -0,0 +1,11 @@ +AUX amarok-2.8.0-taglib110.patch 1537 SHA256 f751b1cce13860677af012534a02eaf7bc6e1c7a9b9d00aa2d6fa504dd80fe6f SHA512 b15456d5c297a92860306492f51449040504763c0862475a8ecdb732c3cdccab4b0f0d1bc6b9d62a7a01e2a5faa212200c5aba5ac703c267bada830d8033bac6 WHIRLPOOL 085e28d742e87356734ed47ce36eb562f7ae9761e7b09c9b6850339e91010399cec678196ceb854b58d38fbbd8d694e9943d77e625f075a7d9b31b049925fca1 +AUX amarok-2.8.90-ffmpeg3.patch 2606 SHA256 18e0fd0ac5533a8709e2b4725c677ec215f9d83ded6e3bb8cdbc86af27df544f SHA512 f2c6df1ec6aa526b3def250a11f7ef22d990d753d35dc9d6e8c29c426da63483ea7299d1e93466757ff1e2c645c41c2c69f7470c7a0d77e4c0ffec5e76006e59 WHIRLPOOL 432260cf03be331f670bfecbb121cccb709c7b214e5e7e7268ff3a5323de4b45f302f88ee7cd6de4d222eb38029ba4eec91a5da75c1cf90739e4c2d0e92ffeee +AUX amarok-2.8.90-gcc6.patch 1322 SHA256 64713524dfac62ba5b50e9a622e4e1d11a7c0fd9c942c56eb1eadf82bdf9d081 SHA512 a8a361387c524ff72c8a788048b5b713a6e18bc2976cab6784f8b3e413d21652f861b2b7c92f667abf98a638d7d012f4500afb1f8ea0b5cba8c86e4270eafe7f WHIRLPOOL 48fa1632e2e19c3c6220ffa4a11ad2fefcc3d8b96a99ca13a4d0f65f78f807edfe886a508d7be3af2771b005a8b5d07a85f70e1031717f54eea9fa3dc0650ae9 +AUX amarok-2.8.90-mysql-embedded.patch 1224 SHA256 a1eeb209d09a6554daef22c82f2cf74cca6af3e0f5caedb4d5865c297138f4de SHA512 ead9d9d0dc141113d4144326dab525e6e58427f8c3e2d5f8441a87e7d0787199b2947e08a6ff445255f0b1154e23182336403266d8b4e0a040a6b658f0d57155 WHIRLPOOL e5ea88768b5740875c536997adc35b78dcb2a601f6c67e584f24018e79e588aa26dc0fd360dbf2325dbb6bde721849ca940b5ff90416eb85d55fd90fcc1c0d65 +AUX amarok-2.8.90-mysqld-rpath.patch 573 SHA256 6554585926ede69e01a3e4dd2521e25cba0f1b03d0b3fc71bb3fe73843272fc8 SHA512 724ee90912883baa374bdf8ceca77e1d8ec809279f2254705624fb3966e8300ed02a0ddfc4613e8b9add2b7b20eed333619b3c1d1426e14e5f8ce60bdff39be5 WHIRLPOOL 2fa4f9e9bc43b0c4c926acc0e2d3cd778106f55cfc1def55307f591810f596cfa48d4a7e79922f18323ae15d6d8c2b520e8b34bea2d6ddbd5cbe86a4f2fbea80 +AUX amarok-2.8.90-no-webkit.patch 1126 SHA256 43ed16b51fa6e190b2cd758b48b08ed9e027dcc173d30e859ab7f8529c5e2e43 SHA512 1c45e9d3f4d8cd9fe6adc1a10b78f7b439a0dddb09ccff399bc3ded62207d6862d61dd5bfaccceb7044f4740f59824a6c8eae34d2e9b2de9a400ffb3305a0707 WHIRLPOOL 9ecfae8e3ef3efa7044c841b8c0caab79f1586d66d49da391c589525aa65542acd76628f45f58af1dc8e6837af65ef3563b7cceac4e639601d23f4343d72df81 +AUX amarok-2.8.90-scriptconsole.patch 1272 SHA256 d0e0442d67e8ec85b7101acd366eb48197fc70ac1c1e6801f4290ebc9628506b SHA512 3bc31284faa45c717342917f220f7ae078e1f6b0afd313bf8f2ba28b97badb4d56dafcc1a319655b2ae01dee37e09ff34978af95d1743105be8f118be2c61c9d WHIRLPOOL 977c62c81704d6810a25bb9977bcb39daab7f185a4604a5cc1020b86162cc3b043d620eba376b449bb364f9b5621c3e69bc6668e5c29bf5aba981fd777638838 +DIST amarok-2.8.90.tar.xz 48890580 SHA256 b057369ab70d192b669ee6c2c11e9e7d4140663f6a60d6175ef0bb56b4bef9a7 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc WHIRLPOOL 22da35ea61dcda04d882f4c0da7327cab10edf50140b3ae891738d10e1b9e5062eb541e35e817fd04a7f0284eb085b5ccf3edfa20438b764a9ce3615de35ca8c +EBUILD amarok-2.8.90-r5.ebuild 3620 SHA256 e4b90d3ff8a9ac423652a175c09c02fa5addc981f0d518663bf85733d15a552d SHA512 58f9a673ee497206d60a867d9f1ee1bc2512a65e77d21755774658bfab5abbb96131d5a4028bb0c2630f048d5ebe9274e09eec6c52e82f8c2eb77f4dd98e9abd WHIRLPOOL 11f59a6f9927b32198a3b8401004e2a545a6529472d006f41c73ac763356fcb29128b54675f59591c3f7175a52d1e5d0e9cb56b27b54f796848bf406c1802d63 +MISC ChangeLog 506 SHA256 24679dbc78a9e744043ddf72afa2858f171d8f415444a125963f99ef41c56d94 SHA512 42fbb6a4890f629f97922371a3ed44f36c6e7aa338a1ceaa72f6523dc23c2b8e154f014634b81df58e7db06f8e474564a6d74a25365b1bbb4083fcbbc8ca9d3b WHIRLPOOL 5b2c8274b72fb0277e86e607e5516c00b463080785a6ed2498c07a436389b22f3199d132da2f071db65b019a9bcef99afb61c36b448059f4cfd766569c99cf46 +MISC metadata.xml 1159 SHA256 359eb56dd95b008962fb673bc6cb161ffd3415076061df84e35fd1fe09db074b SHA512 0b4a4a1f388183923ce0d9f31bd622194165421c6db388fa4091b41aec8a343d6fb19c3bbac9dd288102bebf66c74df5ce81b14270dc954d8a68f7e0f76d318e WHIRLPOOL d298b5f5df1018e7332971a35755d86d488348e927b0098b9d54ec592062790232ca5044e9698a1af1453430d7f10643189d24e04744c0be0e94c1c06cdcde77 diff --git a/media-sound/amarok/amarok-2.8.90-r5.ebuild b/media-sound/amarok/amarok-2.8.90-r5.ebuild new file mode 100644 index 0000000..687cd4c --- /dev/null +++ b/media-sound/amarok/amarok-2.8.90-r5.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_REQUIRED="never" +KDE_HANDBOOK="optional" +SQL_REQUIRED="always" +VIRTUALX_REQUIRED="test" +VIRTUALDBUS_TEST="true" +inherit flag-o-matic kde4-base pax-utils + +DESCRIPTION="Advanced audio player based on KDE framework" +HOMEPAGE="https://amarok.kde.org/" +if [[ ${PV} != *9999* ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="4" +IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa test +utils" + +if [[ ${KDE_BUILD_TYPE} == live ]]; then + RESTRICT+=" test" +fi + +# ipod requires gdk enabled and also gtk compiled in libgpod +COMMONDEPEND=" + $(add_kdeapps_dep kdebase-kioslaves) + app-crypt/qca:2[qt4] + >=dev-qt/qtcore-4.8:4 + >=dev-qt/qtdbus-4.8:4 + >=dev-qt/qtscript-4.8:4 + >=kde-frameworks/kdelibs-4.14.37:4[plasma] + >=media-libs/taglib-1.7[asf(+),mp4(+)] + >=media-libs/taglib-extras-1.0.1 + sys-libs/zlib + >=virtual/mysql-5.1[embedded?] + >=x11-libs/qtscriptgenerator-0.1.0 + ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) + lastfm? ( >=media-libs/liblastfm-1.0.3[qt4] ) + mp3tunes? ( + dev-libs/glib:2 + dev-libs/libxml2 + dev-libs/openssl:0 + >=dev-qt/qtcore-4.8.4:4[glib] + net-libs/loudmouth + net-misc/curl + ) + mtp? ( >=media-libs/libmtp-1.0.0 ) + ofa? ( >=media-libs/libofa-0.9.0 ) +" +DEPEND="${COMMONDEPEND} + dev-util/automoc + virtual/pkgconfig + test? ( dev-cpp/gmock ) +" +RDEPEND="${COMMONDEPEND} + !media-sound/amarok-utils + $(add_kdeapps_dep phonon-kde) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.8.0-taglib110.patch" + "${FILESDIR}/${P}-mysql-embedded.patch" + "${FILESDIR}/${P}-mysqld-rpath.patch" + "${FILESDIR}/${P}-scriptconsole.patch" + "${FILESDIR}/${P}-gcc6.patch" + "${FILESDIR}/${P}-ffmpeg3.patch" + "${FILESDIR}/${P}-no-webkit.patch" +) + +src_prepare() { + kde4-base_src_prepare + + # requires qtwebkit + sed -i -e "s/wikipedia,//" data/amarok_homerc || die + + sed -i -e "/macro_log_feature.*QT_QTOPENGL_FOUND/d" \ + CMakeLists.txt \ + || die "failed to remove QT_QTOPENGL detection" + + sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \ + src/context/applets/CMakeLists.txt \ + || die "failed to sed out QT_QTOPENGL_FOUND" +} + +src_configure() { + # Append minimal-toc cflag for ppc64, see bug 280552 and 292707 + use ppc64 && append-flags -mminimal-toc + + local mycmakeargs=( + -DWITH_PLAYER=ON + -DWITH_NepomukCore=OFF + -DWITH_Soprano=OFF + -DWITH_MYSQL_EMBEDDED=$(usex embedded) + -DWITH_IPOD=$(usex ipod) + -DWITH_LibLastFm=$(usex lastfm) + -DWITH_MP3Tunes=$(usex mp3tunes) + -DWITH_Mtp=$(usex mtp) + -DWITH_LibOFA=$(usex ofa) + -DWITH_UTILITIES=$(usex utils) + ) + + use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON ) + use mp3tunes && mycmakeargs+=( -DWITH_Libgcrypt=OFF ) + + # bug 581554: add libmysqld location for rpath patch + use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" ) + + kde4-base_src_configure +} + +src_install() { + kde4-base_src_install + + # bug 481592 + pax-mark m "${ED}"/usr/bin/amarok +} + +pkg_postinst() { + kde4-base_pkg_postinst + + if ! use embedded; then + elog "You've disabled the amarok support for embedded mysql DBs." + elog "You'll have to configure amarok to use an external db server." + elog "Please read https://community.kde.org/Amarok/Community/MySQL for details on how" + elog "to configure the external db and migrate your data from the embedded database." + + if has_version "virtual/mysql[minimal]"; then + elog + elog "You built mysql with the minimal use flag, so it doesn't include the server." + elog "You won't be able to use the local mysql installation to store your amarok collection." + fi + fi +} diff --git a/media-sound/amarok/files/amarok-2.8.0-taglib110.patch b/media-sound/amarok/files/amarok-2.8.0-taglib110.patch new file mode 100644 index 0000000..0934816 --- /dev/null +++ b/media-sound/amarok/files/amarok-2.8.0-taglib110.patch @@ -0,0 +1,40 @@ +From: Omar Plummer +Date: Thu, 06 Aug 2015 22:24:27 +0000 +Subject: Fix TagLib version check. +X-Git-Url: http://quickgit.kde.org/?p=amarok.git&a=commitdiff&h=fec8817c530ce42b6485fdabff6051784b8d9904 +--- +Fix TagLib version check. + +The version check compared version strings lexicographically, so "1.7" +(the min version) compared as greater than "1.10.0". + +BUG: 351013 +REVIEW: 124639 +--- + + +--- a/cmake/modules/FindTaglib.cmake ++++ b/cmake/modules/FindTaglib.cmake +@@ -29,10 +29,10 @@ + + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) + +- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") ++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) + message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") + set(TAGLIB_FOUND FALSE) +- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") ++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) + + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) + +@@ -42,7 +42,7 @@ + set(TAGLIB_FOUND TRUE) + endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") +- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") ++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) + mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) + + else(TAGLIBCONFIG_EXECUTABLE) + diff --git a/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch b/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch new file mode 100644 index 0000000..31feca0 --- /dev/null +++ b/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch @@ -0,0 +1,60 @@ +https://git.reviewboard.kde.org/r/129626 + +Index: amarok-2.8.90/src/musicbrainz/MusicDNSAudioDecoder.cpp +=================================================================== +--- amarok-2.8.90.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp ++++ amarok-2.8.90/src/musicbrainz/MusicDNSAudioDecoder.cpp +@@ -223,7 +223,7 @@ MusicDNSAudioDecoder::decode( const QStr + { + if( !decodedFrame ) + { +- decodedFrame = avcodec_alloc_frame(); ++ decodedFrame = av_frame_alloc(); + if( !decodedFrame ) + { + warning() << "Unable to allocate enough memory to decode file."; +@@ -231,7 +231,7 @@ MusicDNSAudioDecoder::decode( const QStr + break; + } + else +- avcodec_get_frame_defaults( decodedFrame ); ++ av_frame_unref ( decodedFrame ); + } + + decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt ); +@@ -341,7 +341,7 @@ MusicDNSAudioDecoder::decode( const QStr + { + if( !decodedFrame ) + { +- decodedFrame = avcodec_alloc_frame(); ++ decodedFrame = av_frame_alloc(); + if( !decodedFrame ) + { + warning() << "Unable to allocate enough memory to decode file."; +@@ -349,7 +349,7 @@ MusicDNSAudioDecoder::decode( const QStr + break; + } + else +- avcodec_get_frame_defaults( decodedFrame ); ++ av_frame_unref( decodedFrame ); + } + + decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt ); +@@ -459,7 +459,7 @@ MusicDNSAudioDecoder::decode( const QStr + { + if( !decodedFrame ) + { +- decodedFrame = avcodec_alloc_frame(); ++ decodedFrame = av_frame_alloc(); + if( !decodedFrame ) + { + warning() << "Unable to allocate enough memory to decode file."; +@@ -467,7 +467,7 @@ MusicDNSAudioDecoder::decode( const QStr + break; + } + else +- avcodec_get_frame_defaults( decodedFrame ); ++ av_frame_unref( decodedFrame ); + } + + decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt ); diff --git a/media-sound/amarok/files/amarok-2.8.90-gcc6.patch b/media-sound/amarok/files/amarok-2.8.90-gcc6.patch new file mode 100644 index 0000000..bad936a --- /dev/null +++ b/media-sound/amarok/files/amarok-2.8.90-gcc6.patch @@ -0,0 +1,36 @@ +From 9308403e1c8484052f277bf6de32ee07c93a4beb Mon Sep 17 00:00:00 2001 +From: Rex Dieter +Date: Wed, 1 Jun 2016 13:58:26 -0500 +Subject: [PATCH] gcc6 buildfix + +courtesy of opensuse, thx + +BUG: 363054 +--- + src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp b/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp +index 4bdb9b9..e327354 100644 +--- a/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp ++++ b/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp +@@ -28,6 +28,7 @@ + #include "playlist/PlaylistModelStack.h" + + using namespace Playlists; ++using namespace Playlist; + + XSPFPlaylist::XSPFPlaylist( const KUrl &url, Playlists::PlaylistProvider *provider, OnLoadAction onLoad ) + : PlaylistFile( url, provider ) +@@ -101,7 +102,7 @@ XSPFPlaylist::load() + //FIXME: this needs to be moved to whatever is creating the XSPFPlaylist + if( m_autoAppendAfterLoad ) + The::playlistController()->insertPlaylist( +- ::Playlist::ModelStack::instance()->bottom()->rowCount(), ++ ModelStack::instance()->bottom()->rowCount(), + Playlists::PlaylistPtr( this ) + ); + } +-- +2.8.3 + diff --git a/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch b/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch new file mode 100644 index 0000000..b03aa18 --- /dev/null +++ b/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch @@ -0,0 +1,34 @@ +From 048ca3d57228759f05af7b9553200fd362aeaa8b Mon Sep 17 00:00:00 2001 +From: Matt Whitlock +Date: Tue, 29 Mar 2016 12:22:41 -0400 +Subject: [PATCH] Only link with MYSQL_EMBEDDED_LIBRARIES if + WITH_MYSQL_EMBEDDED + +REVIEW: 127523 +--- + src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt +index 244cde1..4c618fc 100644 +--- a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt ++++ b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt +@@ -21,11 +21,14 @@ target_link_libraries(amarok_collection-mysqlcollection + ${KDE4_KDECORE_LIBS} + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} +- ${MYSQL_EMBEDDED_LIBRARIES} + ${CMAKE_DL_LIBS} + ${ZLIB_LIBRARIES} + ) + ++if(WITH_MYSQL_EMBEDDED) ++ target_link_libraries( amarok_collection-mysqlcollection ${MYSQL_EMBEDDED_LIBRARIES} ) ++endif(WITH_MYSQL_EMBEDDED) ++ + if(NOT WIN32 AND NOT APPLE) + target_link_libraries( amarok_collection-mysqlcollection crypt pthread ) + endif(NOT WIN32 AND NOT APPLE) +-- +2.8.1 + diff --git a/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch new file mode 100644 index 0000000..c84975d --- /dev/null +++ b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch @@ -0,0 +1,12 @@ +--- a/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt.old 2016-05-04 11:01:25.000000000 -0400 ++++ b/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt 2016-05-04 11:05:24.216625165 -0400 +@@ -28,6 +28,9 @@ + ${ZLIB_LIBRARIES} + ) + ++SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) ++SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES INSTALL_RPATH "${MYSQLD_DIR}") ++ + if(NOT WIN32 AND NOT APPLE) + target_link_libraries( amarok_storage-mysqlserverstorage crypt pthread ) + endif(NOT WIN32 AND NOT APPLE) diff --git a/media-sound/amarok/files/amarok-2.8.90-no-webkit.patch b/media-sound/amarok/files/amarok-2.8.90-no-webkit.patch new file mode 100644 index 0000000..91686b1 --- /dev/null +++ b/media-sound/amarok/files/amarok-2.8.90-no-webkit.patch @@ -0,0 +1,39 @@ +Borrowed from Arch Linux. + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,7 +84,7 @@ include_directories( + ${CMAKE_CURRENT_BINARY_DIR}/shared + ) + +-find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml QtWebKit REQUIRED ) ++find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml REQUIRED ) + find_package( KDE4 4.8.4 REQUIRED ) + + include( KDE4Defaults ) +diff --git a/src/context/applets/CMakeLists.txt b/src/context/applets/CMakeLists.txt +index f4d5456d9f..cad9036681 100644 +--- a/src/context/applets/CMakeLists.txt ++++ b/src/context/applets/CMakeLists.txt +@@ -1,18 +1,18 @@ + add_subdirectory( albums ) + add_subdirectory( currenttrack ) +-add_subdirectory( info ) ++# add_subdirectory( info ) + add_subdirectory( labels ) + add_subdirectory( lyrics ) + add_subdirectory( photos ) + add_subdirectory( tabs ) +-add_subdirectory( wikipedia ) ++# add_subdirectory( wikipedia ) + + if( QT_QTOPENGL_FOUND ) + add_subdirectory( analyzer ) + endif() + + if( LIBLASTFM_FOUND ) +- add_subdirectory( upcomingevents ) ++# add_subdirectory( upcomingevents ) + add_subdirectory( similarartists ) + endif() + diff --git a/media-sound/amarok/files/amarok-2.8.90-scriptconsole.patch b/media-sound/amarok/files/amarok-2.8.90-scriptconsole.patch new file mode 100644 index 0000000..455146b --- /dev/null +++ b/media-sound/amarok/files/amarok-2.8.90-scriptconsole.patch @@ -0,0 +1,33 @@ +From 2900fe47adde10999a6c0f907d73b00a1c1bd5b1 Mon Sep 17 00:00:00 2001 +From: Myriam Schweingruber +Date: Wed, 18 May 2016 21:59:17 +0200 +Subject: [PATCH] Fix a crash in amarok when opening the Script Console + +The script console tries to write to a system folder instead of a user + folder. Note to devs: always make sure to test a system installation, + not just a local build. + +Thanks to Johannes Huber for the quick fix suggestion. + +BUG: 363176 +FIXED-IN: 2.9 +--- + src/scripting/scriptconsole/ScriptConsole.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/scripting/scriptconsole/ScriptConsole.cpp b/src/scripting/scriptconsole/ScriptConsole.cpp +index 6edd9a2..e4e0fab 100644 +--- a/src/scripting/scriptconsole/ScriptConsole.cpp ++++ b/src/scripting/scriptconsole/ScriptConsole.cpp +@@ -161,7 +161,7 @@ ScriptConsole::ScriptConsole( QWidget *parent ) + settings.endGroup(); + + if( m_savePath.isEmpty() ) +- m_savePath = KUrl( KStandardDirs::locate( "data", "amarok/scriptconsole/" ) ).path(); ++ m_savePath = KUrl( KStandardDirs::locateLocal( "data", "amarok/scriptconsole/" ) ).path(); + + slotNewScript(); + connect( m_debugger, SIGNAL(evaluationSuspended()), SLOT(slotEvaluationSuspended()) ); +-- +2.8.2 + diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml new file mode 100644 index 0000000..6ebc711 --- /dev/null +++ b/media-sound/amarok/metadata.xml @@ -0,0 +1,33 @@ + + + + + jmbsvicetto@gentoo.org + Jorge Manuel B. S. Vicetto + + + kde@gentoo.org + Gentoo KDE Project + + + sound@gentoo.org + Gentoo Sound project + + + Use libmysqld, MySQL embedded server library. + Try disabling this if you encounter -PIC related in amarok, + it will make amarok rely only on standalone MySQL server. + + Enable Last.fm streaming services support through + media-libs/liblastfm + + Enable mp3tunes integration + Enable support for libMTP (Plays4Sure) devices access through libmtp + + Use media-libs/libofa to compute MusicDNS acoustic + fingerprints (used by MusicBrainz) + + Build the utils - old media-sound/amarok-utils + + + -- cgit v1.2.3-65-gdbad