From eaa1bd93e8b2240b0a5245d0acdf936c7b49bbb4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Thu, 22 Nov 2018 17:02:09 +0100 Subject: [PATCH] msdk: add support for open sourced MediaSDK MediaSDK has been released as open source [1], but the directories where it installs its files, are different from the binary only distribution. This patch adds to the libraries path the directory /lib. Also it is defined in meson if the include directory has the mfx/ prefix, something that is already handled in autotools. 1. https://github.com/Intel-Media-SDK/MediaSDK --- sys/msdk/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build index bb05045..7000fce 100644 --- a/sys/msdk/meson.build +++ b/sys/msdk/meson.build @@ -45,8 +45,11 @@ if msdk_root == '' and msdk_option.enabled() endif if msdk_root != '' - msdk_libdir = [msdk_root + '/lib/lin_x64', msdk_root + '/lib/x64', msdk_root + '/lib64'] + msdk_libdir = [msdk_root + '/lib/lin_x64', msdk_root + '/lib/x64', msdk_root + '/lib64', msdk_root + '/lib'] msdk_incdir = include_directories(msdk_root + '/include') + if cxx.has_header('mfx/mfxdefs.h', args: '-I' + msdk_root + '/include') + cdata.set('HAVE_MFX_MFXDEFS_H', 1) + endif msdk_lib = cxx.find_library('mfx', dirs: msdk_libdir, required: msdk_option) if host_machine.system() == 'windows' legacy_stdio_dep = cc.find_library('legacy_stdio_definitions', required: msdk_option) -- 2.7.4