From 65246c7111b4e23c1c505ad95271a17ca4be3d31 Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Wed, 3 Dec 2014 21:55:32 -0600 Subject: libdrm: Upgrade to 2.4.58. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disable man pages creation because it needs to download docbook.xsl from upstream site and sometimes can't (resource unavailable) and this cause build fails. Remove GNU_SOURCE_definition patch it's already integrated in upstream. Signed-off-by: Aníbal Limón --- meta/recipes-graphics/drm/libdrm.inc | 1 + .../drm/libdrm/GNU_SOURCE_definition.patch | 30 ---------------------- meta/recipes-graphics/drm/libdrm_2.4.54.bb | 8 ------ meta/recipes-graphics/drm/libdrm_2.4.58.bb | 6 +++++ 4 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch delete mode 100644 meta/recipes-graphics/drm/libdrm_2.4.54.bb create mode 100644 meta/recipes-graphics/drm/libdrm_2.4.58.bb diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc index 5ec63071ef..cfac9e2a2b 100644 --- a/meta/recipes-graphics/drm/libdrm.inc +++ b/meta/recipes-graphics/drm/libdrm.inc @@ -23,6 +23,7 @@ EXTRA_OECONF += "--disable-cairo-tests \ --enable-omap-experimental-api \ --enable-freedreno-experimental-api \ --enable-install-test-programs \ + --disable-manpages \ " ALLOW_EMPTY_${PN}-drivers = "1" PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ diff --git a/meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch b/meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch deleted file mode 100644 index 8eb1d5e1ea..0000000000 --- a/meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch +++ /dev/null @@ -1,30 +0,0 @@ -uclibc headers need to know if _GNU_SOURCE is defined or not and its defined -in config.h so include it first to get the definition if its there fixed build -problems on uclibc - -test_decode.c:107:2: error: implicit declaration of function 'open_memstream' [-Werror=implicit-function-declaration] - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: libdrm-2.4.30/intel/test_decode.c -=================================================================== ---- libdrm-2.4.30.orig/intel/test_decode.c 2012-02-03 14:28:46.409355918 -0800 -+++ libdrm-2.4.30/intel/test_decode.c 2012-02-03 14:29:02.357356689 -0800 -@@ -21,6 +21,8 @@ - * IN THE SOFTWARE. - */ - -+#include "config.h" -+ - #include - #include - #include -@@ -31,7 +33,6 @@ - #include - #include - --#include "config.h" - #include "intel_bufmgr.h" - #include "intel_chipset.h" - diff --git a/meta/recipes-graphics/drm/libdrm_2.4.54.bb b/meta/recipes-graphics/drm/libdrm_2.4.54.bb deleted file mode 100644 index 12eefc7751..0000000000 --- a/meta/recipes-graphics/drm/libdrm_2.4.54.bb +++ /dev/null @@ -1,8 +0,0 @@ -require libdrm.inc - -SRC_URI += "file://installtests.patch \ - file://GNU_SOURCE_definition.patch \ - " -SRC_URI[md5sum] = "56e98a9c2073c3fab7f95e003b657f46" -SRC_URI[sha256sum] = "d94001ebfbe80e1523d1228ee2df57294698d1c734fad9ccf53efde8932fe4e9" - diff --git a/meta/recipes-graphics/drm/libdrm_2.4.58.bb b/meta/recipes-graphics/drm/libdrm_2.4.58.bb new file mode 100644 index 0000000000..7b1207e27e --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm_2.4.58.bb @@ -0,0 +1,6 @@ +require libdrm.inc + +SRC_URI += "file://installtests.patch " + +SRC_URI[md5sum] = "24213913333d72b36c16463ed92e522a" +SRC_URI[sha256sum] = "b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd" -- cgit 1.2.3-korg