diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2016-01-10 05:13:25 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-01-10 05:18:55 +1100 |
| commit | e1fe0df4fbd8d1a8cf1dc7afcbb63457b00a0456 (patch) | |
| tree | 3a9cc6df1ab2d4edd67d7ccf999160d32b588f3a /media-libs/taglib-extras | |
| parent | Drop myself as maintainer (diff) | |
| download | gentoo-e1fe0df4fbd8d1a8cf1dc7afcbb63457b00a0456.tar.gz gentoo-e1fe0df4fbd8d1a8cf1dc7afcbb63457b00a0456.tar.bz2 gentoo-e1fe0df4fbd8d1a8cf1dc7afcbb63457b00a0456.zip | |
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
Diffstat (limited to 'media-libs/taglib-extras')
| -rw-r--r-- | media-libs/taglib-extras/files/taglib-extras-1.0.1-taglib110.patch | 28 | ||||
| -rw-r--r-- | media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild | 3 |
2 files changed, 30 insertions, 1 deletions
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 000000000000..cce4201dece4 --- /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 559e7fbf9fe3..609d129450d0 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" ) |