commit:     e1fe0df4fbd8d1a8cf1dc7afcbb63457b00a0456
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  9 18:13:25 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan  9 18:18:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1fe0df4

media-libs/taglib-extras: backport patch from upstream solving build failure 
with >=media-libs/taglib-1.10

Gentoo-bug: 571072

Package-Manager: portage-2.2.26

 .../files/taglib-extras-1.0.1-taglib110.patch      | 28 ++++++++++++++++++++++
 .../taglib-extras/taglib-extras-1.0.1-r1.ebuild    |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/media-libs/taglib-extras/files/taglib-extras-1.0.1-taglib110.patch 
b/media-libs/taglib-extras/files/taglib-extras-1.0.1-taglib110.patch
new file mode 100644
index 0000000..cce4201
--- /dev/null
+++ b/media-libs/taglib-extras/files/taglib-extras-1.0.1-taglib110.patch
@@ -0,0 +1,28 @@
+Fixes build with taglib-1.10
+
+Gentoo-bug: 571072
+
+--- cmake/modules/FindTaglib.cmake     2015/11/16 18:32:25     1444332
++++ cmake/modules/FindTaglib.cmake     2015/11/16 19:05:39     1444333
+@@ -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 not found: 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-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild 
b/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
index 559e7fb..609d129 100644
--- a/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
+++ b/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,3 +21,4 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog )
+PATCHES=( "${FILESDIR}/${P}-taglib110.patch" )

Reply via email to