diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2016-02-15 04:02:19 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-02-15 04:02:19 +1100 |
| commit | bc5fe1b6d77b386819a63e651f3eda085fb13034 (patch) | |
| tree | ee9f0941765c163211f59b330f90342c6da46aea | |
| parent | e538c7d3f2c9c7de1d9e8b49abaf8670c6bc980c (diff) | |
| download | kde-bc5fe1b6d77b386819a63e651f3eda085fb13034.tar.gz kde-bc5fe1b6d77b386819a63e651f3eda085fb13034.tar.bz2 kde-bc5fe1b6d77b386819a63e651f3eda085fb13034.zip | |
media-sound/amarok: backport patch from upstream fixing build with >=media-libs/taglib-1.10
Gentoo-bug: 574712
Package-Manager: portage-2.2.27
| -rw-r--r-- | media-sound/amarok/amarok-2.8.90.ebuild | 2 | ||||
| -rw-r--r-- | media-sound/amarok/files/amarok-2.8.0-taglib110.patch | 40 |
2 files changed, 42 insertions, 0 deletions
diff --git a/media-sound/amarok/amarok-2.8.90.ebuild b/media-sound/amarok/amarok-2.8.90.ebuild index 348f789f1f5..a8dc8a725d2 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 00000000000..093481659fa --- /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) + |