summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-01-19 22:58:09 +1100
committerMichael Palimaka <kensington@gentoo.org>2016-01-19 22:58:09 +1100
commitea1b5b6f6ad191d09323d7af38660a6e803e2c58 (patch)
tree223b16cb91e00b9b55d75206eb79cc60c7dc31e7 /media-sound/soundkonverter
parentdev-ml/opam: import debian patch to fix build with dose3 >= 4. Bug #566810. (diff)
downloadgentoo-ea1b5b6f6ad191d09323d7af38660a6e803e2c58.tar.gz
gentoo-ea1b5b6f6ad191d09323d7af38660a6e803e2c58.tar.bz2
gentoo-ea1b5b6f6ad191d09323d7af38660a6e803e2c58.zip
media-sound/soundkonverter: add patch to solve build failure with >=media-libs/taglib-1.10
Gentoo-bug: 572202 Package-Manager: portage-2.2.26
Diffstat (limited to 'media-sound/soundkonverter')
-rw-r--r--media-sound/soundkonverter/files/soundkonverter-2.1.2-taglib-110.patch26
-rw-r--r--media-sound/soundkonverter/soundkonverter-2.1.2.ebuild4
2 files changed, 29 insertions, 1 deletions
diff --git a/media-sound/soundkonverter/files/soundkonverter-2.1.2-taglib-110.patch b/media-sound/soundkonverter/files/soundkonverter-2.1.2-taglib-110.patch
new file mode 100644
index 00000000000..314db934d77
--- /dev/null
+++ b/media-sound/soundkonverter/files/soundkonverter-2.1.2-taglib-110.patch
@@ -0,0 +1,26 @@
+Fix configure with taglib-1.10.
+
+--- 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_VERSION VERSION_LESS "${TAGLIB_MIN_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_VERSION VERSION_LESS "${TAGLIB_MIN_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_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
diff --git a/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild b/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild
index 38f08ef4ff0..578ff4aa314 100644
--- a/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-2.1.2.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$
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
sys-devel/gettext
"
+PATCHES=( "${FILESDIR}/${PN}-2.1.2-taglib-110.patch" )
+
pkg_postinst() {
kde4-base_pkg_postinst