From 7da6a532136d862bc5cdc3ee17b236d9dfe601e5 Mon Sep 17 00:00:00 2001 From: Dmitry Vedenko Date: Thu, 5 Aug 2021 19:32:53 +0300 Subject: [PATCH] Use system PortAudio in Linux packaging targets --- linux/packages/arch/Dockerfile | 2 -- linux/packages/arch/PKGBUILD | 4 ++-- linux/packages/arch/dependencies.sh | 5 +++-- linux/packages/arch/entrypoint.sh | 1 - linux/packages/fedora34/audacity.spec | 1 - linux/packages/fedora34/entrypoint.sh | 1 - linux/packages/ubuntu-20.04/debian/rules | 1 - linux/packages/ubuntu-20.04/entrypoint.sh | 1 - 8 files changed, 5 insertions(+), 11 deletions(-) diff --git a/linux/packages/arch/Dockerfile b/linux/packages/arch/Dockerfile index 01a59f340..c14f88e43 100644 --- a/linux/packages/arch/Dockerfile +++ b/linux/packages/arch/Dockerfile @@ -4,8 +4,6 @@ LABEL maintainer="d.vedenko@audacityteam.org" LABEL description="A build environment to check the builds for Arch package maintainers" LABEL version="3.0" -RUN pacman -Syu --noconfirm - COPY ["dependencies.sh", "/dependencies.sh"] RUN ./dependencies.sh diff --git a/linux/packages/arch/PKGBUILD b/linux/packages/arch/PKGBUILD index 3d46329e2..798e25298 100644 --- a/linux/packages/arch/PKGBUILD +++ b/linux/packages/arch/PKGBUILD @@ -22,7 +22,8 @@ depends=(zlib libsndfile jack lilv - lv2 + lv2 + portaudio portsmf portmidi suil @@ -82,7 +83,6 @@ build() { -D audacity_use_pch=no -D audacity_use_wxwidgets=local # wxWidgets 3.1 is not available - -D audacity_use_portaudio=local # System portaudio is not yet usable -D audacity_use_sbsms=local # sbsms is only available in AUR ) diff --git a/linux/packages/arch/dependencies.sh b/linux/packages/arch/dependencies.sh index 51ced27d3..3a71464e9 100755 --- a/linux/packages/arch/dependencies.sh +++ b/linux/packages/arch/dependencies.sh @@ -22,7 +22,8 @@ deps=( libsndfile jack lilv - lv2 + lv2 + portaudio portsmf portmidi suil @@ -37,6 +38,6 @@ deps=( ffmpeg ) -pacman -S --noconfirm \ +pacman -Syu --noconfirm \ "${build_deps[@]}" \ "${deps[@]}" diff --git a/linux/packages/arch/entrypoint.sh b/linux/packages/arch/entrypoint.sh index c5c2c7aca..18556bbab 100644 --- a/linux/packages/arch/entrypoint.sh +++ b/linux/packages/arch/entrypoint.sh @@ -13,7 +13,6 @@ cmake_args=( -D audacity_use_pch=no -D audacity_use_wxwidgets=local # wxWidgets 3.1 is not available - -D audacity_use_portaudio=local # System portaudio is not yet usable -D audacity_use_sbsms=local # sbsms is only available in AUR ) diff --git a/linux/packages/fedora34/audacity.spec b/linux/packages/fedora34/audacity.spec index a2242eff1..bdf2e81eb 100644 --- a/linux/packages/fedora34/audacity.spec +++ b/linux/packages/fedora34/audacity.spec @@ -82,7 +82,6 @@ supports PulseAudio, OSS and ALSA under Linux. -D audacity_lib_preference=system \ -D audacity_obey_system_dependencies=On \ -D audacity_use_pch=no \ - -D audacity_use_portaudio=local \ -D audacity_use_portsmf=local \ -D audacity_use_sbsms=local \ diff --git a/linux/packages/fedora34/entrypoint.sh b/linux/packages/fedora34/entrypoint.sh index b1f13abe1..019a238e0 100644 --- a/linux/packages/fedora34/entrypoint.sh +++ b/linux/packages/fedora34/entrypoint.sh @@ -13,7 +13,6 @@ cmake_args=( -D audacity_use_pch=no - -D audacity_use_portaudio=local # System portaudio is not yet usable -D audacity_use_portsmf=local -D audacity_use_sbsms=local ) diff --git a/linux/packages/ubuntu-20.04/debian/rules b/linux/packages/ubuntu-20.04/debian/rules index 4c95fb861..fd33064aa 100755 --- a/linux/packages/ubuntu-20.04/debian/rules +++ b/linux/packages/ubuntu-20.04/debian/rules @@ -18,7 +18,6 @@ override_dh_auto_configure: -Daudacity_obey_system_dependencies=On \ -Daudacity_use_pch=no \ -Daudacity_use_wxwidgets=local \ - -Daudacity_use_portaudio=local \ -Daudacity_use_vamp=local \ -Daudacity_use_sbsms=local diff --git a/linux/packages/ubuntu-20.04/entrypoint.sh b/linux/packages/ubuntu-20.04/entrypoint.sh index 528bedd0a..b177c27f4 100644 --- a/linux/packages/ubuntu-20.04/entrypoint.sh +++ b/linux/packages/ubuntu-20.04/entrypoint.sh @@ -13,7 +13,6 @@ cmake_args=( -D audacity_use_pch=no -D audacity_use_wxwidgets=local # wxWidgets 3.1 is not available - -D audacity_use_portaudio=local # System portaudio is not yet usable -D audacity_use_vamp=local -D audacity_use_sbsms=local # We rely on 2.2.0, 2.0.l2 is API incompatible )