X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=b10655c6806b62b3489c12fa2717d5bf2a897870;hb=70e2471c1297f5ee5592918a736224841d8e4d77;hp=f4c0c76b2efe672c810a90390a7380ee51b59b6b;hpb=9ffdc3a04cd16fbc614894563330c6dc2625fca6;p=nageru

diff --git a/meson.build b/meson.build
index f4c0c76..b10655c 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '2.0.0')
+project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '2.0.2')
 
 cxx = meson.get_compiler('cpp')
 qt5 = import('qt5')
@@ -15,6 +15,7 @@ libavcodecdep = dependency('libavcodec')
 libavformatdep = dependency('libavformat')
 libswresampledep = dependency('libswresample')
 libavutildep = dependency('libavutil')
+libdrmdep = dependency('libdrm')
 libjpegdep = dependency('libjpeg')
 libswscaledep = dependency('libswscale')
 libusbdep = dependency('libusb-1.0')
@@ -73,7 +74,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, srtdep]
+	qcustomplotdep, threaddep, eigendep, srtdep, libdrmdep]
 nageru_include_dirs = [include_directories('nageru')]
 nageru_link_with = []
 nageru_build_rpath = ''
@@ -105,9 +106,6 @@ if have_cef
 		nageru_install_rpath = '$ORIGIN/'
 	endif
 
-	cefdep = cxx.find_library('cef', dirs: cef_lib_dir)
-	nageru_deps += cefdep
-
 	# CEF wrapper library; not built as part of the CEF binary distribution,
 	# but should be if CEF is installed as a system library.
 	if system_cef
@@ -150,6 +148,13 @@ if have_cef
 	endforeach
 	run_command('ln', '-s', join_paths(cef_resource_dir, 'locales/en-US.pak'), join_paths(meson.current_build_dir(), 'locales/'))
 	install_data(join_paths(cef_resource_dir, 'locales/en-US.pak'), install_dir: join_paths(exe_dir, 'locales'))
+
+	# NOTE: We link against libcef.so in the local directory, _not_ in the CEF directory,
+	# since upstream CEF searches for icudtl.dat in whatever path dladdr() says libcef.so
+	# comes from, and the upstream CEF tarballs have libcef.so and icudtl.dat in different
+	# directories. Thus, get both from the local symlinks we just created.
+	cefdep = cxx.find_library('cef', dirs: meson.current_build_dir())
+	nageru_deps += cefdep
 endif
 
 # bmusb.