diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/drm/libdrm/installtests.patch | 24 | ||||
-rw-r--r-- | meta/recipes-graphics/drm/libdrm_2.4.65.bb (renamed from meta/recipes-graphics/drm/libdrm_2.4.62.bb) | 11 |
2 files changed, 19 insertions, 16 deletions
diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch b/meta/recipes-graphics/drm/libdrm/installtests.patch index 1175daef96..f460ef5ce9 100644 --- a/meta/recipes-graphics/drm/libdrm/installtests.patch +++ b/meta/recipes-graphics/drm/libdrm/installtests.patch | |||
@@ -4,20 +4,22 @@ Upstream-Status: Inappropriate [configuration] | |||
4 | 4 | ||
5 | Signed-off-by: Yu Ke <ke.yu@intel.com> | 5 | Signed-off-by: Yu Ke <ke.yu@intel.com> |
6 | 6 | ||
7 | diff --git a/tests/Makefile.am b/tests/Makefile.am | 7 | Index: libdrm-2.4.65/tests/Makefile.am |
8 | index bf1987f..d909e19 100644 | 8 | =================================================================== |
9 | --- a/tests/Makefile.am | 9 | --- libdrm-2.4.65.orig/tests/Makefile.am |
10 | +++ b/tests/Makefile.am | 10 | +++ libdrm-2.4.65/tests/Makefile.am |
11 | @@ -27,10 +27,11 @@ AM_CPPFLAGS = \ | 11 | @@ -29,9 +29,11 @@ AM_CFLAGS = \ |
12 | 12 | ||
13 | LDADD = $(top_builddir)/libdrm.la | 13 | LDADD = $(top_builddir)/libdrm.la |
14 | 14 | ||
15 | -check_PROGRAMS = \ | 15 | -check_PROGRAMS = \ |
16 | - dristat \ | ||
17 | - drmstat | ||
16 | +bin_PROGRAMS = \ | 18 | +bin_PROGRAMS = \ |
17 | dristat \ | 19 | + dristat \ |
18 | drmstat | 20 | + drmstat |
19 | 21 | + | |
20 | +check_PROGRAMS = | 22 | +check_PROGRAMS = |
21 | if HAVE_NOUVEAU | 23 | |
22 | SUBDIRS += nouveau | 24 | dristat_LDADD = -lm |
23 | endif | 25 | |
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.62.bb b/meta/recipes-graphics/drm/libdrm_2.4.65.bb index ea6305e516..e5ed260254 100644 --- a/meta/recipes-graphics/drm/libdrm_2.4.62.bb +++ b/meta/recipes-graphics/drm/libdrm_2.4.65.bb | |||
@@ -12,8 +12,9 @@ DEPENDS = "libpthread-stubs udev libpciaccess" | |||
12 | 12 | ||
13 | SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ | 13 | SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ |
14 | file://installtests.patch " | 14 | file://installtests.patch " |
15 | SRC_URI[md5sum] = "c9291bae0e5ca65d1483821d3698d3ab" | 15 | |
16 | SRC_URI[sha256sum] = "906c294bdbe1c94c3ca084305d61a6e5a8367f3b4986e6cc13b1e9b3f75931dc" | 16 | SRC_URI[md5sum] = "de49916e5f8aef4eba55223c79709b05" |
17 | SRC_URI[sha256sum] = "71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4" | ||
17 | 18 | ||
18 | inherit autotools pkgconfig | 19 | inherit autotools pkgconfig |
19 | 20 | ||
@@ -26,10 +27,10 @@ EXTRA_OECONF += "--disable-cairo-tests \ | |||
26 | 27 | ||
27 | ALLOW_EMPTY_${PN}-drivers = "1" | 28 | ALLOW_EMPTY_${PN}-drivers = "1" |
28 | PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ | 29 | PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ |
29 | ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno" | 30 | ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno ${PN}-amdgpu" |
30 | 31 | ||
31 | RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ | 32 | RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ |
32 | ${PN}-exynos ${PN}-freedreno" | 33 | ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu" |
33 | 34 | ||
34 | FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test" | 35 | FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test" |
35 | FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" | 36 | FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" |
@@ -39,4 +40,4 @@ FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*" | |||
39 | FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*" | 40 | FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*" |
40 | FILES_${PN}-kms = "${libdir}/libkms*.so.*" | 41 | FILES_${PN}-kms = "${libdir}/libkms*.so.*" |
41 | FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" | 42 | FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" |
42 | 43 | FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.*" | |