Skip to content

Prefer PortAudio playback for Linux AppImage builds #1320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dgruss wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Prefer PortAudio playback for Linux AppImage builds #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ External Libraries:])
# add portmixer option
AC_ARG_WITH([portaudio],
[AS_HELP_STRING([--with-portaudio],
[enable audio capture with PortAudio @<:@default=check@:>@])],
[with_portmixer=$withval], [with_portaudio="check"])
[enable audio capture/playback with PortAudio @<:@default=check@:>@])],
[with_portaudio=$withval], [with_portaudio="check"])

AC_ARG_WITH([portmixer],
[AS_HELP_STRING([--with-portmixer],
Expand Down
1 change: 1 addition & 0 deletions dists/linux/dl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ deps+=('wayland-protocols,https://gitlab.freedesktop.org/wayland/wayland-protoco
deps+=('xkbcommon,https://github.com/xkbcommon/libxkbcommon/archive/refs/tags/xkbcommon-1.13.1.tar.gz,f487d1e7f5e362b8971e23e354d9eb4bdc51e453')
deps+=('SDL2,https://www.libsdl.org/release/SDL2-2.32.10.tar.gz,ce98fa93e31836a751feca374ab28a0770b63c16')
deps+=('SDL2_image,https://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.8.12.tar.gz,d7075e3fe8c1780c5d239c69371ab19089209ea0')
deps+=('portaudio,https://files.portaudio.com/archives/pa_stable_v190700_20210406.tgz,b7e9b9c53d993f6d110487ef56a3d4529d21b2f1')
deps+=('sqlite,https://sqlite.org/2026/sqlite-autoconf-3530100.tar.gz,f5828a709d18bb4857cec8ddb4298c47a9143892')

if older 2.15 nasm --version ; then
Expand Down
4 changes: 3 additions & 1 deletion dists/linux/tasks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ task_usdx() {
start_build ../../.. UltraStar Deluxe
local OUTPUT="$root/build/$ARCH"
bash ./autogen.sh
./configure --prefix=/usr PKG_CONFIG_PATH="$PKG_CONFIG_PATH" CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" CC="$CC" CXX="$CXX" --enable-debug --without-portaudio --with-libprojectM --with-local-projectM-presets
./configure --prefix=/usr PKG_CONFIG_PATH="$PKG_CONFIG_PATH" CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" CC="$CC" CXX="$CXX" --enable-debug --with-portaudio --with-libprojectM --with-local-projectM-presets
sleep 1
make LDFLAGS="-O2 --sort-common --as-needed -z relro" INSTALL_DATADIR="../share/ultrastardx"
rm -rf "$OUTPUT"
Expand Down Expand Up @@ -638,6 +638,8 @@ if [ "$1" == "all_deps" ]; then
echo
task_sdl2_image
echo
task_portaudio
echo

task_sqlite
echo
Expand Down
2 changes: 1 addition & 1 deletion src/switches.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
{$DEFINE UseBASSPlayback}
{$DEFINE UseBASSInput}
{$ELSEIF Defined(HavePortaudio)}
{$DEFINE UsePortaudioPlayback}
{$DEFINE UseSDLPlayback}
{.$DEFINE UsePortaudioPlayback}
{$DEFINE UsePortaudioInput}
{$IFDEF HavePortmixer}
{$DEFINE UsePortmixer}
Expand Down
6 changes: 3 additions & 3 deletions src/ultrastardx.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,15 +279,15 @@ uses
{$IFDEF UseSDLInput}
UAudioInput_SDL in 'media\UAudioInput_SDL.pas',
{$ENDIF}
{$IFDEF UseSDLPlayback}
UAudioPlayback_SDL in 'media\UAudioPlayback_SDL.pas',
{$ENDIF}
{$IFDEF UsePortaudioInput}
UAudioInput_Portaudio in 'media\UAudioInput_Portaudio.pas',
{$ENDIF}
{$IFDEF UsePortaudioPlayback}
UAudioPlayback_Portaudio in 'media\UAudioPlayback_Portaudio.pas',
{$ENDIF}
{$IFDEF UseSDLPlayback}
UAudioPlayback_SDL in 'media\UAudioPlayback_SDL.pas',
{$ENDIF}
{$IFDEF UseFFmpegDecoder}
UAudioDecoder_FFmpeg in 'media\UAudioDecoder_FFmpeg.pas',
{$ENDIF}
Expand Down