Felix Paul Kühne pushed to branch master at VideoLAN / VLC
Commits:
f07edbad by KO Myung-Hun at 2026-01-22T07:58:29+01:00
meson: fix duplicated targets on OS/2
OS/2 limits DLL filenames to 8 bytes, following the so-called 8.3 rule.
'shortname' kwarg was introduced since v1.10.0.
- - - - -
d293a922 by KO Myung-Hun at 2026-01-22T07:58:29+01:00
meson: support basic OS/2 build
- - - - -
2498befa by KO Myung-Hun at 2026-01-22T07:58:29+01:00
meson: remove inet_ntop() from libcompat_functions
As configure.ac does, test inet_pton() only.
- - - - -
f694b89f by KO Myung-Hun at 2026-01-22T07:58:29+01:00
os2: export APIs correctly with meson
- - - - -
b191b8e0 by KO Myung-Hun at 2026-01-22T07:58:29+01:00
vlc_fixups.h: define in6addr_loopback and IN6ADDR_LOOPBACK_INIT on OS/2
This fixes compilation of modules/access/http/tunnel.c on OS/2.
- - - - -
4a7921b5 by KO Myung-Hun at 2026-01-22T07:58:29+01:00
meson: define PREFIX for nasm on OS/2
- - - - -
3b2d853c by KO Myung-Hun at 2026-01-22T07:58:29+01:00
meson: add KAI plugin
- - - - -
9c7dfe31 by KO Myung-Hun at 2026-01-22T07:58:29+01:00
meson: add drawable, window, KVA plugin
- - - - -
543a9c82 by KO Myung-Hun at 2026-01-22T07:58:29+01:00
meson: add OS/2-specific linker flags
- - - - -
3f6cbe32 by KO Myung-Hun at 2026-01-22T07:58:29+01:00
meson: add vcd, cdda plugin on OS/2
- - - - -
f3800e85 by KO Myung-Hun at 2026-01-22T07:58:29+01:00
packetizer: meson: add '-mstackrealign' to 'c_args'
On OS/2, meson build crashes when trying to play rtsp stream.
- - - - -
ebf07abf by KO Myung-Hun at 2026-01-22T07:58:29+01:00
meson: add os2drive plugin
- - - - -
5e3eaa97 by KO Myung-Hun at 2026-01-22T07:58:29+01:00
vlc_plugin: do not export symbols with a modifier when using libtool on OS/2
On OS/2, symbols are exported by .def when using libtool. So exporting
them with a modifier such as __declspec(dllexport) causes a linker to
complain about it.
- - - - -
48cb6246 by KO Myung-Hun at 2026-01-22T07:58:29+01:00
meson: do not add '-fvisibility=hidden' on OS/2
This generates many warnings on OS/2.
- - - - -
b25e046a by KO Myung-Hun at 2026-01-22T07:58:29+01:00
package: os2: add a setup script for meson
- - - - -
21 changed files:
- + extras/package/os2/msetup.sh
- include/vlc/libvlc.h
- include/vlc_common.h
- include/vlc_fixups.h
- include/vlc_plugin.h
- lib/meson.build
- meson.build
- meson_options.txt
- modules/access/meson.build
- modules/access_output/meson.build
- modules/audio_filter/meson.build
- modules/audio_output/meson.build
- modules/meson.build
- modules/packetizer/meson.build
- modules/services_discovery/meson.build
- modules/spu/meson.build
- modules/stream_out/hls/meson.build
- modules/stream_out/meson.build
- modules/video_chroma/meson.build
- modules/video_output/meson.build
- src/meson.build
Changes:
=====================================
extras/package/os2/msetup.sh
=====================================
@@ -0,0 +1,45 @@
+#! /bin/sh
+
+if test -z "$MESON_DIR"; then
+ echo "Please set MESON_DIR to the directory of meson.py."
+ exit 1
+fi
+
+OPTIONS="
+ --prefer-static
+ -Drun_as_root=true
+ -Dlua=enabled
+ -Dlive555=enabled
+ -Ddvdread=enabled
+ -Ddvdnav=enabled
+ -Dsftp=enabled
+ -Dvcd_module=true
+ -Dlibcddb=enabled
+ -Dlibdvbpsi=enabled
+ -Dogg=enabled
+ -Dmad=enabled
+ -Dmerge-ffmpeg=true
+ -Davcodec=enabled
+ -Davformat=enabled
+ -Dswscale=enabled
+ -Dpostproc=enabled
+ -Dflac=enabled
+ -Dvorbis=enabled
+ -Dpng=enabled
+ -Dx264=enabled
+ -Dlibass=enabled
+ -Dxcb=disabled
+ -Dfreetype=enabled
+ -Dfribidi=enabled
+ -Dfontconfig=enabled
+ -Dkva=enabled
+ -Dkai=enabled
+ -Dqt=enabled
+ -Dskins2=enabled
+ -Dlibxml2=enabled
+ -Dlibgcrypt=enabled
+ -Dgnutls=enabled
+ -Dvlc=true
+"
+
+python "$MESON_DIR"/meson.py setup $OPTIONS "$@"
=====================================
include/vlc/libvlc.h
=====================================
@@ -34,7 +34,7 @@
#ifndef VLC_LIBVLC_H
#define VLC_LIBVLC_H 1
-#if defined (_WIN32) && defined (LIBVLC_DLL_EXPORT)
+#if (defined (_WIN32) || defined (__OS2__)) && defined (LIBVLC_DLL_EXPORT)
# define LIBVLC_API __declspec(dllexport)
#elif defined (__GNUC__) && (__GNUC__ >= 4)
# define LIBVLC_API __attribute__((visibility("default")))
=====================================
include/vlc_common.h
=====================================
@@ -299,7 +299,7 @@
# define VLC_EXTERN
#endif
-#if defined (_WIN32) && defined (VLC_DLL_EXPORT)
+#if (defined (_WIN32) || defined(__OS2__) && defined (VLC_DLL_EXPORT))
# define VLC_EXPORT __declspec(dllexport)
#elif defined (__GNUC__)
# define VLC_EXPORT __attribute__((visibility("default")))
=====================================
include/vlc_fixups.h
=====================================
@@ -731,9 +731,15 @@ struct sockaddr_in6
static const struct in6_addr in6addr_any =
{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };
+static const struct in6_addr in6addr_loopback =
+ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 } };
+
#define IN6ADDR_ANY_INIT \
{ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } }
+#define IN6ADDR_LOOPBACK_INIT \
+ { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 } } }
+
# include <errno.h>
# ifndef EPROTO
# define EPROTO (ELAST + 1)
=====================================
include/vlc_plugin.h
=====================================
@@ -272,7 +272,11 @@ enum vlc_config_subcat
#define CDECL_SYMBOL
#if defined (VLC_DYNAMIC_PLUGIN)
-# if defined (_WIN32)
+/* Libtool exports symbols with .def file. If exporting those symbols with
+ * __declspec(dllexport), a linker complains about it. So do not export
+ * symbols with the modifier when using libtool on OS/2.
+ * DLL_EXPORT is defined by libtool. */
+# if defined (_WIN32) || (defined (__OS2__) && !defined (DLL_EXPORT))
# define DLL_SYMBOL __declspec(dllexport)
# undef CDECL_SYMBOL
# define CDECL_SYMBOL __cdecl
=====================================
lib/meson.build
=====================================
@@ -18,7 +18,7 @@ libvlc_sources = [
]
libvlc_cargs = []
-if host_system == 'windows'
+if host_system in ['windows', 'os/2']
libvlc_cargs += ['-DLIBVLC_DLL_EXPORT']
endif
=====================================
meson.build
=====================================
@@ -1,7 +1,7 @@
project('VLC', ['c', 'cpp'],
version: '4.0.0-dev',
default_options: ['c_std=gnu17', 'cpp_std=c++17'],
- meson_version: '>=1.1.0')
+ meson_version: '>=1.10.0')
vlc_copyright_years = '1996-2026'
vlc_version_codename = 'Otto Chriek'
@@ -102,12 +102,16 @@ if host_system == 'darwin'
add_languages('objc', native: false)
endif
+if host_system == 'os/2'
+ add_project_link_arguments('-Zbin-files', '-Zargs-wild', '-Zhigh-mem',
language: ['c', 'cpp'])
+endif
+
if host_machine.cpu_family().startswith('x86')
if add_languages('nasm', native: false, required: false)
vlc_nasm_args = []
if host_machine.cpu_family() == 'x86'
vlc_nasm_args += ['-DARCH_X86_64=0']
- if host_system in ['darwin', 'windows']
+ if host_system in ['darwin', 'windows', 'os/2']
vlc_nasm_args += ['-DPREFIX']
endif
else
@@ -225,7 +229,7 @@ threads_dep = dependency('threads', required: true)
# Check for X11
if (get_option('x11')
- .disable_auto_if(host_system in ['darwin', 'windows'])
+ .disable_auto_if(host_system in ['darwin', 'windows', 'os/2'])
.allowed())
x11_dep = dependency('x11', required: get_option('x11'))
else
@@ -545,7 +549,7 @@
add_project_arguments(cc.first_supported_argument(['-Werror-implicit-function-de
#
rt_lib = []
possible_rt_libs = ['rt']
-if host_system != 'windows'
+if host_system not in ['windows', 'os/2']
possible_rt_libs += ['pthread']
endif
foreach l : possible_rt_libs
@@ -715,7 +719,6 @@ libcompat_functions = [
['clock_getres', '#include <time.h>'],
['inet_pton', arpa_inet_h],
- ['inet_ntop', arpa_inet_h],
]
# Linux specific functions
@@ -725,6 +728,14 @@ if host_system == 'linux'
]
endif
+# OS/2 specific functions
+if host_system == 'os/2'
+ libcompat_functions += [
+ ['gai_strerror', '#include <netdb.h>'],
+ ['freeaddrinfo', '#include <sys/socket.h>\n#include <netdb.h>'],
+ ]
+endif
+
libcompat_sources = []
if have_win_store
@@ -856,9 +867,11 @@ if cc.has_type('struct timespec', prefix: '#include
<time.h>')
endif
# Add -fvisibility=hidden if compiler supports those
-add_project_arguments(
- cc.get_supported_arguments('-fvisibility=hidden'),
- language: ['c'])
+if host_system != 'os/2'
+ add_project_arguments(
+ cc.get_supported_arguments('-fvisibility=hidden'),
+ language: ['c'])
+endif
# Stack smashing protection (default enabled for optimized builds)
if (get_option('ssp')
@@ -949,7 +962,7 @@ if build_machine.endian() == 'big'
endif
# Define the shared library extension
-if host_system == 'windows'
+if host_system in ['windows', 'os/2']
cdata.set_quoted('LIBEXT', '.dll')
elif host_system == 'darwin'
cdata.set_quoted('LIBEXT', '.dylib')
=====================================
meson_options.txt
=====================================
@@ -229,6 +229,11 @@ option('sndio',
value : 'auto',
description : 'Enable/disable sndio support')
+option('kai',
+ type : 'feature',
+ value : 'auto',
+ description : 'Enable/disable KAI support')
+
option('ogg',
type : 'feature',
value : 'auto',
@@ -719,6 +724,11 @@ option('directx',
value: 'auto',
description: 'DirectX support')
+option('kva',
+ type: 'feature',
+ value: 'auto',
+ description: 'Enable/disable KVA support')
+
option('projectm',
type: 'feature',
value: 'auto',
@@ -786,11 +796,9 @@ option('nfs',
# TODO: Missing tremor
# TODO: Missing x26410b
# TODO: Missing vdpau
-# TODO: Missing kva
# TODO: Missing mmal
# TODO: Missing jack
# TODO: Missing opensles
-# TODO: Missing kai
# TODO: Missing qt-qml-cache
# TODO: Missing qt-qml-debug
# TODO: Missing libtar
=====================================
modules/access/meson.build
=====================================
@@ -59,7 +59,8 @@ vlc_modules += {
# Memory input module
vlc_modules += {
'name' : 'access_imem',
- 'sources' : files('imem.c')
+ 'sources' : files('imem.c'),
+ 'shortname' : 'a_imem',
}
# Fake sdp:// scheme input module
@@ -272,7 +273,7 @@ if get_option('vcd_module')
endif
if (needed_vcd_unix_headers_present or
- host_system in ['windows'] or have_osx)
+ host_system in ['windows', 'os/2'] or have_osx)
vcd_cdda_darwin_deps = []
if host_system == 'darwin'
@@ -522,14 +523,16 @@ vlc_modules += {
'mms/buffer.c',
'mms/asf.c',
),
- 'dependencies' : [socket_libs]
+ 'dependencies' : [socket_libs],
+ 'shortname' : 'a_mms',
}
## Misc
vlc_modules += {
'name' : 'access_concat',
- 'sources' : files('concat.c')
+ 'sources' : files('concat.c'),
+ 'shortname' : 'a_concat',
}
# Media Transfer Protocol (MTP)
@@ -537,7 +540,8 @@ if mtp_dep.found()
vlc_modules += {
'name' : 'access_mtp',
'sources' : files('mtp.c'),
- 'dependencies' : [mtp_dep]
+ 'dependencies' : [mtp_dep],
+ 'shortname' : 'a_mtp',
}
endif
@@ -546,7 +550,8 @@ if srt_dep.found()
vlc_modules += {
'name' : 'access_srt',
'sources' : files('srt.c', 'srt_common.c'),
- 'dependencies' : [srt_dep]
+ 'dependencies' : [srt_dep],
+ 'shortname' : 'a_srt',
}
endif
=====================================
modules/access_output/meson.build
=====================================
@@ -3,19 +3,22 @@
# Dummy
vlc_modules += {
'name' : 'access_output_dummy',
- 'sources' : files('dummy.c')
+ 'sources' : files('dummy.c'),
+ 'shortname' : 'a_o_dumm',
}
# File
vlc_modules += {
'name' : 'access_output_file',
- 'sources' : files('file.c')
+ 'sources' : files('file.c'),
+ 'shortname' : 'a_o_file',
}
# HTTP
vlc_modules += {
'name' : 'access_output_http',
- 'sources' : files('http.c')
+ 'sources' : files('http.c'),
+ 'shortname' : 'a_o_http',
}
# liveHTTP
@@ -25,6 +28,7 @@ vlc_modules += {
'sources' : files('livehttp.c'),
'dependencies' : [ gcrypt_dep, gpg_error_dep ],
'enabled' : gcrypt_dep.found() and gpg_error_dep.found(),
+ 'shortname' : 'a_o_live',
}
# Shout (Icecast and old Shoutcast)
@@ -33,7 +37,8 @@ if shout_dep.found()
vlc_modules += {
'name' : 'access_output_shout',
'sources' : files('shout.c'),
- 'dependencies' : [shout_dep, socket_libs]
+ 'dependencies' : [shout_dep, socket_libs],
+ 'shortname' : 'a_o_shou',
}
endif
@@ -42,7 +47,8 @@ vlc_modules += {
'name' : 'access_http_put',
'sources' : files('http-put.c'),
'include_directories' : include_directories('../access/http'),
- 'link_with' : [vlc_http_lib]
+ 'link_with' : [vlc_http_lib],
+ 'shortname' : 'a_http_p',
}
# SRT
@@ -52,6 +58,7 @@ if srt_dep.found()
'sources' : files('srt.c', '../access/srt_common.c'),
'include_directories' : include_directories('../access/'),
'dependencies' : [srt_dep],
+ 'shortname' : 'a_o_srt',
}
endif
@@ -61,6 +68,7 @@ if librist_dep.found()
'name' : 'access_output_rist',
'sources' : files('rist.c'),
'include_directories' : include_directories('../access/'),
- 'dependencies' : [librist_dep]
+ 'dependencies' : [librist_dep],
+ 'shortname' : 'a_o_rist',
}
endif
=====================================
modules/audio_filter/meson.build
=====================================
@@ -8,7 +8,8 @@ include_dir = include_directories('.')
vlc_modules += {
'name' : 'audiobargraph_a',
'sources' : files('audiobargraph_a.c'),
- 'dependencies' : [m_lib]
+ 'dependencies' : [m_lib],
+ 'shortname' : 'abg_a',
}
# Chorus flanger module
@@ -65,7 +66,7 @@ scaletempo_deps = [m_lib]
vlc_modules += {
'name' : 'scaletempo',
'sources' : scaletempo_sources,
- 'dependencies' : scaletempo_deps
+ 'dependencies' : scaletempo_deps,
}
# Scaletempo pitch module
@@ -73,7 +74,8 @@ vlc_modules += {
'name' : 'scaletempo_pitch',
'sources' : scaletempo_sources,
'dependencies' : scaletempo_deps,
- 'c_args' : ['-DPITCH_SHIFTER']
+ 'c_args' : ['-DPITCH_SHIFTER'],
+ 'shortname' : 'scalet_p',
}
# Stereo widen module
=====================================
modules/audio_output/meson.build
=====================================
@@ -147,3 +147,17 @@ vlc_modules += {
'enabled' : have_win_desktop,
}
endif
+
+if host_system == 'os/2'
+ if get_option('kai').allowed()
+ kai_lib = cc.find_library('kai',
+ has_headers: ['kai.h'],
+ required: get_option('kai').enabled())
+ vlc_modules += {
+ 'name' : 'kai',
+ 'sources' : files('kai.c'),
+ 'dependencies' : [kai_lib],
+ 'enabled' : kai_lib.found(),
+ }
+ endif
+endif
=====================================
modules/meson.build
=====================================
@@ -421,6 +421,7 @@ foreach module : vlc_modules
'nasm_args',
'extra_files',
'enabled',
+ 'shortname',
]
foreach key : module.keys()
if key not in valid_dict_keys
@@ -448,6 +449,12 @@ foreach module : vlc_modules
kwargs += { link_language: module.get('link_language') }
endif
+ shortname = ''
+
+ if module.has_key('shortname')
+ shortname = module['shortname']
+ endif
+
vlc_plugin = library(
module['name'] + '_plugin',
module['sources'],
@@ -464,7 +471,8 @@ foreach module : vlc_modules
build_by_default: true,
install: true,
install_dir: get_option('libdir') / 'vlc/plugins',
- kwargs: kwargs
+ kwargs: kwargs,
+ shortname: shortname,
)
vlc_plugins_targets += {
module['name']: vlc_plugin
=====================================
modules/packetizer/meson.build
=====================================
@@ -1,46 +1,58 @@
# AV1 packetizer
vlc_modules += {
'name' : 'packetizer_av1',
- 'sources' : files('av1.c', 'av1_obu.c')
+ 'sources' : files('av1.c', 'av1_obu.c'),
+ 'shortname' : 'p_av1',
}
# Copy packetizer
vlc_modules += {
'name' : 'packetizer_copy',
- 'sources' : files('copy.c')
+ 'sources' : files('copy.c'),
+ 'shortname' : 'p_copy',
}
# MPEG-I/II video packetizer
vlc_modules += {
'name' : 'packetizer_mpegvideo',
- 'sources' : files('mpegvideo.c')
+ 'sources' : files('mpegvideo.c'),
+ 'shortname' : 'p_mpegvi',
}
# MPEG audio layer I/II/III packetizer
vlc_modules += {
'name' : 'packetizer_mpegaudio',
- 'sources' : files('mpegaudio.c')
+ 'sources' : files('mpegaudio.c'),
+ 'shortname' : 'p_mpegau',
}
# MPEG4 video packetizer
vlc_modules += {
'name' : 'packetizer_mpeg4video',
- 'sources' : files('mpeg4video.c')
+ 'sources' : files('mpeg4video.c'),
+ 'shortname' : 'p_mpeg4v',
}
# MPEG4 audio packetizer
vlc_modules += {
'name' : 'packetizer_mpeg4audio',
- 'sources' : files('mpeg4audio.c')
+ 'sources' : files('mpeg4audio.c'),
+ 'shortname' : 'p_mpeg4a',
}
# MJPEG packetizer
vlc_modules += {
'name' : 'packetizer_mjpeg',
- 'sources' : files('mjpeg.c')
+ 'sources' : files('mjpeg.c'),
+ 'shortname' : 'p_mjpeg',
}
# H.264 packetizer
+packetizer_h264_c_args = []
+if host_system == 'os/2'
+ packetizer_h264_c_args += '-mstackrealign'
+endif
+
vlc_modules += {
'name' : 'packetizer_h264',
'sources' : files(
@@ -49,25 +61,30 @@ vlc_modules += {
'h264_slice.c',
'hxxx_sei.c',
'hxxx_common.c'
- )
+ ),
+ 'c_args' : packetizer_h264_c_args,
+ 'shortname' : 'p_h264',
}
# VC-1 packetizer
vlc_modules += {
'name' : 'packetizer_vc1',
- 'sources' : files('vc1.c')
+ 'sources' : files('vc1.c'),
+ 'shortname' : 'p_vc1',
}
# Meridian Lossless Packing packetizer
vlc_modules += {
'name' : 'packetizer_mlp',
- 'sources' : files('mlp.c')
+ 'sources' : files('mlp.c'),
+ 'shortname' : 'p_mlp',
}
# FLAC packetizer
vlc_modules += {
'name' : 'packetizer_flac',
- 'sources' : files('flac.c')
+ 'sources' : files('flac.c'),
+ 'shortname' : 'p_flac',
}
# HEVC packetizer
@@ -78,19 +95,22 @@ vlc_modules += {
'hevc_nal.c',
'hxxx_sei.c',
'hxxx_common.c'
- )
+ ),
+ 'shortname' : 'p_hevc',
}
# A/52 audio packetizer
vlc_modules += {
'name' : 'packetizer_a52',
- 'sources' : files('a52.c')
+ 'sources' : files('a52.c'),
+ 'shortname' : 'p_a52',
}
# DTS audio packetizer
vlc_modules += {
'name' : 'packetizer_dts',
- 'sources' : files('dts.c', 'dts_header.c')
+ 'sources' : files('dts.c', 'dts_header.c'),
+ 'shortname' : 'p_dts',
}
# FFmpeg-based packetizer
@@ -101,4 +121,5 @@ vlc_modules += {
'link_with' : [libavcodec_common],
'link_args' : symbolic_linkargs,
'enabled' : avcodec_dep.found() and not get_option('merge-ffmpeg'),
+ 'shortname' : 'p_avpars',
}
=====================================
modules/services_discovery/meson.build
=====================================
@@ -111,6 +111,14 @@ if host_system == 'windows' and have_win_desktop
}
endif
+# OS/2 drive discovery
+if host_system == 'os/2'
+ vlc_modules += {
+ 'name' : 'os2drive',
+ 'sources' : files('os2drive.c')
+ }
+endif
+
# mDNS using libmicrodns
microdns_dep = dependency('microdns', required: get_option('microdns'))
if microdns_dep.found()
=====================================
modules/spu/meson.build
=====================================
@@ -8,7 +8,8 @@ vlc_modules += {
vlc_modules += {
'name' : 'audiobargraph_v',
'sources' : files('audiobargraph_v.c'),
- 'dependencies' : [m_lib]
+ 'dependencies' : [m_lib],
+ 'shortname' : 'abg_v',
}
# logo
=====================================
modules/stream_out/hls/meson.build
=====================================
@@ -11,4 +11,5 @@ vlc_modules += {
'subtitles_segmenter.c'
),
'link_with' : [hxxxhelper_lib],
+ 'shortname' : 's_o_hls',
}
=====================================
modules/stream_out/meson.build
=====================================
@@ -3,25 +3,29 @@
# dummy
vlc_modules += {
'name' : 'stream_out_dummy',
- 'sources' : files('dummy.c')
+ 'sources' : files('dummy.c'),
+ 'shortname' : 's_o_dumm',
}
# cycle
vlc_modules += {
'name' : 'stream_out_cycle',
- 'sources' : files('cycle.c')
+ 'sources' : files('cycle.c'),
+ 'shortname' : 's_o_cycl',
}
# delay
vlc_modules += {
'name' : 'stream_out_delay',
- 'sources' : files('delay.c')
+ 'sources' : files('delay.c'),
+ 'shortname' : 's_o_dela',
}
# stats
vlc_modules += {
'name' : 'stream_out_stats',
- 'sources' : files('stats.c')
+ 'sources' : files('stats.c'),
+ 'shortname' : 's_o_stat',
}
# standard
@@ -31,67 +35,78 @@ vlc_modules += {
'standard.c',
'sdp_helper.c'
),
- 'dependencies' : [socket_libs]
+ 'dependencies' : [socket_libs],
+ 'shortname' : 's_o_stan',
}
# duplicate
vlc_modules += {
'name' : 'stream_out_duplicate',
- 'sources' : files('duplicate.c')
+ 'sources' : files('duplicate.c'),
+ 'shortname' : 's_o_dupl',
}
# es
vlc_modules += {
'name' : 'stream_out_es',
- 'sources' : files('es.c')
+ 'sources' : files('es.c'),
+ 'shortname' : 's_o_es',
}
# display
vlc_modules += {
'name' : 'stream_out_display',
- 'sources' : files('display.c')
+ 'sources' : files('display.c'),
+ 'shortname' : 's_o_disp',
}
# gather
vlc_modules += {
'name' : 'stream_out_gather',
- 'sources' : files('gather.c')
+ 'sources' : files('gather.c'),
+ 'shortname' : 's_o_gath',
}
# bridge
vlc_modules += {
'name' : 'stream_out_bridge',
- 'sources' : files('bridge.c')
+ 'sources' : files('bridge.c'),
+ 'shortname' : 's_o_brid',
}
# mosaic_bridge
vlc_modules += {
'name' : 'stream_out_mosaic_bridge',
- 'sources' : files('mosaic_bridge.c')
+ 'sources' : files('mosaic_bridge.c'),
+ 'shortname' : 's_o_mosa',
}
# autodel
vlc_modules += {
'name' : 'stream_out_autodel',
- 'sources' : files('autodel.c')
+ 'sources' : files('autodel.c'),
+ 'shortname' : 's_o_auto',
}
# record
vlc_modules += {
'name' : 'stream_out_record',
- 'sources' : files('record.c')
+ 'sources' : files('record.c'),
+ 'shortname' : 's_o_reco',
}
# smem
vlc_modules += {
'name' : 'stream_out_smem',
- 'sources' : files('smem.c')
+ 'sources' : files('smem.c'),
+ 'shortname' : 's_o_smem',
}
# setid
vlc_modules += {
'name' : 'stream_out_setid',
- 'sources' : files('setid.c')
+ 'sources' : files('setid.c'),
+ 'shortname' : 's_o_seti',
}
# transcode
@@ -109,20 +124,23 @@ vlc_modules += {
'transcode/audio.c',
'transcode/video.c'
),
- 'dependencies' : [m_lib]
+ 'dependencies' : [m_lib],
+ 'shortname' : 's_o_tran',
}
# trace
vlc_modules += {
'name' : 'stream_out_trace',
- 'sources' : files('trace.c')
+ 'sources' : files('trace.c'),
+ 'shortname' : 's_o_trac',
}
# UDP
vlc_modules += {
'name' : 'stream_out_udp',
'sources' : files('sdp_helper.c', 'udp.c'),
- 'dependencies' : [socket_libs]
+ 'dependencies' : [socket_libs],
+ 'shortname' : 's_o_udp',
}
# RTP
@@ -135,7 +153,8 @@ vlc_modules += {
'rtcp.c',
'rtsp.c',
),
- 'dependencies' : [socket_libs, srtp_dep]
+ 'dependencies' : [socket_libs, srtp_dep],
+ 'shortname' : 's_o_rtp',
}
# Chromaprint module
@@ -145,6 +164,7 @@ vlc_modules += {
'sources' : files('chromaprint.c'),
'dependencies' : [libchromaprint_dep],
'enabled' : libchromaprint_dep.found(),
+ 'shortname' : 's_o_chro',
}
@@ -175,6 +195,7 @@ vlc_modules += {
'dependencies' : [dl_lib, decklink_dep],
'cpp_args' : decklink_cpp_args,
'enabled' : decklink_dep.found(),
+ 'shortname' : 's_o_sdi',
}
# Chromecast module
=====================================
modules/video_chroma/meson.build
=====================================
@@ -36,7 +36,7 @@ vlc_modules += {
'i420_rgb.c',
'i420_rgb8.c',
'i420_rgb16.c',
- )
+ ),
}
vlc_modules += {
@@ -47,7 +47,8 @@ vlc_modules += {
vlc_modules += {
'name' : 'i422_i420',
- 'sources' : files('i422_i420.c')
+ 'sources' : files('i422_i420.c'),
+ 'shortname' : 'i422_i20'
}
vlc_modules += {
@@ -57,12 +58,14 @@ vlc_modules += {
vlc_modules += {
'name' : 'yuy2_i420',
- 'sources' : files('yuy2_i420.c')
+ 'sources' : files('yuy2_i420.c'),
+ 'shortname' : 'yuy2_i20'
}
vlc_modules += {
'name' : 'yuy2_i422',
- 'sources' : files('yuy2_i422.c')
+ 'sources' : files('yuy2_i422.c'),
+ 'shortname' : 'yuy2_i22'
}
vlc_modules += {
@@ -78,6 +81,7 @@ vlc_modules += {
),
'c_args' : ['-DPLUGIN_SSE2'],
'enabled' : have_sse2,
+ 'shortname' : 'i420_r_2'
}
vlc_modules += {
=====================================
modules/video_output/meson.build
=====================================
@@ -182,3 +182,31 @@ if x11_dep.found() and opengl_dep.found()
'dependencies' : [x11_dep, opengl_dep]
}
endif
+
+#
+# OS/2 video output
+#
+if host_system == 'os/2'
+ vlc_modules += {
+ 'name' : 'drawable_os2',
+ 'sources' : files('drawable_os2.c'),
+ }
+
+ vlc_modules += {
+ 'name' : 'window_os2',
+ 'sources' : files('window_os2.c'),
+ }
+
+ if get_option('kva').allowed()
+ kva_lib = cc.find_library('kva',
+ has_headers: ['kva.h'],
+ required: get_option('kva').enabled())
+
+ vlc_modules += {
+ 'name' : 'kva',
+ 'sources' : files('kva.c'),
+ 'dependencies' : [kva_lib],
+ 'enabled' : kva_lib.found(),
+ }
+ endif
+endif
=====================================
src/meson.build
=====================================
@@ -70,6 +70,8 @@ min_windows_version_test = '''
libvlccore_deps += cc.find_library('synchronization')
endif
vlccore_cargs += ['-DVLC_DLL_EXPORT']
+elif host_system == 'os/2'
+ vlccore_cargs += ['-DVLC_DLL_EXPORT']
endif
#
@@ -361,6 +363,18 @@ elif host_system == 'windows'
'win32/spawn.c',
]
endif
+elif host_system == 'os/2'
+ libvlccore_sources += [
+ 'os2/dirs.c',
+ 'darwin/error.c',
+ 'os2/filesystem.c',
+ 'os2/getaddrinfo.c',
+ 'os2/netconf.c',
+ 'os2/plugin.c',
+ 'os2/specific.c',
+ 'os2/rand.c',
+ 'os2/thread.c',
+ ]
else
libvlccore_sources += [
'posix/filesystem.c',
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/cb4b7b93d8ed54546247d1ad9b466faa3d1795a2...b25e046ae72e74b6f6c446bcb7fb083058b48069
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/cb4b7b93d8ed54546247d1ad9b466faa3d1795a2...b25e046ae72e74b6f6c446bcb7fb083058b48069
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
