From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 4BADE6AC4B for ; Tue, 22 Dec 2015 19:40:43 +0000 (UTC) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP; 22 Dec 2015 11:40:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,465,1444719600"; d="scan'208";a="17777072" Received: from lvargasv-mobl3.amr.corp.intel.com (HELO swold-mobl.jf.intel.com) ([10.252.136.123]) by fmsmga004.fm.intel.com with ESMTP; 22 Dec 2015 11:40:42 -0800 From: Saul Wold To: openembedded-core@lists.openembedded.org, richard.purdie@linuxfoundation.org Date: Tue, 22 Dec 2015 11:40:41 -0800 Message-Id: <1450813241-20883-1-git-send-email-sgw@linux.intel.com> X-Mailer: git-send-email 2.5.0 Subject: [PATCH][v3] libdrm: Upgrade to 2.4.65 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2015 19:40:48 -0000 Rebased patch to reflect changes in Makefile Add libdrm_amdgpu package as a new library was added Signed-off-by: Saul Wold --- .../recipes-graphics/drm/libdrm/installtests.patch | 24 ++++++++++++---------- .../drm/{libdrm_2.4.62.bb => libdrm_2.4.65.bb} | 11 +++++----- 2 files changed, 19 insertions(+), 16 deletions(-) rename meta/recipes-graphics/drm/{libdrm_2.4.62.bb => libdrm_2.4.65.bb} (81%) diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch b/meta/recipes-graphics/drm/libdrm/installtests.patch index 1175dae..f460ef5 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.65.bb similarity index 81% rename from meta/recipes-graphics/drm/libdrm_2.4.62.bb rename to meta/recipes-graphics/drm/libdrm_2.4.65.bb index ea6305e..e5ed260 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.*" -- 2.5.0