diff options
author | Doron Behar | 2018-08-06 20:12:16 +0300 |
---|---|---|
committer | Doron Behar | 2018-08-06 20:12:51 +0300 |
commit | c807a0e1fe453757f7936c82b0423553c8f2ecd6 (patch) | |
tree | a0c1f18491ae35cb989255abd44faafb2a117da5 | |
parent | f4d0d4022c84eeadf9403b1b3966c19afed09ba1 (diff) | |
download | aur-c807a0e1fe453757f7936c82b0423553c8f2ecd6.tar.gz |
Fork git version to stable version
-rw-r--r-- | .SRCINFO | 15 | ||||
-rw-r--r-- | 0001-make-prefix-usr.patch | 45 | ||||
-rw-r--r-- | PKGBUILD | 36 | ||||
-rw-r--r-- | cstring.patch | 12 |
4 files changed, 39 insertions, 69 deletions
@@ -1,18 +1,17 @@ -pkgbase = libkeyfinder-git +pkgbase = libkeyfinder pkgdesc = Musical key detection for digital audio. - pkgver = 239.0a5ec7f + pkgver = 2.2.1 pkgrel = 1 url = http://www.ibrahimshaath.co.uk/keyfinder/ arch = i686 arch = x86_64 license = GPL3 - makedepends = git makedepends = qt5-base depends = fftw - provides = libkeyfinder - conflicts = libkeyfinder - source = libkeyfinder-git::git://github.com/ibsh/libKeyFinder.git - sha256sums = SKIP + source = https://github.com/ibsh/libKeyFinder/archive/v2.2.1.tar.gz + source = cstring.patch + sha256sums = f168247012da2467af846d5a1301ca3eff23eb48938fb9b2dbbfa8dd0e5ccf10 + sha256sums = c23242bbe3df5a4ed7fee805e5864dea7b96032715ccf51ced1694ed0ca975de -pkgname = libkeyfinder-git +pkgname = libkeyfinder diff --git a/0001-make-prefix-usr.patch b/0001-make-prefix-usr.patch deleted file mode 100644 index 9b7a7b38b3df..000000000000 --- a/0001-make-prefix-usr.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2f868b2ffb3140c8d8b27adf7308e26d73271bf7 Mon Sep 17 00:00:00 2001 -From: Lubosz Sarnecki <lubosz.sarnecki@collabora.co.uk> -Date: Thu, 19 Nov 2015 12:25:32 +0100 -Subject: [PATCH] make prefix /usr/ - ---- - LibKeyFinder.pro | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/LibKeyFinder.pro b/LibKeyFinder.pro -index 3876a58..7d6c86f 100644 ---- a/LibKeyFinder.pro -+++ b/LibKeyFinder.pro -@@ -34,6 +34,8 @@ QMAKE_CXXFLAGS += -std=c++11 - - DEFINES += LIBKEYFINDER_LIBRARY - -+PREFIX = /usr -+ - HEADERS += \ - audiodata.h \ - binode.h \ -@@ -80,15 +82,15 @@ macx{ - CONFIG -= ppc ppc64 x86 - CONFIG += x86_64 - # installs -- QMAKE_LFLAGS_SONAME = -Wl,-install_name,/usr/local/lib/ -- headers.path = /usr/local/include/$$TARGET -+ QMAKE_LFLAGS_SONAME = -Wl,-install_name,/usr/lib/ -+ headers.path = /usr/include/$$TARGET - headers.files = $$HEADERS - INSTALLS += headers - } - - unix|macx{ -- INCLUDEPATH += /usr/local/include -- LIBS += -L/usr/local/lib/ -+ INCLUDEPATH += /usr/include -+ LIBS += -L/usr/lib/ - LIBS += -lfftw3 - } - --- -2.6.2 - @@ -1,36 +1,40 @@ -#Maintainer: Evan Purkhiser <evanpurkhiser@gmail.com> -#Contributor: Lubosz Sarnecki <lubosz@gmail.com> +# Maintainer: Doron Behar <doron.behar@gmail.com> +# Contributor: Evan Purkhiser <evanpurkhiser@gmail.com> +# Contributor: Lubosz Sarnecki <lubosz@gmail.com> -pkgname=libkeyfinder-git +pkgname=libkeyfinder +_name=libKeyFinder pkgdesc="Musical key detection for digital audio." url="http://www.ibrahimshaath.co.uk/keyfinder/" license=('GPL3') -pkgver=239.0a5ec7f +pkgver=2.2.1 pkgrel=1 - -provides=(libkeyfinder) -conflicts=(libkeyfinder) - -source=("$pkgname::git://github.com/ibsh/libKeyFinder.git") -sha256sums=('SKIP') +source=( + "https://github.com/ibsh/${_name}/archive/v${pkgver}.tar.gz" + "cstring.patch" +) +sha256sums=( + 'f168247012da2467af846d5a1301ca3eff23eb48938fb9b2dbbfa8dd0e5ccf10' + 'c23242bbe3df5a4ed7fee805e5864dea7b96032715ccf51ced1694ed0ca975de' +) depends=('fftw') -makedepends=('git' 'qt5-base') +makedepends=('qt5-base') arch=('i686' 'x86_64') -pkgver() { - cd "$srcdir/$pkgname" - echo $(git rev-list --count master).$(git rev-parse --short master) +prepare() { + cd "${srcdir}/${_name}-${pkgver}" + patch -p1 < ../cstring.patch } build() { - cd "$srcdir/$pkgname" + cd "${srcdir}/${_name}-${pkgver}" qmake-qt5 make } package() { - cd "$srcdir/$pkgname" + cd "${srcdir}/${_name}-${pkgver}" mkdir -p ${pkgdir}/usr/include/keyfinder make INSTALL_ROOT="${pkgdir}" install diff --git a/cstring.patch b/cstring.patch new file mode 100644 index 000000000000..bda28019065f --- /dev/null +++ b/cstring.patch @@ -0,0 +1,12 @@ +diff --git a/fftadapter.cpp b/fftadapter.cpp +index 57e8197..3fb8d86 100644 +--- a/fftadapter.cpp ++++ b/fftadapter.cpp +@@ -23,6 +23,7 @@ + + // Included here to allow substitution of a separate implementation .cpp + #include <cmath> ++#include <cstring> + #include <fftw3.h> + + namespace KeyFinder {
\ No newline at end of file |