remove patch

This commit is contained in:
Ong Yong Xin 2021-08-31 23:11:17 +08:00
parent 599315c20a
commit 22679dc8c2
3 changed files with 6 additions and 34 deletions

View File

@ -1,6 +1,6 @@
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 = 3.0.2.r317.g3ebd8d401 pkgver = 3.0.4.r239.g6d3dd0c62
pkgrel = 1 pkgrel = 1
url = https://www.audacityteam.org/ url = https://www.audacityteam.org/
arch = i686 arch = i686
@ -10,7 +10,7 @@ pkgbase = audacity-git
license = CCPL license = CCPL
makedepends = git makedepends = git
makedepends = cmake makedepends = cmake
makedepends = clang makedepends = gcc
makedepends = sdl2 makedepends = sdl2
makedepends = libsoup makedepends = libsoup
makedepends = libnotify makedepends = libnotify
@ -41,8 +41,6 @@ pkgbase = audacity-git
provides = audacity provides = audacity
conflicts = audacity conflicts = audacity
source = git+https://github.com/audacity/audacity.git source = git+https://github.com/audacity/audacity.git
source = audacity.patch
sha256sums = SKIP sha256sums = SKIP
sha256sums = c06c60a9ae17b9265840fcd619d2c7a5668f26a94cec80c8785c7997afd4bc96
pkgname = audacity-git pkgname = audacity-git

View File

@ -4,7 +4,7 @@
# Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org>
pkgname=audacity-git pkgname=audacity-git
pkgver=3.0.2.r317.g3ebd8d401 pkgver=3.0.4.r239.g6d3dd0c62
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)
@ -13,7 +13,7 @@ license=(GPL2 CCPL)
groups=(pro-audio) groups=(pro-audio)
depends=(alsa-lib libx11 gtk3 expat libid3tag libogg libsndfile depends=(alsa-lib libx11 gtk3 expat libid3tag libogg libsndfile
libvorbis lilv lv2 portsmf suil libmad twolame vamp-plugin-sdk libsoxr soundtouch) libvorbis lilv lv2 portsmf suil libmad twolame vamp-plugin-sdk libsoxr soundtouch)
makedepends=(git cmake clang sdl2 libsoup libnotify gstreamer gst-plugins-bad-libs makedepends=(git cmake gcc sdl2 libsoup libnotify gstreamer gst-plugins-bad-libs
ffmpeg jack nasm conan) ffmpeg jack nasm conan)
# can't find system lame portmidi # can't find system lame portmidi
optdepends=('ffmpeg: additional import/export capabilities') optdepends=('ffmpeg: additional import/export capabilities')
@ -21,31 +21,22 @@ provides=(audacity)
conflicts=(audacity) conflicts=(audacity)
source=( source=(
"git+https://github.com/audacity/audacity.git" "git+https://github.com/audacity/audacity.git"
"audacity.patch"
) )
sha256sums=('SKIP' 'c06c60a9ae17b9265840fcd619d2c7a5668f26a94cec80c8785c7997afd4bc96') sha256sums=('SKIP')
pkgver() { pkgver() {
cd audacity cd audacity
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 audacity
patch --forward --strip=1 --input="${srcdir}/audacity.patch"
}
build() { build() {
mkdir audacity/build mkdir audacity/build
cd audacity/build cd audacity/build
CC=clang cmake \ CC=gcc cmake \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DwxBUILD_TOOLKIT:STRING=gtk3 \
-Daudacity_use_wxwidgets=local \
audacity_use_ffmpeg:STRING=loaded \ audacity_use_ffmpeg:STRING=loaded \
.. ..
cmake --build .
make . make .
} }

View File

@ -1,17 +0,0 @@
diff --unified --recursive --text audacity/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c audacity.new/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c
--- audacity/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c 2021-07-02 00:17:06.606660728 +0800
+++ audacity.new/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c 2021-07-02 00:18:22.376662323 +0800
@@ -4363,11 +4363,12 @@
break;
}
}
+
+ pthread_cleanup_pop( 1 );
end:
; /* Hack to fix "label at end of compound statement" error caused by pthread_cleanup_pop(1) macro. */
/* Match pthread_cleanup_push */
- pthread_cleanup_pop( 1 );
PA_DEBUG(( "%s: Thread %d exiting\n ", __FUNCTION__, pthread_self() ));
PaUnixThreading_EXIT( result );