X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=7214f27b24dc4ee0a2440d00bffda706e6c6482c;hb=1c8c62666642be6b4ffd397c13e66f4cbaf5e38c;hp=9ce748cae541fd4b77a7cfe6fdb6973fb8fd8164;hpb=5198acefd13b91a7953f1db1370ce7d434132472;p=nageru

diff --git a/meson.build b/meson.build
index 9ce748c..7214f27 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.0-pre')
+project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.0')
 
 cxx = meson.get_compiler('cpp')
 qt5 = import('qt5')
@@ -10,10 +10,9 @@ alsadep = dependency('alsa')
 bmusbdep = dependency('bmusb', required: not embedded_bmusb)
 dldep = cxx.find_library('dl')
 epoxydep = dependency('epoxy')
-epoxydep = dependency('epoxy')
 libavcodecdep = dependency('libavcodec')
 libavformatdep = dependency('libavformat')
-libavresampledep = dependency('libavresample')
+libswresampledep = dependency('libswresample')
 libavutildep = dependency('libavutil')
 libjpegdep = dependency('libjpeg')
 libswscaledep = dependency('libswscale')
@@ -22,9 +21,9 @@ luajitdep = dependency('luajit')
 movitdep = dependency('movit')
 protobufdep = dependency('protobuf')
 qcustomplotdep = cxx.find_library('qcustomplot')
-qt5deps = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGLExtensions', 'OpenGL', 'PrintSupport'])
-sdl2_imagedep = dependency('SDL2_image')
-sdl2dep = dependency('sdl2')
+qt5deps = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGLExtensions', 'OpenGL', 'Network'])
+sdl2_imagedep = dependency('SDL2_image', required: false)
+sdl2dep = dependency('sdl2', required: false)
 sqlite3dep = dependency('sqlite3')
 threaddep = dependency('threads')
 vadrmdep = dependency('libva-drm')
@@ -42,11 +41,8 @@ if cxx.links(code, args: '-fuse-ld=lld', name: 'check for LLD')
 endif
 
 # Add the right MOVIT_SHADER_DIR definition.
-r = run_command('pkg-config', '--variable=shaderdir', 'movit')
-if r.returncode() != 0
-	error('Movit pkg-config installation is broken.')
-endif
-add_project_arguments('-DMOVIT_SHADER_DIR="' + r.stdout().strip() + '"', language: 'cpp')
+movit_shader_dir = movitdep.get_pkgconfig_variable('shaderdir')
+add_project_arguments('-DMOVIT_SHADER_DIR="' + movit_shader_dir + '"', language: 'cpp')
 
 # Make the Nageru version available as a #define.
 add_project_arguments('-DNAGERU_VERSION="' + meson.project_version() + '"', language: 'cpp')
@@ -56,12 +52,6 @@ if cxx.has_argument('-Wno-non-virtual-dtor')
 	add_project_arguments('-Wno-non-virtual-dtor', language: 'cpp')
 endif
 
-# FFmpeg has a lot of deprecated APIs whose replacements are not available
-# in Debian stable, so we suppress these warnings.
-if cxx.has_argument('-Wno-deprecated-declarations')
-	add_project_arguments('-Wno-deprecated-declarations', language: 'cpp')
-endif
-
 # This needs to be done before declaring any build targets.
 if get_option('cef_dir') != ''
 	add_project_arguments('-DHAVE_CEF=1', language: 'cpp')
@@ -75,7 +65,7 @@ subdir('shared')
 
 nageru_srcs = []
 nageru_deps = [shareddep, qt5deps, libjpegdep, movitdep, protobufdep,
-	vax11dep, vadrmdep, x11dep, libavformatdep, libavresampledep, libavcodecdep, libavutildep,
+	vax11dep, vadrmdep, x11dep, libavformatdep, libswresampledep, libavcodecdep, libavutildep,
 	libswscaledep, libusbdep, luajitdep, dldep, x264dep, alsadep, zitaresamplerdep,
 	qcustomplotdep, threaddep]
 nageru_include_dirs = [include_directories('nageru')]
@@ -314,7 +304,15 @@ endforeach
 futatabi_shader_srcs = bin2h_gen.process(shaders)
 futatabi_srcs += futatabi_shader_srcs
 
-executable('futatabi', futatabi_srcs, dependencies: [shareddep, qt5deps, libjpegdep, movitdep, libmicrohttpddep, protobufdep, sqlite3dep, vax11dep, vadrmdep, x11dep, libavformatdep, libavcodecdep, libavutildep, libswscaledep], link_with: shared, include_directories: [include_directories('futatabi')])
-executable('flow', 'futatabi/flow_main.cpp', 'futatabi/flow.cpp', 'futatabi/gpu_timers.cpp', futatabi_shader_srcs, dependencies: [shareddep, epoxydep, sdl2dep, sdl2_imagedep])
+executable('futatabi', futatabi_srcs,
+	dependencies: [shareddep, qt5deps, libjpegdep, movitdep, libmicrohttpddep, protobufdep, sqlite3dep, vax11dep, vadrmdep, x11dep, libavformatdep, libavcodecdep, libavutildep, libswscaledep],
+	link_with: shared,
+	include_directories: [include_directories('futatabi')],
+	install: true)
+
+# Test binaries for the optical flow code.
+if sdl2dep.found() and sdl2_imagedep.found()
+	executable('flow', 'futatabi/flow_main.cpp', 'futatabi/flow.cpp', 'futatabi/gpu_timers.cpp', futatabi_shader_srcs, dependencies: [shareddep, epoxydep, sdl2dep, sdl2_imagedep])
+endif
 executable('eval', 'futatabi/eval.cpp', 'futatabi/util.cpp')
 executable('vis', 'futatabi/vis.cpp', 'futatabi/util.cpp')