[vlc-commits] [Git][videolan/vlc][master] 2 commits: meson: access: do not use host_machine.system()

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
088e5a6b by Johannes Kauffmann at 2023-01-24T13:45:58+00:00
meson: access: do not use host_machine.system()

Per the docs.

- - - - -
7bd62e08 by Johannes Kauffmann at 2023-01-24T13:45:58+00:00
meson: opengl: use 'in' instead of contains()

This is simpler and shorter.

- - - - -


2 changed files:

- modules/access/meson.build
- modules/video_output/opengl/meson.build


Changes:

=====================================
modules/access/meson.build
=====================================
@@ -64,7 +64,7 @@ endif
 
 # OSS access
 if get_option('oss').disable_auto_if(
-    host_machine.system() not in ['freebsd', 'netbsd', 'dragonfly']).allowed()
+    host_system not in ['freebsd', 'netbsd', 'dragonfly']).allowed()
 
     # TODO: Actually add the OSS module
 endif


=====================================
modules/video_output/opengl/meson.build
=====================================
@@ -45,13 +45,13 @@ if opengles2_dep.found()
 endif
 
 # interop_sw
-if ['darwin', 'android'].contains(host_system) or opengl_dep.found() or opengles2_dep.found()
+if host_system in ['darwin', 'android'] or opengl_dep.found() or opengles2_dep.found()
     interop_sw_deps = [gl_common_dep, m_lib]
     interop_sw_cargs = []
 
     if have_osx and opengl_dep.found()
         interop_sw_deps += libvlc_opengl
-    elif ['darwin', 'android'].contains(host_system) and opengles2_dep.found()
+    elif host_system in ['darwin', 'android'] and opengles2_dep.found()
         interop_sw_deps += libvlc_opengles
     endif
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b409c9c4733ef21d24bef958d1755f6d555711a0...7bd62e08624be8e0291e3e5819cdf3fc2c53c53b

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


VideoLAN code repository instance