Release Nageru and Futatabi 1.9.3.

[nageru] / meson.build

diff --git a/meson.build b/meson.build
index 76b4b59c27410fd3d5dfadff653bf39e1d9a246e..6a3021a89d236b167676d0f41904e56f3edb636f 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')
@@ -87,7 +87,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 +122,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 +202,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