From d4c721ac06add78151fcea23a757b526cca22408 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 29 Dec 2015 22:28:32 +0000 Subject: libdrm: Upgrade 2.4.65 -> 2.4.66 Fix test build failures. Ensure all binaries go into libdrm-tests [RB] (From OE-Core rev: 018bc5121c70ff1f609d5b3406401902b7e7b2f7) Signed-off-by: Khem Raj Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...tests-kms-steal-crtc-Include-sys-select.h.patch | 33 ++++++++++++++++ .../recipes-graphics/drm/libdrm/installtests.patch | 24 ++++-------- meta/recipes-graphics/drm/libdrm_2.4.65.bb | 43 --------------------- meta/recipes-graphics/drm/libdrm_2.4.66.bb | 45 ++++++++++++++++++++++ 4 files changed, 85 insertions(+), 60 deletions(-) create mode 100644 meta/recipes-graphics/drm/libdrm/0001-tests-kms-steal-crtc-Include-sys-select.h.patch delete mode 100644 meta/recipes-graphics/drm/libdrm_2.4.65.bb create mode 100644 meta/recipes-graphics/drm/libdrm_2.4.66.bb diff --git a/meta/recipes-graphics/drm/libdrm/0001-tests-kms-steal-crtc-Include-sys-select.h.patch b/meta/recipes-graphics/drm/libdrm/0001-tests-kms-steal-crtc-Include-sys-select.h.patch new file mode 100644 index 0000000000..c18228ee0f --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm/0001-tests-kms-steal-crtc-Include-sys-select.h.patch @@ -0,0 +1,33 @@ +From 46fb5516fb0ab17bcf46a0306a11e8966bb36e14 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 29 Dec 2015 22:17:21 +0000 +Subject: [PATCH] tests/kms-steal-crtc: Include sys/select.h + +Fixes errors e.g. + +error: implicit declaration of function 'select' + +and missing definitions of FD_* defines + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + tests/kms/kms-steal-crtc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/kms/kms-steal-crtc.c b/tests/kms/kms-steal-crtc.c +index 2f7f327..24d70ab 100644 +--- a/tests/kms/kms-steal-crtc.c ++++ b/tests/kms/kms-steal-crtc.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include + +-- +2.6.4 + diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch b/meta/recipes-graphics/drm/libdrm/installtests.patch index f460ef5ce9..30e0a61fd9 100644 --- a/meta/recipes-graphics/drm/libdrm/installtests.patch +++ b/meta/recipes-graphics/drm/libdrm/installtests.patch @@ -4,22 +4,12 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Yu Ke -Index: libdrm-2.4.65/tests/Makefile.am +Index: libdrm-2.4.66/tests/Makefile.am =================================================================== ---- libdrm-2.4.65.orig/tests/Makefile.am -+++ libdrm-2.4.65/tests/Makefile.am -@@ -29,9 +29,11 @@ AM_CFLAGS = \ - - LDADD = $(top_builddir)/libdrm.la - --check_PROGRAMS = \ -- dristat \ -- drmstat -+bin_PROGRAMS = \ -+ dristat \ -+ drmstat -+ -+check_PROGRAMS = - - dristat_LDADD = -lm +--- libdrm-2.4.66.orig/tests/Makefile.am ++++ libdrm-2.4.66/tests/Makefile.am +@@ -73,3 +73,4 @@ TESTS += \ + endif + check_PROGRAMS += $(TESTS) ++bin_PROGRAMS = $(check_PROGRAMS) diff --git a/meta/recipes-graphics/drm/libdrm_2.4.65.bb b/meta/recipes-graphics/drm/libdrm_2.4.65.bb deleted file mode 100644 index e5ed260254..0000000000 --- a/meta/recipes-graphics/drm/libdrm_2.4.65.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Userspace interface to the kernel DRM services" -DESCRIPTION = "The runtime library for accessing the kernel DRM services. DRM \ -stands for \"Direct Rendering Manager\", which is the kernel portion of the \ -\"Direct Rendering Infrastructure\" (DRI). DRI is required for many hardware \ -accelerated OpenGL drivers." -HOMEPAGE = "http://dri.freedesktop.org" -SECTION = "x11/base" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71" -PROVIDES = "drm" -DEPENDS = "libpthread-stubs udev libpciaccess" - -SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ - file://installtests.patch " - -SRC_URI[md5sum] = "de49916e5f8aef4eba55223c79709b05" -SRC_URI[sha256sum] = "71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4" - -inherit autotools pkgconfig - -EXTRA_OECONF += "--disable-cairo-tests \ - --enable-omap-experimental-api \ - --enable-install-test-programs \ - --disable-manpages \ - --disable-valgrind \ - " - -ALLOW_EMPTY_${PN}-drivers = "1" -PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ - ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno ${PN}-amdgpu" - -RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ - ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu" - -FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test" -FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" -FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" -FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*" -FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*" -FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*" -FILES_${PN}-kms = "${libdir}/libkms*.so.*" -FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" -FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.*" diff --git a/meta/recipes-graphics/drm/libdrm_2.4.66.bb b/meta/recipes-graphics/drm/libdrm_2.4.66.bb new file mode 100644 index 0000000000..028db4a4ee --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm_2.4.66.bb @@ -0,0 +1,45 @@ +SUMMARY = "Userspace interface to the kernel DRM services" +DESCRIPTION = "The runtime library for accessing the kernel DRM services. DRM \ +stands for \"Direct Rendering Manager\", which is the kernel portion of the \ +\"Direct Rendering Infrastructure\" (DRI). DRI is required for many hardware \ +accelerated OpenGL drivers." +HOMEPAGE = "http://dri.freedesktop.org" +SECTION = "x11/base" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71" +PROVIDES = "drm" +DEPENDS = "libpthread-stubs udev libpciaccess" + +SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ + file://installtests.patch \ + file://0001-tests-kms-steal-crtc-Include-sys-select.h.patch \ + " + +SRC_URI[md5sum] = "c6809c48538d6e5999588832045ff014" +SRC_URI[sha256sum] = "79cb8e988749794edfb2d777b298d5292eff353bbbb71ed813589e61d2bc2d76" + +inherit autotools pkgconfig + +EXTRA_OECONF += "--disable-cairo-tests \ + --enable-omap-experimental-api \ + --enable-install-test-programs \ + --disable-manpages \ + --disable-valgrind \ + " + +ALLOW_EMPTY_${PN}-drivers = "1" +PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ + ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno ${PN}-amdgpu" + +RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ + ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu" + +FILES_${PN}-tests = "${bindir}/*" +FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" +FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" +FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*" +FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*" +FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*" +FILES_${PN}-kms = "${libdir}/libkms*.so.*" +FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" +FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.*" -- cgit 1.2.3-korg