Merge branch 'libmali' of github.com:JeffyCN/mirrors

hook/meson.build

@@ -62,6 +62,7 @@ libhook = shared_library(
   include_directories : libhook_inc,
   dependencies : libhook_dep,
   install : true,
+  install_rpath : '$ORIGIN',
   version : mali_version)
 
 libhook_ldflags = ['-L${libdir}', '-lmali-hook']
@@ -70,7 +71,8 @@ libhook_ldflags = ['-L${libdir}', '-lmali-hook']
 libinjector = static_library(
   'mali-hook-injector',
   'injector.c',
-  install : true)
+  install : true,
+  install_rpath : '$ORIGIN')
 
 # Ensure that the hook library would not be removed as unused
 libhook_ldflags += \

meson.build

@@ -1,7 +1,7 @@
 project(
   'libmali', 'c',
   version : '1.9.0',
-  meson_version : '>=0.58.0')
+  meson_version : '>=0.53.0')
 
 mali_version = meson.project_version()
 
@@ -43,8 +43,9 @@ endif
 message('Source libraries: @0@'.format(libs))
 
 # Load original mali library for later function checks and linking
-mali = cc.find_library(fs.stem(default_lib).replace('lib',''),
-  dirs : meson.current_source_dir() / fs.parent(default_lib))
+run_command('ln', '-rsf', meson.current_source_dir() / default_lib,
+  meson.current_build_dir() / 'libmali-prebuilt.so', check : false)
+mali = cc.find_library('mali-prebuilt', dirs : meson.current_build_dir())
 
 is_rk3288 = gpu == 'midgard-t76x'
 is_utgard = gpu.split('-')[0] == 'utgard'
@@ -249,6 +250,7 @@ foreach name, values : map
       link_with : [libhook, libmali],
       install : true,
       install_dir : wrapper_libdir,
+      install_rpath : '$ORIGIN',
       version : version)
   endforeach
 

meson_options.txt

@@ -8,15 +8,15 @@ option('subversion', type: 'string', value: 'none',
        description: 'subversion (default: none)')
 option('platform', type: 'string', value: 'gbm',
        description: 'platform (default: gbm)')
-option('with-overlay', type: 'boolean', value: 'false',
+option('with-overlay', type: 'boolean', value: false,
        description: 'Install overlay (default: false)')
-option('opencl-icd', type: 'boolean', value: 'true',
+option('opencl-icd', type: 'boolean', value: true,
        description: 'OpenCL Installable Client Driver (ICD) (default: true)')
-option('khr-header', type: 'boolean', value: 'false',
+option('khr-header', type: 'boolean', value: false,
        description: 'Install KHR header (default: false)')
-option('vendor-package', type: 'boolean', value: 'false',
+option('vendor-package', type: 'boolean', value: false,
        description: 'Install as vendor package (default: false)')
-option('hooks', type: 'boolean', value: 'true',
+option('hooks', type: 'boolean', value: true,
        description: 'Enable hook library (default: true)')
 option('wrappers', type: 'feature', value: 'auto',
        description: 'Install with wrappers (default: auto)')