diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2015-12-22 11:40:41 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-28 09:25:19 +0000 |
| commit | 6d561fb652c785252c819fb236f082672405e62f (patch) | |
| tree | d97242947686342b7cb2874364c4f2ca96aacbc9 /meta/recipes-graphics/drm | |
| parent | 0f516f0efe76289ded8e9728d9e7a580d1b137f2 (diff) | |
| download | openembedded-core-contrib-6d561fb652c785252c819fb236f082672405e62f.tar.gz | |
libdrm: Upgrade to 2.4.65
Rebased patch to reflect changes in Makefile
Add libdrm_amdgpu package as a new library was added
(From OE-Core rev: f2c66ded1abf128915311af506cb202ac924b8d2)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/drm')
| -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] Signed-off-by: Yu Ke <ke.yu@intel.com> -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.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" SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ file://installtests.patch " -SRC_URI[md5sum] = "c9291bae0e5ca65d1483821d3698d3ab" -SRC_URI[sha256sum] = "906c294bdbe1c94c3ca084305d61a6e5a8367f3b4986e6cc13b1e9b3f75931dc" + +SRC_URI[md5sum] = "de49916e5f8aef4eba55223c79709b05" +SRC_URI[sha256sum] = "71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4" inherit autotools pkgconfig @@ -26,10 +27,10 @@ EXTRA_OECONF += "--disable-cairo-tests \ 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}-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}-exynos ${PN}-freedreno ${PN}-amdgpu" FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test" FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" @@ -39,4 +40,4 @@ 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.*" |