diff options
Diffstat (limited to 'recipes-graphics')
-rw-r--r-- | recipes-graphics/intel-gpu-tools/intel-gpu-tools/0001-lib-Fix-compilation-on-non-x86.patch | 82 | ||||
-rw-r--r-- | recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.21.bb (renamed from recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.20.bb) | 11 |
2 files changed, 4 insertions, 89 deletions
diff --git a/recipes-graphics/intel-gpu-tools/intel-gpu-tools/0001-lib-Fix-compilation-on-non-x86.patch b/recipes-graphics/intel-gpu-tools/intel-gpu-tools/0001-lib-Fix-compilation-on-non-x86.patch deleted file mode 100644 index 0c8c24c1..00000000 --- a/recipes-graphics/intel-gpu-tools/intel-gpu-tools/0001-lib-Fix-compilation-on-non-x86.patch +++ /dev/null | |||
@@ -1,82 +0,0 @@ | |||
1 | From 4fbb4b9c12d1944e5d60bc4f3d0cbd0bf7bed36d Mon Sep 17 00:00:00 2001 | ||
2 | From: Thierry Reding <treding@nvidia.com> | ||
3 | Date: Thu, 12 Oct 2017 10:33:37 +0200 | ||
4 | Subject: [PATCH] lib: Fix compilation on non-x86 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | The meson build avoids the failure by excluding the igt_x86.c file from | ||
10 | the compilation. autotools being what they are don't support that in an | ||
11 | easy way, so just use the preprocessor to avoid the duplicate function | ||
12 | definitions. | ||
13 | |||
14 | Since igt_x86.c will now be ignored for non-x86 builds, the meson work- | ||
15 | around can be removed. | ||
16 | |||
17 | Upstream-Status: backport. | ||
18 | |||
19 | Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> | ||
20 | Signed-off-by: Thierry Reding <treding@nvidia.com> | ||
21 | --- | ||
22 | lib/igt_x86.c | 2 ++ | ||
23 | lib/igt_x86.h | 2 +- | ||
24 | lib/meson.build | 5 +---- | ||
25 | 3 files changed, 4 insertions(+), 5 deletions(-) | ||
26 | |||
27 | diff --git a/lib/igt_x86.c b/lib/igt_x86.c | ||
28 | index 0f0963ce..0ed3c6f1 100644 | ||
29 | --- a/lib/igt_x86.c | ||
30 | +++ b/lib/igt_x86.c | ||
31 | @@ -93,6 +93,7 @@ | ||
32 | |||
33 | #define has_YMM 0x1 | ||
34 | |||
35 | +#if defined(__x86_64__) || defined(__i386__) | ||
36 | unsigned igt_x86_features(void) | ||
37 | { | ||
38 | unsigned max = __get_cpuid_max(BASIC_CPUID, 0); | ||
39 | @@ -172,3 +173,4 @@ char *igt_x86_features_to_string(unsigned features, char *line) | ||
40 | |||
41 | return ret; | ||
42 | } | ||
43 | +#endif | ||
44 | diff --git a/lib/igt_x86.h b/lib/igt_x86.h | ||
45 | index d6dcfa10..27b7f0fd 100644 | ||
46 | --- a/lib/igt_x86.h | ||
47 | +++ b/lib/igt_x86.h | ||
48 | @@ -40,7 +40,7 @@ | ||
49 | #define AVX 0x80 | ||
50 | #define AVX2 0x100 | ||
51 | |||
52 | -#if defined(__x86_64__) | ||
53 | +#if defined(__x86_64__) || defined(__i386__) | ||
54 | unsigned igt_x86_features(void); | ||
55 | char *igt_x86_features_to_string(unsigned features, char *line); | ||
56 | #else | ||
57 | diff --git a/lib/meson.build b/lib/meson.build | ||
58 | index b31c68e4..ddf93ec6 100644 | ||
59 | --- a/lib/meson.build | ||
60 | +++ b/lib/meson.build | ||
61 | @@ -64,6 +64,7 @@ lib_sources = [ | ||
62 | 'igt_syncobj.c', | ||
63 | 'igt_sysfs.c', | ||
64 | 'igt_vgem.c', | ||
65 | + 'igt_x86.c', | ||
66 | 'instdone.c', | ||
67 | 'intel_batchbuffer.c', | ||
68 | 'intel_chipset.c', | ||
69 | @@ -96,10 +97,6 @@ lib_sources = [ | ||
70 | 'igt_kmod.c', | ||
71 | ] | ||
72 | |||
73 | -if ['x86', 'x86_64'].contains(host_machine.cpu_family()) | ||
74 | - lib_sources += 'igt_x86.c' | ||
75 | -endif | ||
76 | - | ||
77 | lib_deps = [ | ||
78 | cairo, | ||
79 | glib, | ||
80 | -- | ||
81 | 2.14.3 | ||
82 | |||
diff --git a/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.20.bb b/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.21.bb index 4fdd0911..962f228f 100644 --- a/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.20.bb +++ b/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.21.bb | |||
@@ -9,19 +9,16 @@ LICENSE_append = " & ISC" | |||
9 | 9 | ||
10 | inherit autotools gtk-doc | 10 | inherit autotools gtk-doc |
11 | 11 | ||
12 | SRC_URI += "file://0001-lib-Fix-compilation-on-non-x86.patch" | 12 | SRC_URI = "${XORG_MIRROR}/individual/app/${BP}.tar.xz" |
13 | 13 | ||
14 | DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 libxv libx11 libxext libxrandr procps" | 14 | DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 libxv libx11 libxext libxrandr procps libunwind" |
15 | RDEPENDS_${PN} += "bash" | 15 | RDEPENDS_${PN} += "bash" |
16 | RDEPENDS_${PN}-tests += "bash" | 16 | RDEPENDS_${PN}-tests += "bash" |
17 | 17 | ||
18 | PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests" | 18 | PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests" |
19 | 19 | ||
20 | SRC_URI[md5sum] = "3b77a6a23274afe363bd5c942fe42562" | 20 | SRC_URI[md5sum] = "94125e46d528b67b060ba98f3c2e3bee" |
21 | SRC_URI[sha256sum] = "2fffe7a66789f56f301e6b60a3afe21556f34acbad8b7b29c8f3dd41f0b148e8" | 21 | SRC_URI[sha256sum] = "d9af6e7a24cb22e5b6ff8db03a0e6b230f08c17908cedee59e8795d74e18703f" |
22 | |||
23 | PACKAGECONFIG ??= "" | ||
24 | PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind,libunwind" | ||
25 | 22 | ||
26 | EXTRA_OECONF = "--disable-nouveau --disable-shader-debugger" | 23 | EXTRA_OECONF = "--disable-nouveau --disable-shader-debugger" |
27 | COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux" | 24 | COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux" |