[vlc-commits] [Git][videolan/vlc][master] 2 commits: configure: simplify NDI module activation

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
dd4549be by Steve Lhomme at 2026-08-21T11:39:08+00:00
configure: simplify NDI module activation

- We do not need a define in config.h
- Do not check the version as there is no tagged version yet
- And we can just use PKG_ENABLE_MODULES_VLC() to enable/disable the module with the contrib.
- use access_RPATH (0b2459c20550032dd4d27f5b584741492c9203bf)

- - - - -
a58afe04 by Steve Lhomme at 2026-08-21T11:39:08+00:00
meson: add NDI module

- - - - -


4 changed files:

- configure.ac
- meson_options.txt
- modules/access/Makefile.am
- modules/access/meson.build


Changes:

=====================================
configure.ac
=====================================
@@ -1314,19 +1314,7 @@ AM_CONDITIONAL([HAVE_DBUS], [test "${have_dbus}" = "yes"])
 dnl
 dnl libnoidea support
 dnl
-AC_ARG_ENABLE([ndi],
-  [AS_HELP_STRING([--enable-ndi], [Build with NDI module (requires libnoidea)])],
-  [], [enable_ndi=yes]
-)
-AS_IF([test "${enable_ndi}" != "no"], [
-  PKG_CHECK_MODULES([NDI], [libnoidea >= 0.1.0], [
-    AC_DEFINE([HAVE_NDI], [1], [Define to 1 if you have libnoidea])
-    VLC_ADD_PLUGIN([ndi])
-  ], [
-    AC_MSG_WARN([libnoidea not found, NDI module will not be built])
-  ])
-])
-AM_CONDITIONAL([HAVE_NDI], [test "${enable_ndi}" = "yes"])
+PKG_ENABLE_MODULES_VLC([NDI], [noidea], [libnoidea], (NDI support (requires libnoidea)), [auto])
 
 dnl Check for systemd
 PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [


=====================================
meson_options.txt
=====================================
@@ -799,6 +799,11 @@ option('sam3',
        value: 'auto',
        description: 'sam3.cpp inference library')
 
+option('ndi',
+       type: 'feature',
+       value: 'auto',
+       description: 'Build with NDI module (requires libnoidea)')
+
 # TODO: Missing v4l2
 # TODO: Missing rpi-omxil
 # TODO: Missing gst-decode


=====================================
modules/access/Makefile.am
=====================================
@@ -417,13 +417,11 @@ access_PLUGINS += $(LTLIBsmb2)
 EXTRA_LTLIBRARIES += libsmb2_plugin.la
 
 libnoidea_plugin_la_SOURCES = access/ndi.c
-libnoidea_plugin_la_CFLAGS = $(AM_CFLAGS) $(NDI_CFLAGS)
-libnoidea_plugin_la_LIBADD = $(NDI_LIBS) $(SOCKET_LIBS)
-libnoidea_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
-if HAVE_NDI
+libnoidea_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_noidea)
+libnoidea_plugin_la_LIBADD = $(LIBS_noidea) $(SOCKET_LIBS)
+libnoidea_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
 access_LTLIBRARIES += $(LTLIBnoidea)
 EXTRA_LTLIBRARIES += libnoidea_plugin.la
-endif
 
 libtcp_plugin_la_SOURCES = access/tcp.c
 libtcp_plugin_la_LIBADD = $(SOCKET_LIBS)


=====================================
modules/access/meson.build
=====================================
@@ -227,6 +227,15 @@ vlc_modules += {
     'dependencies' : [m_lib]
 }
 
+# libnoidea
+libnoidea_dep = dependency('libnoidea', required: get_option('ndi'))
+vlc_modules += {
+    'name' : 'noidea',
+    'sources' : files('ndi.c'),
+    'dependencies' : [libnoidea_dep, socket_libs],
+    'enabled' : libnoidea_dep.found(),
+}
+
 
 ## Screen grab plugins
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a35c3723f0c8423df4e9711abbb8fa0941e655f4...a58afe04ff31aa9b577b65219096bee41870a9ab

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a35c3723f0c8423df4e9711abbb8fa0941e655f4...a58afe04ff31aa9b577b65219096bee41870a9ab
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help