From 599315c20afef0d5054bc33068e5f4aae6d98fb6 Mon Sep 17 00:00:00 2001 From: Ong Yong Xin Date: Fri, 2 Jul 2021 00:55:00 +0800 Subject: [PATCH 1/5] patch portaudio-v19 so clang can compile it --- .SRCINFO | 5 +++-- PKGBUILD | 15 ++++++++++++--- audacity.patch | 17 +++++++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 audacity.patch diff --git a/.SRCINFO b/.SRCINFO index 0350a6c..5bda6fe 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = audacity-git pkgdesc = A program that lets you manipulate digital audio waveforms - pkgver = 3.0.2.r299.ge6e81399f + pkgver = 3.0.2.r317.g3ebd8d401 pkgrel = 1 url = https://www.audacityteam.org/ arch = i686 @@ -41,7 +41,8 @@ pkgbase = audacity-git provides = audacity conflicts = audacity source = git+https://github.com/audacity/audacity.git + source = audacity.patch sha256sums = SKIP + sha256sums = c06c60a9ae17b9265840fcd619d2c7a5668f26a94cec80c8785c7997afd4bc96 pkgname = audacity-git - diff --git a/PKGBUILD b/PKGBUILD index d5a8145..58daed9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,9 +1,10 @@ # Maintainer: Fabio 'Lolix' Loli -> https://github.com/FabioLolix +# Maintainer: Ong Yong Xin # Contributor: Bernhard Landauer # Contributor: Eric Bélanger pkgname=audacity-git -pkgver=3.0.2.r299.ge6e81399f +pkgver=3.0.2.r317.g3ebd8d401 pkgrel=1 pkgdesc="A program that lets you manipulate digital audio waveforms" arch=(i686 x86_64) @@ -18,14 +19,22 @@ makedepends=(git cmake clang sdl2 libsoup libnotify gstreamer gst-plugins-bad-li optdepends=('ffmpeg: additional import/export capabilities') provides=(audacity) conflicts=(audacity) -source=("git+https://github.com/audacity/audacity.git") -sha256sums=('SKIP') +source=( + "git+https://github.com/audacity/audacity.git" + "audacity.patch" +) +sha256sums=('SKIP' 'c06c60a9ae17b9265840fcd619d2c7a5668f26a94cec80c8785c7997afd4bc96') pkgver() { cd audacity 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() { mkdir audacity/build cd audacity/build diff --git a/audacity.patch b/audacity.patch new file mode 100644 index 0000000..643a13b --- /dev/null +++ b/audacity.patch @@ -0,0 +1,17 @@ +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 ); From 22679dc8c26167362d97c4cf510f9edfffc2f1d0 Mon Sep 17 00:00:00 2001 From: Ong Yong Xin Date: Tue, 31 Aug 2021 23:11:17 +0800 Subject: [PATCH 2/5] remove patch --- .SRCINFO | 6 ++---- PKGBUILD | 17 ++++------------- audacity.patch | 17 ----------------- 3 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 audacity.patch diff --git a/.SRCINFO b/.SRCINFO index 5bda6fe..3ac4018 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = audacity-git pkgdesc = A program that lets you manipulate digital audio waveforms - pkgver = 3.0.2.r317.g3ebd8d401 + pkgver = 3.0.4.r239.g6d3dd0c62 pkgrel = 1 url = https://www.audacityteam.org/ arch = i686 @@ -10,7 +10,7 @@ pkgbase = audacity-git license = CCPL makedepends = git makedepends = cmake - makedepends = clang + makedepends = gcc makedepends = sdl2 makedepends = libsoup makedepends = libnotify @@ -41,8 +41,6 @@ pkgbase = audacity-git provides = audacity conflicts = audacity source = git+https://github.com/audacity/audacity.git - source = audacity.patch sha256sums = SKIP - sha256sums = c06c60a9ae17b9265840fcd619d2c7a5668f26a94cec80c8785c7997afd4bc96 pkgname = audacity-git diff --git a/PKGBUILD b/PKGBUILD index 58daed9..574e0cd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Eric Bélanger pkgname=audacity-git -pkgver=3.0.2.r317.g3ebd8d401 +pkgver=3.0.4.r239.g6d3dd0c62 pkgrel=1 pkgdesc="A program that lets you manipulate digital audio waveforms" arch=(i686 x86_64) @@ -13,7 +13,7 @@ license=(GPL2 CCPL) groups=(pro-audio) depends=(alsa-lib libx11 gtk3 expat libid3tag libogg libsndfile 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) # can't find system lame portmidi optdepends=('ffmpeg: additional import/export capabilities') @@ -21,31 +21,22 @@ provides=(audacity) conflicts=(audacity) source=( "git+https://github.com/audacity/audacity.git" - "audacity.patch" ) -sha256sums=('SKIP' 'c06c60a9ae17b9265840fcd619d2c7a5668f26a94cec80c8785c7997afd4bc96') +sha256sums=('SKIP') pkgver() { cd audacity 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() { mkdir audacity/build cd audacity/build - CC=clang cmake \ + CC=gcc cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DwxBUILD_TOOLKIT:STRING=gtk3 \ - -Daudacity_use_wxwidgets=local \ audacity_use_ffmpeg:STRING=loaded \ .. - cmake --build . make . } diff --git a/audacity.patch b/audacity.patch deleted file mode 100644 index 643a13b..0000000 --- a/audacity.patch +++ /dev/null @@ -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 ); From ef63ef52b4fae5884fbbb2ac65a6a16687c0970c Mon Sep 17 00:00:00 2001 From: Ong Yong Xin Date: Thu, 21 Oct 2021 19:34:42 +0800 Subject: [PATCH 3/5] restore cmake flags, update to latest audacity commit --- .SRCINFO | 2 +- PKGBUILD | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3ac4018..4f8000a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = audacity-git pkgdesc = A program that lets you manipulate digital audio waveforms - pkgver = 3.0.4.r239.g6d3dd0c62 + pkgver = 3.1.0.beta.1.r20.g2d5320dd3 pkgrel = 1 url = https://www.audacityteam.org/ arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 574e0cd..87c4739 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Eric Bélanger pkgname=audacity-git -pkgver=3.0.4.r239.g6d3dd0c62 +pkgver=3.1.0.beta.1.r20.g2d5320dd3 pkgrel=1 pkgdesc="A program that lets you manipulate digital audio waveforms" arch=(i686 x86_64) @@ -30,14 +30,16 @@ pkgver() { } build() { - mkdir audacity/build - cd audacity/build + cd audacity + mkdir build && cd build CC=gcc cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - audacity_use_ffmpeg:STRING=loaded \ + -DwxBUILD_TOOLKIT:STRING=gtk3 \ + -Daudacity_use_wxwidgets=local \ + -Daudacity_use_ffmpeg:STRING=loaded \ .. - make . + cmake --build . } package() { From b0c8a6832b644e9af14dee78f1e7e488de890d3c Mon Sep 17 00:00:00 2001 From: Ong Yong Xin Date: Wed, 27 Oct 2021 16:57:33 +0800 Subject: [PATCH 4/5] add flac as a dependency, force audacity to use system libs --- .SRCINFO | 35 +++++++++++++++++++---------------- PKGBUILD | 46 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 58 insertions(+), 23 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4f8000a..b2c8d6b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = audacity-git pkgdesc = A program that lets you manipulate digital audio waveforms - pkgver = 3.1.0.beta.1.r20.g2d5320dd3 + pkgver = 3.1.0.beta.1.r28.g81bcb372d pkgrel = 1 url = https://www.audacityteam.org/ arch = i686 @@ -8,35 +8,38 @@ pkgbase = audacity-git groups = pro-audio license = GPL2 license = CCPL - makedepends = git makedepends = cmake - makedepends = gcc - makedepends = sdl2 - makedepends = libsoup - makedepends = libnotify - makedepends = gstreamer - makedepends = gst-plugins-bad-libs - makedepends = ffmpeg - makedepends = jack - makedepends = nasm makedepends = conan + makedepends = ffmpeg + makedepends = gcc + makedepends = git + makedepends = gst-plugins-bad-libs + makedepends = gstreamer + makedepends = jack + makedepends = libnotify + makedepends = libsoup + makedepends = nasm + makedepends = sdl2 depends = alsa-lib - depends = libx11 - depends = gtk3 depends = expat + depends = flac + depends = gtk3 depends = libid3tag + depends = libmad depends = libogg depends = libsndfile + depends = libsoxr depends = libvorbis + depends = libx11 depends = lilv depends = lv2 + depends = portaudio depends = portsmf + depends = soundtouch depends = suil - depends = libmad depends = twolame depends = vamp-plugin-sdk - depends = libsoxr - depends = soundtouch + depends = zlib optdepends = ffmpeg: additional import/export capabilities provides = audacity conflicts = audacity diff --git a/PKGBUILD b/PKGBUILD index 87c4739..3ee57ed 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,21 +1,52 @@ -# Maintainer: Fabio 'Lolix' Loli -> https://github.com/FabioLolix # Maintainer: Ong Yong Xin +# Contributor: Fabio 'Lolix' Loli -> https://github.com/FabioLolix # Contributor: Bernhard Landauer # Contributor: Eric Bélanger pkgname=audacity-git -pkgver=3.1.0.beta.1.r20.g2d5320dd3 +pkgver=3.1.0.beta.1.r28.g81bcb372d pkgrel=1 pkgdesc="A program that lets you manipulate digital audio waveforms" arch=(i686 x86_64) url="https://www.audacityteam.org/" license=(GPL2 CCPL) groups=(pro-audio) -depends=(alsa-lib libx11 gtk3 expat libid3tag libogg libsndfile - libvorbis lilv lv2 portsmf suil libmad twolame vamp-plugin-sdk libsoxr soundtouch) -makedepends=(git cmake gcc sdl2 libsoup libnotify gstreamer gst-plugins-bad-libs - ffmpeg jack nasm conan) -# can't find system lame portmidi +depends=( + alsa-lib + expat + flac + gtk3 + libid3tag + libmad + libogg + libsndfile + libsoxr + libvorbis + libx11 + lilv + lv2 + portaudio + portsmf + soundtouch + suil + twolame + vamp-plugin-sdk + zlib +) +makedepends=( + cmake + conan + ffmpeg + gcc + git + gst-plugins-bad-libs + gstreamer + jack + libnotify + libsoup + nasm + sdl2 +) optdepends=('ffmpeg: additional import/export capabilities') provides=(audacity) conflicts=(audacity) @@ -38,6 +69,7 @@ build() { -DwxBUILD_TOOLKIT:STRING=gtk3 \ -Daudacity_use_wxwidgets=local \ -Daudacity_use_ffmpeg:STRING=loaded \ + -Daudacity_lib_preference=system \ .. cmake --build . } From 8356100b956c4d237eaa7047485660c1b9fb8723 Mon Sep 17 00:00:00 2001 From: Yiyang Kang Date: Sun, 29 May 2022 17:23:47 +0800 Subject: [PATCH 5/5] switch to release version 3.1.3 --- .SRCINFO | 8 ++++---- PKGBUILD | 13 ++++--------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b2c8d6b..a9e0cd4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ -pkgbase = audacity-git +pkgbase = audacity pkgdesc = A program that lets you manipulate digital audio waveforms - pkgver = 3.1.0.beta.1.r28.g81bcb372d + pkgver = 3.1.3 pkgrel = 1 url = https://www.audacityteam.org/ arch = i686 @@ -43,7 +43,7 @@ pkgbase = audacity-git optdepends = ffmpeg: additional import/export capabilities provides = audacity conflicts = audacity - source = git+https://github.com/audacity/audacity.git + source = git+https://github.com/audacity/audacity.git#tag=ff6d6739fbe73de9c9ad3aa4e07642653604af44 sha256sums = SKIP -pkgname = audacity-git +pkgname = audacity diff --git a/PKGBUILD b/PKGBUILD index 3ee57ed..a85fd1c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Bernhard Landauer # Contributor: Eric Bélanger -pkgname=audacity-git -pkgver=3.1.0.beta.1.r28.g81bcb372d +pkgname=audacity +pkgver=3.1.3 pkgrel=1 pkgdesc="A program that lets you manipulate digital audio waveforms" arch=(i686 x86_64) @@ -51,19 +51,14 @@ optdepends=('ffmpeg: additional import/export capabilities') provides=(audacity) conflicts=(audacity) source=( - "git+https://github.com/audacity/audacity.git" + "git+https://github.com/audacity/audacity.git#tag=ff6d6739fbe73de9c9ad3aa4e07642653604af44" ) sha256sums=('SKIP') -pkgver() { - cd audacity - git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' | cut -d'.' -f2- -} - build() { cd audacity mkdir build && cd build - CC=gcc cmake \ + CONAN_REVISIONS_ENABLED=1 CC=gcc cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DwxBUILD_TOOLKIT:STRING=gtk3 \