aboutsummaryrefslogtreecommitdiffstats
path: root/tegra
diff options
context:
space:
mode:
authorJohn Stultz2018-04-13 18:31:33 -0500
committerJohn Stultz2018-04-13 18:31:33 -0500
commit84f838d71a75125b14d361f0ed7d23a0ac521edf (patch)
treea7694dfdab2ca2b1d32e25071589c7ea0a992bd6 /tegra
parent2f9aea0661550a43c3d2ac33a5bc286870edd34e (diff)
parent35affe89d5f617a972b1cfee00c51cbe9e7c64a2 (diff)
downloadexternal-libgbm-84f838d71a75125b14d361f0ed7d23a0ac521edf.tar.gz
external-libgbm-84f838d71a75125b14d361f0ed7d23a0ac521edf.tar.xz
external-libgbm-84f838d71a75125b14d361f0ed7d23a0ac521edf.zip
Merge remote-tracking branch 'freedesktop/master' into aosp/master
This merges the freedesktop/master branch into aosp/master Change-Id: I3104d45924f67d37808154d04c15518394204478 Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'tegra')
-rw-r--r--tegra/meson.build53
-rwxr-xr-xtegra/tegra-symbol-check9
-rw-r--r--tegra/tegra.c4
3 files changed, 59 insertions, 7 deletions
diff --git a/tegra/meson.build b/tegra/meson.build
new file mode 100644
index 00000000..1f5c74b3
--- /dev/null
+++ b/tegra/meson.build
@@ -0,0 +1,53 @@
1# Copyright © 2017-2018 Intel Corporation
2
3# Permission is hereby granted, free of charge, to any person obtaining a copy
4# of this software and associated documentation files (the "Software"), to deal
5# in the Software without restriction, including without limitation the rights
6# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7# copies of the Software, and to permit persons to whom the Software is
8# furnished to do so, subject to the following conditions:
9
10# The above copyright notice and this permission notice shall be included in
11# all copies or substantial portions of the Software.
12
13# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19# SOFTWARE.
20
21libdrm_tegra = shared_library(
22 'drm_tegra',
23 [files('tegra.c'), config_file],
24 include_directories : [inc_root, inc_drm],
25 link_with : libdrm,
26 dependencies : [dep_pthread_stubs, dep_atomic_ops],
27 c_args : warn_c_args,
28 version : '0.0.0',
29 install : true,
30)
31
32ext_libdrm_tegra = declare_dependency(
33 link_with : [libdrm, libdrm_tegra],
34 include_directories : [inc_drm, include_directories('.')],
35)
36
37install_headers('tegra.h', subdir : 'libdrm')
38
39pkg.generate(
40 name : 'libdrm_tegra',
41 libraries : libdrm_tegra,
42 subdirs : ['.', 'libdrm'],
43 version : meson.project_version(),
44 requires_private : 'libdrm',
45 description : 'Userspace interface to Tegra kernel DRM services',
46)
47
48test(
49 'tegra-symbol-check',
50 prog_bash,
51 env : env_test,
52 args : [files('tegra-symbol-check'), libdrm_tegra]
53)
diff --git a/tegra/tegra-symbol-check b/tegra/tegra-symbol-check
index 40208311..509b678c 100755
--- a/tegra/tegra-symbol-check
+++ b/tegra/tegra-symbol-check
@@ -1,11 +1,14 @@
1#!/bin/bash 1#!/bin/bash
2 2
3# The following symbols (past the first five) are taken from the public headers. 3# The following symbols (past the first nine) are taken from tegra.h.
4# A list of the latter should be available Makefile.sources/LIBDRM_FREEDRENO_H_FILES
5 4
6FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_tegra.so} | awk '{print $3}'| while read func; do 5FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_tegra.so} | awk '{print $3}'| while read func; do
7( grep -q "^$func$" || echo $func ) <<EOF 6( grep -q "^$func$" || echo $func ) <<EOF
7__bss_end__
8__bss_start__
8__bss_start 9__bss_start
10__end__
11_bss_end__
9_edata 12_edata
10_end 13_end
11_fini 14_fini
diff --git a/tegra/tegra.c b/tegra/tegra.c
index 66f19e96..0c869877 100644
--- a/tegra/tegra.c
+++ b/tegra/tegra.c
@@ -22,10 +22,6 @@
22 * OTHER DEALINGS IN THE SOFTWARE. 22 * OTHER DEALINGS IN THE SOFTWARE.
23 */ 23 */
24 24
25#ifdef HAVE_CONFIG_H
26# include "config.h"
27#endif
28
29#include <errno.h> 25#include <errno.h>
30#include <fcntl.h> 26#include <fcntl.h>
31#include <string.h> 27#include <string.h>