From f2c66ded1abf128915311af506cb202ac924b8d2 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 22 Dec 2015 11:40:41 -0800 Subject: libdrm: Upgrade to 2.4.65 Rebased patch to reflect changes in Makefile Add libdrm_amdgpu package as a new library was added Signed-off-by: Saul Wold Signed-off-by: Ross Burton --- .../recipes-graphics/drm/libdrm/installtests.patch | 24 ++++++------ meta/recipes-graphics/drm/libdrm_2.4.62.bb | 42 --------------------- meta/recipes-graphics/drm/libdrm_2.4.65.bb | 43 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-graphics/drm/libdrm_2.4.62.bb create mode 100644 meta/recipes-graphics/drm/libdrm_2.4.65.bb (limited to 'meta') 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] Signed-off-by: Yu Ke -diff --git a/tests/Makefile.am b/tests/Makefile.am -index bf1987f..d909e19 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -27,10 +27,11 @@ AM_CPPFLAGS = \ +Index: libdrm-2.4.65/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 - ++ dristat \ ++ drmstat ++ +check_PROGRAMS = - if HAVE_NOUVEAU - SUBDIRS += nouveau - endif + + dristat_LDADD = -lm + diff --git a/meta/recipes-graphics/drm/libdrm_2.4.62.bb b/meta/recipes-graphics/drm/libdrm_2.4.62.bb deleted file mode 100644 index ea6305e516..0000000000 --- a/meta/recipes-graphics/drm/libdrm_2.4.62.bb +++ /dev/null @@ -1,42 +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] = "c9291bae0e5ca65d1483821d3698d3ab" -SRC_URI[sha256sum] = "906c294bdbe1c94c3ca084305d61a6e5a8367f3b4986e6cc13b1e9b3f75931dc" - -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" - -RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ - ${PN}-exynos ${PN}-freedreno" - -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.*" - diff --git a/meta/recipes-graphics/drm/libdrm_2.4.65.bb b/meta/recipes-graphics/drm/libdrm_2.4.65.bb new file mode 100644 index 0000000000..e5ed260254 --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm_2.4.65.bb @@ -0,0 +1,43 @@ +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.*" -- cgit 1.2.3-korg