diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-12-11 13:05:00 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-12-11 13:05:00 -0300 |
| commit | 383bbc2f30c1aa9c9767492af6b6584b77ca32af (patch) | |
| tree | 6d0164111fd14e3730d2f16e0de6c561616fb159 | |
| parent | 0e4cc421032599423eea8e519a47a75839b8662c (diff) | |
soundkonverter-2.1.2-2.parabola1: C++11 ABI rebuild
* fix taglib 1.10 detection
| -rw-r--r-- | libre/soundkonverter/PKGBUILD | 17 | ||||
| -rw-r--r-- | libre/soundkonverter/soundkonverter-taglib-1.10.patch | 24 |
2 files changed, 36 insertions, 5 deletions
diff --git a/libre/soundkonverter/PKGBUILD b/libre/soundkonverter/PKGBUILD index 462fc0f78..0f4a13b8d 100644 --- a/libre/soundkonverter/PKGBUILD +++ b/libre/soundkonverter/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 123689 2014-12-09 18:50:08Z stativ $ +# $Id: PKGBUILD 150046 2015-12-07 16:56:15Z allan $ # Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor (Arch): Mateusz Herych <heniekk@gmail.com> # Contributor (Arch): Eric Belanger <eric@archlinux.org> @@ -7,9 +7,9 @@ pkgname=soundkonverter pkgver=2.1.2 -pkgrel=1.parabola1 +pkgrel=2.parabola1 pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://www.kde-apps.org/content/show.php?content=29024" license=('GPL') replaces=("${pkgname}-libre" "${pkgname}-parabola") @@ -33,8 +33,15 @@ optdepends=('cdrkit: cdda2wav backend' 'wavpack: wavpack backend' 'sox: sox plugin (change sample rate, various effects)') install=$pkgname.install -source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz") -md5sums=('4f09193d6602de7952b985b9505731f8') +source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz" soundkonverter-taglib-1.10.patch) +md5sums=('4f09193d6602de7952b985b9505731f8' + '9e95e0a090028c8e585a2c96b8a80734') + +prepare() { + cd $pkgname-$pkgver +# Fix taglib 1.10 detection + patch -p1 -i ../soundkonverter-taglib-1.10.patch +} build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/libre/soundkonverter/soundkonverter-taglib-1.10.patch b/libre/soundkonverter/soundkonverter-taglib-1.10.patch new file mode 100644 index 000000000..7db4b3c7b --- /dev/null +++ b/libre/soundkonverter/soundkonverter-taglib-1.10.patch @@ -0,0 +1,24 @@ +--- soundkonverter-2.1.2/cmake/modules/FindTaglib.cmake.orig 2015-12-07 17:46:20.470042447 +0100 ++++ soundkonverter-2.1.2/cmake/modules/FindTaglib.cmake 2015-12-07 17:47:37.743822877 +0100 +@@ -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) |