[gentoo-commits] proj/kde:master commit in: media-sound/amarok/, media-sound/amarok/files/

[gentoo-commits] proj/kde:master commit in: media-sound/amarok/, media-sound/amarok/files/

[Michael Palimaka]

commit:     bc5fe1b6d77b386819a63e651f3eda085fb13034
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 17:02:19 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 17:02:19 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bc5fe1b6

media-sound/amarok: backport patch from upstream fixing build with >=media-libs/taglib-1.10

Gentoo-bug: 574712

Package-Manager: portage-2.2.27

 media-sound/amarok/amarok-2.8.90.ebuild            |  2 ++
 .../amarok/files/amarok-2.8.0-taglib110.patch      | 40 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/media-sound/amarok/amarok-2.8.90.ebuild b/media-sound/amarok/amarok-2.8.90.ebuild
index 348f789..a8dc8a7 100644
--- a/media-sound/amarok/amarok-2.8.90.ebuild
+++ b/media-sound/amarok/amarok-2.8.90.ebuild
@@ -72,6 +72,8 @@ RDEPEND="${COMMONDEPEND}
 	$(add_kdeapps_dep phonon-kde)
 "
 
+PATCHES=( "${FILESDIR}/${PN}-2.8.0-taglib110.patch" )
+
 src_configure() {
 	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
 	use ppc64 && append-flags -mminimal-toc

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 <omarplummer@imergetechnologies.com>
+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)
+

[gentoo-commits] proj/kde:master commit in: media-sound/amarok/, media-sound/amarok/files/

[Andreas Sturmlechner]

commit:     e7433606134f4cc3a5d2d3216d77bc2ec209a908
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 08:08:17 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 08:08:51 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e7433606

media-sound/amarok: Add mysqld-rpath fix

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-sound/amarok/amarok-9999.ebuild                     |  9 +++++++--
 media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch | 12 ++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index d871c0fa3d..eeb786a499 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -90,6 +90,8 @@ RDEPEND="${COMMONDEPEND}
 	!media-sound/amarok:4
 "
 
+PATCHES=( ${FILESDIR}/${PN}-2.8.90-mysqld-rpath.patch )
+
 src_configure() {
 	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
 # 	use ppc64 && append-flags -mminimal-toc
@@ -98,17 +100,20 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_QJSON=ON
 		-DWITH_MP3Tunes=OFF
 		-DWITH_PLAYER=ON
-		-DWITH_SPECTRUM_ANALYZER=OFF
 		-DWITH_MYSQL_EMBEDDED=$(usex embedded)
 		$(cmake-utils_use_find_package ffmpeg FFmpeg)
 		-DWITH_IPOD=$(usex ipod)
-		$(cmake-utils_use_find_package ipod GDKPixBuf)
 		$(cmake-utils_use_find_package lastfm LibLastFm)
 		$(cmake-utils_use_find_package mtp Mtp)
 		$(cmake-utils_use_find_package ofa LibOFA)
 		-DWITH_UTILITIES=$(usex utils)
 	)
 
+	use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON )
+
+	# bug 581554: add libmysqld location for rpath patch
+	use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
+
 	kde5_src_configure
 }
 

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 0000000000..08db5bbe37
--- /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	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)