Buildfix for Debian 12

libretro · Feb 5, 2025 · c03e188 · c03e188
1 parent 9982007
commit c03e188
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/Makefile.common b/Makefile.common
@@ -923,8 +923,11 @@ endif
 
 ifeq ($(HAVE_PIPEWIRE), 1)
    OBJ += audio/drivers/pipewire.o \
-          audio/common/pipewire.o \
-          camera/drivers/pipewire.o
+          audio/common/pipewire.o
+
+   ifeq ($(HAVE_PIPEWIRE_CAMERA), 1)
+      OBJ += camera/drivers/pipewire.o
+   endif
 
    ifeq ($(HAVE_MICROPHONE), 1)
       OBJ += audio/drivers_microphone/pipewire.o

diff --git a/audio/common/pipewire.c b/audio/common/pipewire.c
@@ -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);

diff --git a/camera/camera_driver.c b/camera/camera_driver.c
@@ -49,7 +49,7 @@ const camera_driver_t *camera_drivers[] = {
 #ifdef HAVE_V4L2
    &camera_v4l2,
 #endif
-#ifdef HAVE_PIPEWIRE
+#ifdef HAVE_PIPEWIRE_CAMERA
    &camera_pipewire,
 #endif
 #ifdef EMSCRIPTEN

diff --git a/qb/config.libs.sh b/qb/config.libs.sh
@@ -273,6 +273,8 @@ check_val '' PIPEWIRE -lpipewire-0.3 '' libpipewire-0.3 '' '' false
 check_val '' SDL -lSDL SDL sdl 1.2.10 '' false
 check_val '' SDL2 -lSDL2 SDL2 sdl2 2.0.0 '' false
 
+check_val '' PIPEWIRE_CAMERA -lpipewire-0.3 '' libpipewire-0.3 0.3.80 '' false
+
 if [ "$HAVE_SDL2" = 'yes' ] && [ "$HAVE_SDL" = 'yes' ]; then
    die : 'Notice: SDL drivers will be replaced by SDL2 ones.'
    HAVE_SDL=no

diff --git a/qb/config.params.sh b/qb/config.params.sh
@@ -125,6 +125,7 @@ HAVE_JACK=auto             # JACK support
 HAVE_COREAUDIO=auto        # CoreAudio support
 HAVE_COREAUDIO3=no         # CoreAudio3 support
 HAVE_PIPEWIRE=auto         # PipeWire support
+HAVE_PIPEWIRE_CAMERA=auto  # PipeWire camera support
 HAVE_PULSE=auto            # PulseAudio support
 C89_PULSE=no
 HAVE_FREETYPE=auto         # FreeType support