remove ffmpeg patch

This commit is contained in:
Bernhard Landauer 2017-03-15 03:56:38 +01:00
parent b3eeded163
commit e9b871fe5b
2 changed files with 5 additions and 14 deletions

View File

@ -1,8 +1,8 @@
# Generated by mksrcinfo v8 # Generated by mksrcinfo v8
# Wed Mar 8 02:34:17 UTC 2017 # Wed Mar 15 02:56:16 UTC 2017
pkgbase = audacity-git pkgbase = audacity-git
pkgdesc = A program that lets you manipulate digital audio waveforms pkgdesc = A program that lets you manipulate digital audio waveforms
pkgver = 2.1.2.r1719.g0efe931d pkgver = 2.1.2.r1722.g2fef7f34
pkgrel = 1 pkgrel = 1
url = http://www.audacityteam.org/ url = http://www.audacityteam.org/
arch = i686 arch = i686
@ -28,9 +28,7 @@ pkgbase = audacity-git
conflicts = audacity conflicts = audacity
options = !makeflags options = !makeflags
source = audacity::git+https://github.com/audacity/audacity.git source = audacity::git+https://github.com/audacity/audacity.git
source = audacity-ffmpeg.patch
sha1sums = SKIP sha1sums = SKIP
sha1sums = 5f1733a3802bcec7d9b54cb3ec8d7d81fc38fc61
pkgname = audacity-git pkgname = audacity-git

View File

@ -3,7 +3,7 @@
pkgname=audacity-git pkgname=audacity-git
_pkgname=audacity _pkgname=audacity
pkgver=2.1.2.r1719.g0efe931d pkgver=2.1.2.r1722.g2fef7f34
pkgrel=1 pkgrel=1
pkgdesc="A program that lets you manipulate digital audio waveforms" pkgdesc="A program that lets you manipulate digital audio waveforms"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
@ -26,21 +26,14 @@ makedepends=('cmake' 'python2' 'twolame')
options=('!makeflags') options=('!makeflags')
provides=('audacity') provides=('audacity')
conflicts=('audacity') conflicts=('audacity')
source=("$_pkgname::git+https://github.com/audacity/audacity.git" source=("$_pkgname::git+https://github.com/audacity/audacity.git")
'audacity-ffmpeg.patch') sha1sums=('SKIP')
sha1sums=('SKIP'
'5f1733a3802bcec7d9b54cb3ec8d7d81fc38fc61')
pkgver() { pkgver() {
cd "$srcdir/$_pkgname" cd "$srcdir/$_pkgname"
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' | cut -d'.' -f2- git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' | cut -d'.' -f2-
} }
prepare() {
cd "$srcdir/$_pkgname"
patch -p1 -i "${srcdir}/audacity-ffmpeg.patch"
}
build() { build() {
cd "$srcdir/$_pkgname" cd "$srcdir/$_pkgname"
./configure --prefix=/usr --with-libsamplerate ./configure --prefix=/usr --with-libsamplerate