Date: Sun, 3 Jan 2016 14:45:03 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405158 - head/audio/amarok-kde4/files Message-ID: <201601031445.u03Ej3n8029066@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Sun Jan 3 14:45:03 2016 New Revision: 405158 URL: https://svnweb.freebsd.org/changeset/ports/405158 Log: Add upstream patch to fix taglib version detection Reported by: pkg-fallout Obtained from: https://quickgit.kde.org/?p=amarok.git&a=commit&h=fec8817c530ce42b6485fdabff6051784b8d9904 Added: head/audio/amarok-kde4/files/patch-git_fec8817 (contents, props changed) Added: head/audio/amarok-kde4/files/patch-git_fec8817 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/amarok-kde4/files/patch-git_fec8817 Sun Jan 3 14:45:03 2016 (r405158) @@ -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 +--- + + +--- cmake/modules/FindTaglib.cmake ++++ 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) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601031445.u03Ej3n8029066>