Correct a comment in YCbCrConverter.

[nageru] / meson.build

diff --git a/meson.build b/meson.build
index 13be7585c1d0f976a29f6c9100169e5e1b2c06e9..1bcd96953dc9fcb71a8c14e864c4d8ad576dfaf4 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.9.1')
+project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.9.3')
 
 cxx = meson.get_compiler('cpp')
 qt5 = import('qt5')
@@ -25,6 +25,7 @@ qcustomplotdep = cxx.find_library('qcustomplot')
 qt5deps = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGLExtensions', 'OpenGL', 'Network'])
 sdl2_imagedep = dependency('SDL2_image', required: false)
 sdl2dep = dependency('sdl2', required: false)
+srtdep = dependency('srt', required: false)
 sqlite3dep = dependency('sqlite3')
 threaddep = dependency('threads')
 vadrmdep = dependency('libva-drm')
@@ -56,6 +57,12 @@ if get_option('cef_dir') != ''
        add_project_arguments('-DHAVE_CEF=1', language: 'cpp')
 endif
 
+if srtdep.found()
+       # NOTE: Seemingly there's no way to figure out if we have OpenSSL libsrt
+       # or gnutls libsrt, so we cannot check license compatibility here.
+       add_project_arguments('-DHAVE_SRT=1', language: 'cpp')
+endif
+
 top_include = include_directories('.')
 
 subdir('shared')
@@ -66,7 +73,7 @@ nageru_srcs = []
 nageru_deps = [shareddep, qt5deps, libjpegdep, movitdep, protobufdep,
        vax11dep, vadrmdep, x11dep, libavformatdep, libswresampledep, libavcodecdep, libavutildep,
        libswscaledep, libusbdep, luajitdep, dldep, x264dep, alsadep, zitaresamplerdep,
-       qcustomplotdep, threaddep, eigendep]
+       qcustomplotdep, threaddep, eigendep, srtdep]
 nageru_include_dirs = [include_directories('nageru')]
 nageru_link_with = []
 nageru_build_rpath = ''
@@ -202,7 +209,8 @@ nageru_srcs += ['nageru/chroma_subsampler.cpp', 'nageru/v210_converter.cpp', 'na
 # Streaming and encoding objects (largely the set that is shared between Nageru and Kaeru).
 stream_srcs = ['nageru/quicksync_encoder.cpp', 'nageru/x264_encoder.cpp', 'nageru/x264_dynamic.cpp', 'nageru/x264_speed_control.cpp', 'nageru/video_encoder.cpp',
        'nageru/audio_encoder.cpp', 'nageru/ffmpeg_util.cpp', 'nageru/ffmpeg_capture.cpp',
-       'nageru/print_latency.cpp', 'nageru/basic_stats.cpp', 'nageru/ref_counted_frame.cpp']
+       'nageru/print_latency.cpp', 'nageru/basic_stats.cpp', 'nageru/ref_counted_frame.cpp',
+       'nageru/v4l_output.cpp']
 stream = static_library('stream', stream_srcs, dependencies: nageru_deps, include_directories: nageru_include_dirs)
 nageru_link_with += stream