git » audacity.git » commit 2410abe

diff --git a/PKGBUILD b/PKGBUILD
index ddceacd..c4dd763 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=audacity
 pkgver=2.4.1
-pkgrel=7
+pkgrel=8
 epoch=1
 pkgdesc="A program that lets you manipulate digital audio waveforms"
 arch=('x86_64')
@@ -13,21 +13,31 @@ groups=('pro-audio')
 # upstream hard codes/vendors portaudio/portmidi
 # https://github.com/audacity/audacity/issues/522
 depends=('expat' 'gcc-libs' 'gdk-pixbuf2' 'glibc' 'libmad'
-'libsoxr' 'soundtouch' 'wxgtk3')
-makedepends=('alsa-lib' 'cmake' 'ffmpeg' 'flac' 'glib2' 'gtk3' 'jack' 'lame'
+'libsoxr' 'soundtouch' 'wxwidgets-gtk3')
+makedepends=('alsa-lib' 'cmake' 'ffmpeg4.4' 'flac' 'glib2' 'gtk3' 'jack' 'lame'
 'libid3tag' 'libogg' 'libsndfile' 'libvorbis' 'lilv' 'lv2' 'portsmf' 'suil'
 'twolame' 'vamp-plugin-sdk')
 optdepends=('ffmpeg: additional import/export capabilities')
 source=("https://github.com/${pkgname}/${pkgname}/archive/Audacity-${pkgver}.tar.gz"
-        "${pkgname}-2.4.1-resize_crash.patch::https://github.com/dvzrv/audacity/commit/d7e769040b508aaf15ce7b51cc1a565d41cdb079.patch")
+        "${pkgname}-2.4.1-resize_crash.patch::https://github.com/dvzrv/audacity/commit/d7e769040b508aaf15ce7b51cc1a565d41cdb079.patch"
+         https://github.com/audacity/audacity/commit/9b743cc1.patch
+         https://github.com/audacity/audacity/commit/55383fcc.patch)
 sha512sums=('2f0a3f7e24dce91ae520e285dbb05778b68e0fe37b8ded55ac568b5f8135069951b3986764adc5d0791c165b283a3c19596f1d6f51ba17028e0eb04558c63f25'
-            '9c111b6d74ff0cd76f5f2db0ce513bf1c5400c41497220c87ea694f5b2b75c1e6bc1a817dd1fb2e81ed5ddcf2c610bb334a091c2cd8f7bae1111a911f47cab4b')
+            '9c111b6d74ff0cd76f5f2db0ce513bf1c5400c41497220c87ea694f5b2b75c1e6bc1a817dd1fb2e81ed5ddcf2c610bb334a091c2cd8f7bae1111a911f47cab4b'
+            '6c0945adaa2f6ec8afe7c7afd1fda56387cd0df438c7ea1d8103d75c55ecaf432083ad4d2741a4eb6a90cddee45cd3c1f4de80235749a79408bc8824f303c1ac'
+            '64fa3a78d56e8a44e1315d2d19d6310bbf185eed2fd1b0cdb4bc92338149a51c22e77986ecb1696477f367c459afa3b60638def96ef241cf7d162c82feb40016')
 
 prepare() {
   mv -v "${pkgname}-Audacity-${pkgver}" "${pkgname}-${pkgver}"
   cd "${pkgname}-${pkgver}"
   # fix crash on resize: https://bugs.archlinux.org/task/66771
   patch -Np1 -i "../${pkgname}-2.4.1-resize_crash.patch"
+  # fix build with wxwidgets 3.2
+  patch -p1 -i ../9b743cc1.patch
+  patch -p1 -i ../55383fcc.patch
+  sed -e 's|3\.1\.\*|3.2.*|' -i configure.ac -i lib-src/lib-widget-extra/configure.ac # Fix wxwidgets 3.2 detection
+  autoreconf -vfi
+  cd lib-src/lib-widget-extra
   autoreconf -vfi
 }
 
@@ -38,7 +48,8 @@ build() {
   # https://github.com/audacity/audacity/issues/519
   # https://github.com/audacity/audacity/issues/520
   # https://github.com/audacity/audacity/issues/521
-  WX_CONFIG=wx-config-gtk3 ./configure --prefix="/usr" \
+  PKG_CONFIG_PATH=/usr/lib/ffmpeg4.4/pkgconfig \
+  ./configure --prefix="/usr" \
     --with-libsndfile="system" \
     --with-ffmpeg="system" \
     --with-expat="system" \