diff options
author | schnoebe <schnoebe@pkgsrc.org> | 2011-07-05 04:04:30 +0000 |
---|---|---|
committer | schnoebe <schnoebe@pkgsrc.org> | 2011-07-05 04:04:30 +0000 |
commit | 372646ad9125ad3ad9b050b5ea6a8d6c2461f79c (patch) | |
tree | 2180873e2071eb58454889bff37ea2933df1ac7b /audio | |
parent | 74d2937d3c7e27b4c62e057290ddede8598b35e0 (diff) | |
download | pkgsrc-372646ad9125ad3ad9b050b5ea6a8d6c2461f79c.tar.gz |
Add a patch for cmake/modules/FindTagLib.cmake to handle version
comparison correctly.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/taglib-extras/distinfo | 3 | ||||
-rw-r--r-- | audio/taglib-extras/patches/patch-cmake_modules_FindTagLib.cmake | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/audio/taglib-extras/distinfo b/audio/taglib-extras/distinfo index edf8533b325..681a01281d0 100644 --- a/audio/taglib-extras/distinfo +++ b/audio/taglib-extras/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/02/15 15:39:08 wiz Exp $ +$NetBSD: distinfo,v 1.2 2011/07/05 04:04:30 schnoebe Exp $ SHA1 (taglib-extras-1.0.1.tar.gz) = 58af454ec230d494a75abd0aa78016a969f0c9ce RMD160 (taglib-extras-1.0.1.tar.gz) = d687119f4750a2f9eac415667c23552e50e12c72 Size (taglib-extras-1.0.1.tar.gz) = 31363 bytes SHA1 (patch-aa) = 588fa139d9ab01f332a36c8a7e6e9c03b09f49c7 +SHA1 (patch-cmake_modules_FindTagLib.cmake) = ad8ec41eaf0fbad5caa2ce2ce8967c4b0dc5a260 diff --git a/audio/taglib-extras/patches/patch-cmake_modules_FindTagLib.cmake b/audio/taglib-extras/patches/patch-cmake_modules_FindTagLib.cmake new file mode 100644 index 00000000000..c767b8bfc89 --- /dev/null +++ b/audio/taglib-extras/patches/patch-cmake_modules_FindTagLib.cmake @@ -0,0 +1,29 @@ +$NetBSD: patch-cmake_modules_FindTagLib.cmake,v 1.1 2011/07/05 04:04:30 schnoebe Exp $ + +Change the string comparision operator on the TAGLIB_VERSION to a +version comparision operator (since versions are being compared.) + +--- cmake/modules/FindTaglib.cmake.orig 2009-03-13 21:40:24.000000000 +0000 ++++ cmake/modules/FindTaglib.cmake +@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE) + + 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 not found: 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 @@ if(TAGLIBCONFIG_EXECUTABLE) + 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) |