X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=meson.build;h=8114abbd1992711ccf17991c4c346992b5995d22;hp=4f96702dbad8e980e4fc744e7f15ba568f57a442;hb=HEAD;hpb=364fd0dca48e413048f4c6010146123ee6fd922c

diff --git a/meson.build b/meson.build
index 4f96702..b190b4a 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,6 @@
-project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '2.1.1-pre')
+project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '2.3.1-pre')
+
+add_project_arguments('-Wno-unqualified-std-cast-call', language: 'cpp')
 
 cxx = meson.get_compiler('cpp')
 qt5 = import('qt5')
@@ -22,11 +24,11 @@ libusbdep = dependency('libusb-1.0')
 luajitdep = dependency('luajit')
 movitdep = dependency('movit')
 protobufdep = dependency('protobuf')
-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)
+svtav1dep = dependency('SvtAv1Enc', required: false, version: '>=1.5.0')
 sqlite3dep = dependency('sqlite3')
 threaddep = dependency('threads')
 vadrmdep = dependency('libva-drm')
@@ -63,6 +65,9 @@ if srtdep.found()
 	# or gnutls libsrt, so we cannot check license compatibility here.
 	add_project_arguments('-DHAVE_SRT=1', language: 'cpp')
 endif
+if svtav1dep.found()
+	add_project_arguments('-DHAVE_AV1=1', language: 'cpp')
+endif
 
 top_include = include_directories('.')
 
@@ -73,8 +78,8 @@ subdir('shared')
 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, srtdep, libdrmdep]
+	libswscaledep, libusbdep, luajitdep, dldep, x264dep, svtav1dep, alsadep, zitaresamplerdep,
+	threaddep, eigendep, srtdep, libdrmdep]
 nageru_include_dirs = [include_directories('nageru')]
 nageru_link_with = []
 nageru_build_rpath = ''
@@ -117,13 +122,10 @@ if have_cef
 
 		cef_dll_target = custom_target('libcef_dll_wrapper',
 			input: join_paths(cef_dir, 'libcef_dll/CMakeLists.txt'),
-			output: ['libcef_dll_wrapper.a', 'cef-stamp'],
+			output: ['libcef_dll_wrapper.a'],
 			command: [cef_compile_script, '@BUILD_DIR@', cef_dir, cmake, '@OUTPUT@'])
 
-		# Putting the .a in sources seemingly hits a bug where the .a files get sorted
-		# in the wrong order. This is a workaround; see
-		# https://github.com/mesonbuild/meson/issues/3613#issuecomment-408276296 .
-		cefdlldep = declare_dependency(sources: cef_dll_target[1], link_args: cef_dll_target.full_path())
+		cefdlldep = declare_dependency(link_with: cef_dll_target)
 		nageru_deps += cefdlldep
 	endif
 
@@ -185,7 +187,7 @@ nageru_link_with += protobuf_lib
 qt_files = qt5.preprocess(
 	moc_headers: ['nageru/analyzer.h', 'nageru/clickable_label.h', 'nageru/compression_reduction_meter.h', 'nageru/correlation_meter.h',
 		'nageru/ellipsis_label.h', 'nageru/glwidget.h', 'nageru/input_mapping_dialog.h', 'nageru/lrameter.h', 'nageru/mainwindow.h', 'nageru/midi_mapping_dialog.h',
-		'nageru/nonlinear_fader.h', 'nageru/vumeter.h'],
+		'nageru/nonlinear_fader.h', 'nageru/vumeter.h', 'nageru/rgb_histogram.h'],
 	ui_files: ['nageru/analyzer.ui', 'nageru/audio_expanded_view.ui', 'nageru/audio_miniview.ui', 'nageru/display.ui',
 		'nageru/input_mapping.ui', 'nageru/mainwindow.ui', 'nageru/midi_mapping.ui'],
 	dependencies: qt5deps)
@@ -193,7 +195,7 @@ qt_files = qt5.preprocess(
 # Qt objects.
 nageru_srcs += ['nageru/glwidget.cpp', 'nageru/mainwindow.cpp', 'nageru/vumeter.cpp', 'nageru/lrameter.cpp', 'nageru/compression_reduction_meter.cpp',
 	'nageru/correlation_meter.cpp', 'nageru/analyzer.cpp', 'nageru/input_mapping_dialog.cpp', 'nageru/midi_mapping_dialog.cpp',
-	'nageru/nonlinear_fader.cpp', 'nageru/context_menus.cpp', 'nageru/vu_common.cpp', 'nageru/piecewise_interpolator.cpp', 'nageru/midi_mapper.cpp']
+	'nageru/nonlinear_fader.cpp', 'nageru/context_menus.cpp', 'nageru/vu_common.cpp', 'nageru/piecewise_interpolator.cpp', 'nageru/midi_mapper.cpp', 'nageru/rgb_histogram.cpp']
 
 # Auxiliary objects used for nearly everything.
 aux_srcs = ['nageru/flags.cpp']
@@ -209,13 +211,17 @@ nageru_link_with += audio
 # Mixer objects.
 nageru_srcs += ['nageru/chroma_subsampler.cpp', 'nageru/v210_converter.cpp', 'nageru/mixer.cpp', 'nageru/pbo_frame_allocator.cpp',
 	'nageru/theme.cpp', 'nageru/scene.cpp', 'nageru/image_input.cpp', 'nageru/alsa_output.cpp',
-	'nageru/timecode_renderer.cpp', 'nageru/tweaked_inputs.cpp', 'nageru/mjpeg_encoder.cpp']
+	'nageru/timecode_renderer.cpp', 'nageru/tweaked_inputs.cpp', 'nageru/mjpeg_encoder.cpp', 'nageru/srt_metrics.cpp']
 
 # 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',
+stream_srcs = ['nageru/quicksync_encoder.cpp', 'nageru/video_encoder.cpp',
+	'nageru/x264_encoder.cpp', 'nageru/x264_dynamic.cpp', 'nageru/x264_speed_control.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/v4l_output.cpp']
+if svtav1dep.found()
+	stream_srcs += 'nageru/av1_encoder.cpp'
+endif
 stream = static_library('stream', stream_srcs, dependencies: nageru_deps, include_directories: nageru_include_dirs)
 nageru_link_with += stream