| 1 |
commit: e7433606134f4cc3a5d2d3216d77bc2ec209a908 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 14 08:08:17 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 14 08:08:51 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e7433606 |
| 7 |
|
| 8 |
media-sound/amarok: Add mysqld-rpath fix |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
| 11 |
|
| 12 |
media-sound/amarok/amarok-9999.ebuild | 9 +++++++-- |
| 13 |
media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch | 12 ++++++++++++ |
| 14 |
2 files changed, 19 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild |
| 17 |
index d871c0fa3d..eeb786a499 100644 |
| 18 |
--- a/media-sound/amarok/amarok-9999.ebuild |
| 19 |
+++ b/media-sound/amarok/amarok-9999.ebuild |
| 20 |
@@ -90,6 +90,8 @@ RDEPEND="${COMMONDEPEND} |
| 21 |
!media-sound/amarok:4 |
| 22 |
" |
| 23 |
|
| 24 |
+PATCHES=( ${FILESDIR}/${PN}-2.8.90-mysqld-rpath.patch ) |
| 25 |
+ |
| 26 |
src_configure() { |
| 27 |
# Append minimal-toc cflag for ppc64, see bug 280552 and 292707 |
| 28 |
# use ppc64 && append-flags -mminimal-toc |
| 29 |
@@ -98,17 +100,20 @@ src_configure() { |
| 30 |
-DCMAKE_DISABLE_FIND_PACKAGE_QJSON=ON |
| 31 |
-DWITH_MP3Tunes=OFF |
| 32 |
-DWITH_PLAYER=ON |
| 33 |
- -DWITH_SPECTRUM_ANALYZER=OFF |
| 34 |
-DWITH_MYSQL_EMBEDDED=$(usex embedded) |
| 35 |
$(cmake-utils_use_find_package ffmpeg FFmpeg) |
| 36 |
-DWITH_IPOD=$(usex ipod) |
| 37 |
- $(cmake-utils_use_find_package ipod GDKPixBuf) |
| 38 |
$(cmake-utils_use_find_package lastfm LibLastFm) |
| 39 |
$(cmake-utils_use_find_package mtp Mtp) |
| 40 |
$(cmake-utils_use_find_package ofa LibOFA) |
| 41 |
-DWITH_UTILITIES=$(usex utils) |
| 42 |
) |
| 43 |
|
| 44 |
+ use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON ) |
| 45 |
+ |
| 46 |
+ # bug 581554: add libmysqld location for rpath patch |
| 47 |
+ use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" ) |
| 48 |
+ |
| 49 |
kde5_src_configure |
| 50 |
} |
| 51 |
|
| 52 |
|
| 53 |
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 |
| 54 |
new file mode 100644 |
| 55 |
index 0000000000..08db5bbe37 |
| 56 |
--- /dev/null |
| 57 |
+++ b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch |
| 58 |
@@ -0,0 +1,12 @@ |
| 59 |
+--- a/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt 2016-05-04 11:01:25.000000000 -0400 |
| 60 |
++++ b/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt 2016-05-04 11:05:24.216625165 -0400 |
| 61 |
+@@ -28,6 +28,9 @@ |
| 62 |
+ ${ZLIB_LIBRARIES} |
| 63 |
+ ) |
| 64 |
+ |
| 65 |
++SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) |
| 66 |
++SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES INSTALL_RPATH "${MYSQLD_DIR}") |
| 67 |
++ |
| 68 |
+ if(NOT WIN32 AND NOT APPLE) |
| 69 |
+ target_link_libraries( amarok_storage-mysqlserverstorage crypt pthread ) |
| 70 |
+ endif(NOT WIN32 AND NOT APPLE) |
Archives