summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-12-12 05:15:15 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-12-12 05:18:37 -0300
commit729e1a0f1f94cb654d91732c10893b5cf7b7b1e5 (patch)
treee0628a4556d57ea0d29705394432a76a2d31963b
parent7aa6a3c67e2c23f6210ab653cf572b7bd378f52b (diff)
downloadabslibre-729e1a0f1f94cb654d91732c10893b5cf7b7b1e5.tar.gz
abslibre-729e1a0f1f94cb654d91732c10893b5cf7b7b1e5.tar.bz2
abslibre-729e1a0f1f94cb654d91732c10893b5cf7b7b1e5.zip
amarok-2.8.0-7.nonprism1: C++11 ABI rebuild
* fix taglib 1.10 detection
-rw-r--r--nonprism/amarok/PKGBUILD22
-rw-r--r--nonprism/amarok/taglib_version_detect.patch26
2 files changed, 40 insertions, 8 deletions
diff --git a/nonprism/amarok/PKGBUILD b/nonprism/amarok/PKGBUILD
index 2c7bc2b07..4e1ec57cb 100644
--- a/nonprism/amarok/PKGBUILD
+++ b/nonprism/amarok/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 237178 2015-04-15 16:59:36Z arojas $
+# $Id: PKGBUILD 253565 2015-12-07 17:53:16Z arojas $
# Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
# Contributor (Arch): damir <damir@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=amarok
pkgver=2.8.0
-pkgrel=6.nonprism1
+pkgrel=7.nonprism1
pkgdesc="The powerful music player for KDE, without Amazon MP3 store support"
arch=("i686" "x86_64")
url="http://amarok.kde.org/"
@@ -18,23 +18,29 @@ depends=('kdebase-runtime' 'mariadb' 'qtscriptgenerator' 'taglib-extras'
makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
'libmygpo-qt' 'mesa')
optdepends=("libgpod: support for Apple iPod audio devices"
- "libmtp: support for portable media devices"
- "loudmouth: backend needed by mp3tunes for syncing"
+ "libmtp: support for portable media devices"
+ "loudmouth: backend needed by mp3tunes for syncing"
"ifuse: support for Apple iPod Touch and iPhone"
- "libmygpo-qt: gpodder.net Internet Service")
+ "libmygpo-qt: gpodder.net Internet Service"
+ "gst-libav: MP3 codecs")
install="${pkgname}.install"
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
- 'remove-amazon-references-on-docs.patch')
+ taglib_version_detect.patch
+ remove-amazon-references-on-docs.patch)
sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'
+ '8b2752a0fe78621bdb9ccdb763919ea265b52b06'
'eed2616fd1465cd16f86f2e3554e3b34b83557af')
prepare() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
sed -i '\|amzdownloader|d' utilities/CMakeLists.txt
sed -i '\|amazon|d' src/services/CMakeLists.txt
- patch -Np1 -i ${srcdir}/remove-amazon-references-on-docs.patch
+ patch -Np1 -i ../remove-amazon-references-on-docs.patch
cd ..
mkdir build
+
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../taglib_version_detect.patch
}
build() {
diff --git a/nonprism/amarok/taglib_version_detect.patch b/nonprism/amarok/taglib_version_detect.patch
new file mode 100644
index 000000000..7ac171e38
--- /dev/null
+++ b/nonprism/amarok/taglib_version_detect.patch
@@ -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_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 @@ 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_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)