Buildfix for Debian 12 (#17522)

This commit is contained in:
Viačasłaŭ 2025-02-06 04:10:06 +03:00 committed by GitHub
parent 187463d355
commit 5b9d5a9086
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 5 deletions

View file

@ -923,13 +923,16 @@ endif
ifeq ($(HAVE_PIPEWIRE), 1)
OBJ += audio/drivers/pipewire.o \
audio/common/pipewire.o \
camera/drivers/pipewire.o
audio/common/pipewire.o
ifeq ($(HAVE_MICROPHONE), 1)
OBJ += audio/drivers_microphone/pipewire.o
endif
ifeq ($(HAVE_PIPEWIRE_STABLE), 1)
OBJ += camera/drivers/pipewire.o
endif
LIBS += $(PIPEWIRE_LIBS)
DEF_FLAGS += $(PIPEWIRE_CFLAGS)
endif

View file

@ -214,8 +214,11 @@ void pipewire_core_deinit(pipewire_core_t *pw)
pw_core_disconnect(pw->core);
}
spa_clear_ptr(pw->ctx, pw_context_destroy);
spa_clear_ptr(pw->thread_loop, pw_thread_loop_destroy);
if (pw->ctx)
pw_context_destroy(pw->ctx);
if (pw->thread_loop)
pw_thread_loop_destroy(pw->thread_loop);
if (pw->devicelist)
string_list_free(pw->devicelist);

View file

@ -49,7 +49,7 @@ const camera_driver_t *camera_drivers[] = {
#ifdef HAVE_V4L2
&camera_v4l2,
#endif
#ifdef HAVE_PIPEWIRE
#ifdef HAVE_PIPEWIRE_STABLE
&camera_pipewire,
#endif
#ifdef EMSCRIPTEN

View file

@ -270,6 +270,7 @@ check_pkgconf ROAR libroar 1.0.12
check_val '' JACK -ljack '' jack 0.120.1 '' false
check_val '' PULSE -lpulse '' libpulse '' '' false
check_val '' PIPEWIRE -lpipewire-0.3 '' libpipewire-0.3 '' '' false
check_val '' PIPEWIRE_STABLE -lpipewire-0.3 '' libpipewire-0.3 1.0.0 '' false
check_val '' SDL -lSDL SDL sdl 1.2.10 '' false
check_val '' SDL2 -lSDL2 SDL2 sdl2 2.0.0 '' false