X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=6325d5a2d561a130e8242ced99a2b19d9be6303d;hb=1bd0d6e46d0a0f3742429983bfe5296d370c6acf;hp=76b4b59c27410fd3d5dfadff653bf39e1d9a246e;hpb=adc0df09f7a9dc88a3c0dbad47a21a805e728862;p=nageru

diff --git a/meson.build b/meson.build
index 76b4b59..6325d5a 100644
--- 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: '2.0.1')
 
 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 = ''
@@ -87,7 +94,7 @@ if have_cef
 	system_cef = (cef_build_type == 'system')
 	if system_cef
 		cef_lib_dir = cef_dir
-		cef_resource_dir = '/usr/share/cef/Resources'
+		cef_resource_dir = cef_dir
 	else
 		cef_lib_dir = join_paths(cef_dir, cef_build_type)
 		cef_resource_dir = join_paths(cef_dir, 'Resources')
@@ -122,7 +129,7 @@ if have_cef
 		nageru_deps += cefdlldep
 	endif
 
-	cef_libs = ['libEGL.so', 'libGLESv2.so', 'natives_blob.bin', 'snapshot_blob.bin', 'v8_context_snapshot.bin']
+	cef_libs = ['libEGL.so', 'libGLESv2.so', 'snapshot_blob.bin', 'v8_context_snapshot.bin']
 	cef_resources = ['cef.pak', 'cef_100_percent.pak', 'cef_200_percent.pak', 'cef_extensions.pak', 'devtools_resources.pak']
 	if not get_option('cef_no_icudtl')
 		cef_resources += ['icudtl.dat']
@@ -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