Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-18 22:06:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

multimedia/tomahawk: Fixed build with taglib-1.10.

Browse source 
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
This commit is contained in:
David Spencer 2016-04-10 10:55:09 +01:00 committed by Willy Sudiarto Raharjo
parent eccef44bb7
commit ea83d28f91
3 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
multimedia/tomahawk/ee4656383a92a78299aff6f8637f174fff328e98.patch Normal file
View file

@ -0,0 +1,35 @@
From ee4656383a92a78299aff6f8637f174fff328e98 Mon Sep 17 00:00:00 2001
From: Pinak Ahuja <pinak.ahuja@gmail.com>
Date: Wed, 2 Sep 2015 14:41:00 +0530
Subject: [PATCH] Compare taglib version properly
---
CMakeModules/FindTaglib.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeModules/FindTaglib.cmake b/CMakeModules/FindTaglib.cmake
index e0efbef..f54ff78 100644
--- a/CMakeModules/FindTaglib.cmake
+++ b/CMakeModules/FindTaglib.cmake
@@ -34,10 +34,10 @@ ELSE()
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)
@@ -48,7 +48,7 @@ ELSE()
# message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}")
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)

4
multimedia/tomahawk/tomahawk.SlackBuild
View file

@ -69,6 +69,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Compare taglib version properly (fix for taglib-1.10)
# https://github.com/tomahawk-player/tomahawk/commit/ee4656383a92a78299aff6f8637f174fff328e98
patch -p1 < $CWD/ee4656383a92a78299aff6f8637f174fff328e98.patch
mkdir -p build
cd build
cmake \

2
multimedia/tomahawk/tomahawk.info
View file

@ -1,6 +1,6 @@
PRGNAM="tomahawk"
VERSION="0.8.4"
HOMEPAGE="tomahawk-player.org"
HOMEPAGE="https://www.tomahawk-player.org/"
DOWNLOAD="http://download.tomahawk-player.org/tomahawk-0.8.4.tar.bz2"
MD5SUM="04832abe1786edcc55805875b5882445"
DOWNLOAD_x86_64=""