[vlc-commits] [Git][videolan/vlc][master] 2 commits: nvdec: fix broken build with meson

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
d41ea6df by Fatih Uzunoglu at 2025-02-22T07:51:50+00:00
nvdec: fix broken build with meson

Currently nvdec breaks the meson build due to:
../modules/hw/nvdec/meson.build:4:16: ERROR: Unknown function "enabler".

- - - - -
dfb04b1c by Fatih Uzunoglu at 2025-02-22T07:51:50+00:00
nvdec: use pkgconfig to probe ffnvcodec availability

- - - - -


2 changed files:

- configure.ac
- modules/hw/nvdec/meson.build


Changes:

=====================================
configure.ac
=====================================
@@ -2237,8 +2237,10 @@ AC_ARG_ENABLE([nvdec], AS_HELP_STRING([--disable-nvdec],
   [disable NVDEC decoder (default auto)]))
 have_nvdec="no"
 AS_IF([test "$enable_nvdec" != "no"], [
-  AC_CHECK_HEADERS([ffnvcodec/dynlink_loader.h], [
+  PKG_CHECK_MODULES([FFNVCODEC], [ffnvcodec], [
     have_nvdec="yes"
+  ], [
+    AC_MSG_WARN([${FFNVCODEC_PKG_ERRORS}: nvdec will not be available.])
   ])
 ])
 AM_CONDITIONAL([HAVE_NVDEC], [test "${have_nvdec}" != "no"])


=====================================
modules/hw/nvdec/meson.build
=====================================
@@ -1,11 +1,6 @@
-nvdec_dep = disabler()
-if get_option('nvdec').allowed()
-if cc.check_header('ffnvcodec/dynlink_loader.h')
-    nvdec_dep = enabler()
-elif cc.check_header('ffnvcodec/dynlink_loader.h', dependencies: contrib_dep )
-    nvdec_dep = contrib_dep
-endif
-endif
+# nvdec
+nvdec_dep = dependency('ffnvcodec', required: get_option('nvdec'))
+
 vlc_modules += {
     'name' : 'nvdec',
     'sources' : files('nvdec.c', 'hw_pool.c'),



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d691006bf465495744c0033f332124bb989b8c40...dfb04b1ca4966f20b342936a96ed55815bb5a70b

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


VideoLAN code repository instance