X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=8e549855b020413e1dde39034b9310b68d5fcc05;hb=refs%2Ftags%2F1.9.2;hp=d705c7fcb61feb819a1494ba44ae0dd15721f0f5;hpb=e15251d2787cb8e6b677af801de6180e55171763;p=nageru

diff --git a/meson.build b/meson.build
index d705c7f..8e54985 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: '1.9.2')
 
 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']
@@ -290,7 +290,7 @@ futatabi_srcs += ['futatabi/main.cpp', 'futatabi/player.cpp', 'futatabi/video_st
 futatabi_srcs += ['futatabi/vaapi_jpeg_decoder.cpp', 'futatabi/db.cpp', 'futatabi/ycbcr_converter.cpp', 'futatabi/flags.cpp']
 futatabi_srcs += ['futatabi/mainwindow.cpp', 'futatabi/jpeg_frame_view.cpp', 'futatabi/clip_list.cpp', 'futatabi/frame_on_disk.cpp']
 futatabi_srcs += ['futatabi/export.cpp', 'futatabi/midi_mapper.cpp', 'futatabi/midi_mapping_dialog.cpp']
-futatabi_srcs += ['futatabi/exif_parser.cpp']
+futatabi_srcs += ['futatabi/exif_parser.cpp', 'futatabi/pbo_pool.cpp']
 futatabi_srcs += moc_files
 futatabi_srcs += proto_generated