Chakra_Linux/desktop
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/desktop.git synced 2025-01-24 02:22:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rebuild amarok with liblastfm-qt4 instead of liblastfm; added patch to fix broken version comparison for taglib.

Browse Source
This commit is contained in:
shainer 2016-02-24 23:53:20 +00:00
parent a83e79f83e
commit 01fee2d602
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
amarok/PKGBUILD
View File

@ -3,13 +3,13 @@
pkgname=amarok pkgname=amarok
replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
pkgver=2.8.0 pkgver=2.8.0
pkgrel=6 pkgrel=7
pkgdesc="A media player for KDE" pkgdesc="A media player for KDE"
arch=('x86_64') arch=('x86_64')
url="http://amarok.kde.org" url="http://amarok.kde.org"
screenshot="http://amarok.kde.org/files/Amarok-2.6-InDulciJubilo-screenie4.png" screenshot="http://amarok.kde.org/files/Amarok-2.6-InDulciJubilo-screenie4.png"
license=('GPL2' 'LGPL2.1' 'FDL') license=('GPL2' 'LGPL2.1' 'FDL')
depends=('kde-runtime' 'mariadb' 'qtscriptgenerator' 'taglib-extras' 'liblastfm' 'ffmpeg' 'libofa' depends=('kde-runtime' 'mariadb' 'qtscriptgenerator' 'taglib-extras' 'liblastfm-qt4' 'ffmpeg' 'libofa'
'qjson' 'libbluray') 'qjson' 'libbluray')
makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'docbook-xsl' 'libmygpo-qt' 'mesa' 'clamz' 'loudmouth') makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'docbook-xsl' 'libmygpo-qt' 'mesa' 'clamz' 'loudmouth')
optdepends=("libgpod: support Apple iPod audio devices" optdepends=("libgpod: support Apple iPod audio devices"
@ -20,11 +20,13 @@ optdepends=("libgpod: support Apple iPod audio devices"
"loudmouth: backend needed by mp3tunes for syncing") "loudmouth: backend needed by mp3tunes for syncing")
categories=('multimedia') categories=('multimedia')
install="${pkgname}.install" install="${pkgname}.install"
source=("http://mirrors.mit.edu/kde/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") source=("http://mirrors.mit.edu/kde/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
md5sums=('53cfcb4819668b10e13b061478c7b32a') taglib_version_comparison.patch)
md5sums=('53cfcb4819668b10e13b061478c7b32a'
'ef7849e457357a1bdac7970a3633da45')
prepare(){ prepare(){
cd "${srcdir}/${pkgname}-${pkgver}" cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i ../taglib_version_comparison.patch
if [[ -e build ]]; then rm -rf build; fi if [[ -e build ]]; then rm -rf build; fi
mkdir build mkdir build
} }
@ -45,3 +47,4 @@ package(){
cd "${srcdir}/${pkgname}-${pkgver}/build" cd "${srcdir}/${pkgname}-${pkgver}/build"
make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install
} }

26
amarok/taglib_version_comparison.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
index 76b83ac..21a10a8 100644
--- a/cmake/modules/FindTaglib.cmake
+++ b/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 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 @@ 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)