[vlc-commits] [Git][videolan/vlc][master] 2 commits: configure: use libplacebo pkg-config file to find optional components

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
2dc4b5fe by Steve Lhomme at 2025-03-09T13:43:13+00:00
configure: use libplacebo pkg-config file to find optional components

So we don't rely on possibly outdated headers from a previous installation.

The variables in libplacebo have been around since [^1] which is in version 3.104.0
and above. We require version 4.192.

[^1]: https://github.com/haasn/libplacebo/commit/98b92cd6b47dc6ed95cc69e9bb4a51b79b44573b

- - - - -
c880691c by Steve Lhomme at 2025-03-09T13:43:13+00:00
configure: disable libplacebo Vulkan code if the user doesn't want it

- - - - -


1 changed file:

- configure.ac


Changes:

=====================================
configure.ac
=====================================
@@ -3249,6 +3249,13 @@ dnl
 
 EXTEND_HELP_STRING([Video plugins:])
 
+dnl
+dnl Vulkan
+dnl
+AC_ARG_ENABLE(vulkan,
+  [AS_HELP_STRING([--disable-vulkan],
+      [disable Vulkan support (default auto)])])
+
 dnl
 dnl  libplacebo support
 dnl
@@ -3260,12 +3267,28 @@ have_libplacebo_gl="no"
 AS_IF([test "$enable_libplacebo" != "no"], [
   PKG_CHECK_MODULES([LIBPLACEBO], [libplacebo >= 4.192], [
     AC_DEFINE([HAVE_LIBPLACEBO], [1], [Define to 1 if libplacebo is enabled.])
-    AC_CHECK_HEADER([libplacebo/vulkan.h], [VLC_ADD_PLUGIN([placebo_vk])])
-    AC_CHECK_HEADER([libplacebo/opengl.h], [
+
+    AS_IF([test "$enable_vulkan" != "no"], [
+      AC_MSG_CHECKING([libplacebo is compiled with vulkan support])
+      PLACEBO_HAS_VULKAN="$(${PKG_CONFIG} libplacebo --variable pl_has_vulkan)"
+      AS_IF([test "${PLACEBO_HAS_VULKAN}" = "1"], [
+        AC_MSG_RESULT([yes])
+        VLC_ADD_PLUGIN([placebo_vk])
+      ],[
+        AC_MSG_RESULT([no])
+      ])
+    ])
+
+    AC_MSG_CHECKING([libplacebo is compiled with OpenGL support])
+    PLACEBO_HAS_OPENGL="$(${PKG_CONFIG} libplacebo --variable pl_has_opengl)"
+    AS_IF([test "${PLACEBO_HAS_OPENGL}" = "1"], [
+        AC_MSG_RESULT([yes])
         AC_DEFINE([HAVE_LIBPLACEBO_GL], [1], [Define to 1 if <libplacebo/opengl.h> is available.])
         VLC_ADD_PLUGIN([placebo_gl])
         VLC_ADD_PLUGIN([placebo_gles2])
         have_libplacebo_gl="yes"
+    ],[
+        AC_MSG_RESULT([no])
     ])
   ], [
     AS_IF([test -n "${enable_libplacebo}"], [
@@ -3324,10 +3347,6 @@ PKG_HAVE_WITH_MODULES([GLES2], [glesv2], [enable GLES2 support (default auto)])
 dnl
 dnl Vulkan
 dnl
-AC_ARG_ENABLE(vulkan,
-  [AS_HELP_STRING([--disable-vulkan],
-      [disable Vulkan support (default auto)])])
-
 AS_IF([test "$enable_vulkan" != "no"], [
   PKG_CHECK_MODULES([VULKAN], [vulkan >= 1.0.26], [
   ], [



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/156459ca9d8fd62b3dbc817bc62eca245bd7a67d...c880691c53084ea85d010be2232a52fed85835ca

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/156459ca9d8fd62b3dbc817bc62eca245bd7a67d...c880691c53084ea85d010be2232a52fed85835ca
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance