aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stultz2018-04-13 18:31:33 -0500
committerJohn Stultz2018-04-13 18:31:33 -0500
commit84f838d71a75125b14d361f0ed7d23a0ac521edf (patch)
treea7694dfdab2ca2b1d32e25071589c7ea0a992bd6 /nouveau
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 'nouveau')
-rw-r--r--nouveau/abi16.c4
-rw-r--r--nouveau/bufctx.c4
-rw-r--r--nouveau/meson.build59
-rwxr-xr-xnouveau/nouveau-symbol-check2
-rw-r--r--nouveau/nouveau.c4
-rw-r--r--nouveau/pushbuf.c4
6 files changed, 60 insertions, 17 deletions
diff --git a/nouveau/abi16.c b/nouveau/abi16.c
index ee38c0cb..ba2501ea 100644
--- a/nouveau/abi16.c
+++ b/nouveau/abi16.c
@@ -22,10 +22,6 @@
22 * Authors: Ben Skeggs 22 * Authors: Ben Skeggs
23 */ 23 */
24 24
25#ifdef HAVE_CONFIG_H
26# include <config.h>
27#endif
28
29#include <stdlib.h> 25#include <stdlib.h>
30#include <stdint.h> 26#include <stdint.h>
31#include <stddef.h> 27#include <stddef.h>
diff --git a/nouveau/bufctx.c b/nouveau/bufctx.c
index 4f76e5df..67b7570e 100644
--- a/nouveau/bufctx.c
+++ b/nouveau/bufctx.c
@@ -22,10 +22,6 @@
22 * Authors: Ben Skeggs 22 * Authors: Ben Skeggs
23 */ 23 */
24 24
25#ifdef HAVE_CONFIG_H
26#include <config.h>
27#endif
28
29#include <stdio.h> 25#include <stdio.h>
30#include <stdlib.h> 26#include <stdlib.h>
31#include <stdint.h> 27#include <stdint.h>
diff --git a/nouveau/meson.build b/nouveau/meson.build
new file mode 100644
index 00000000..51c9a712
--- /dev/null
+++ b/nouveau/meson.build
@@ -0,0 +1,59 @@
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
21
22libdrm_nouveau = shared_library(
23 'drm_nouveau',
24 [files( 'nouveau.c', 'pushbuf.c', 'bufctx.c', 'abi16.c'), config_file],
25 c_args : warn_c_args,
26 include_directories : [inc_root, inc_drm],
27 link_with : libdrm,
28 dependencies : [dep_threads, dep_atomic_ops],
29 version : '2.0.0',
30 install : true,
31)
32
33ext_libdrm_nouveau = declare_dependency(
34 link_with : [libdrm, libdrm_nouveau],
35 include_directories : [inc_drm, include_directories('.')],
36)
37
38install_headers('nouveau.h', subdir : 'libdrm/nouveau')
39install_headers(
40 'nvif/class.h', 'nvif/cl0080.h', 'nvif/cl9097.h', 'nvif/if0002.h',
41 'nvif/if0003.h', 'nvif/ioctl.h', 'nvif/unpack.h',
42 subdir : 'libdrm/nouveau/nvif'
43)
44
45pkg.generate(
46 name : 'libdrm_nouveau',
47 libraries : libdrm_nouveau,
48 subdirs : ['.', 'libdrm', 'libdrm/nouveau'],
49 version : meson.project_version(),
50 requires_private : 'libdrm',
51 description : 'Userspace interface to nouveau kernel DRM services',
52)
53
54test(
55 'nouveau-symbol-check',
56 prog_bash,
57 env : env_test,
58 args : [files('nouveau-symbol-check'), libdrm_nouveau]
59)
diff --git a/nouveau/nouveau-symbol-check b/nouveau/nouveau-symbol-check
index b265cea4..b3a24101 100755
--- a/nouveau/nouveau-symbol-check
+++ b/nouveau/nouveau-symbol-check
@@ -3,7 +3,7 @@
3# The following symbols (past the first five) are taken from the public headers. 3# The following symbols (past the first five) are taken from the public headers.
4# A list of the latter should be available Makefile.sources/LIBDRM_NOUVEAU_H_FILES 4# A list of the latter should be available Makefile.sources/LIBDRM_NOUVEAU_H_FILES
5 5
6FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_nouveau.so} | awk '{print $3}'| while read func; do 6FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_nouveau.so} | awk '{print $3}'| while read func; do
7( grep -q "^$func$" || echo $func ) <<EOF 7( grep -q "^$func$" || echo $func ) <<EOF
8__bss_start 8__bss_start
9_edata 9_edata
diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c
index e113a8fe..55593517 100644
--- a/nouveau/nouveau.c
+++ b/nouveau/nouveau.c
@@ -22,10 +22,6 @@
22 * Authors: Ben Skeggs 22 * Authors: Ben Skeggs
23 */ 23 */
24 24
25#ifdef HAVE_CONFIG_H
26#include <config.h>
27#endif
28
29#include <stdio.h> 25#include <stdio.h>
30#include <stdlib.h> 26#include <stdlib.h>
31#include <stdint.h> 27#include <stdint.h>
diff --git a/nouveau/pushbuf.c b/nouveau/pushbuf.c
index 035e3019..445c966e 100644
--- a/nouveau/pushbuf.c
+++ b/nouveau/pushbuf.c
@@ -22,10 +22,6 @@
22 * Authors: Ben Skeggs 22 * Authors: Ben Skeggs
23 */ 23 */
24 24
25#ifdef HAVE_CONFIG_H
26#include <config.h>
27#endif
28
29#include <stdio.h> 25#include <stdio.h>
30#include <stdlib.h> 26#include <stdlib.h>
31#include <stdint.h> 27#include <stdint.h>