summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2014-12-03 21:55:32 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-05 18:01:08 +0000
commit764e08b292a3f0d04757680ca61d14908b708296 (patch)
tree961d8be7515f40f99ca15cc085e75206b9a8cd72
parent79309027771fd4b6efb8914f6e7347a9bc34221d (diff)
downloadpoky-764e08b292a3f0d04757680ca61d14908b708296.tar.gz
libdrm: Upgrade to 2.4.58.
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. (From OE-Core rev: 65246c7111b4e23c1c505ad95271a17ca4be3d31) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/drm/libdrm.inc1
-rw-r--r--meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch30
-rw-r--r--meta/recipes-graphics/drm/libdrm_2.4.54.bb8
-rw-r--r--meta/recipes-graphics/drm/libdrm_2.4.58.bb6
4 files changed, 7 insertions, 38 deletions
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 \
23 --enable-omap-experimental-api \ 23 --enable-omap-experimental-api \
24 --enable-freedreno-experimental-api \ 24 --enable-freedreno-experimental-api \
25 --enable-install-test-programs \ 25 --enable-install-test-programs \
26 --disable-manpages \
26 " 27 "
27ALLOW_EMPTY_${PN}-drivers = "1" 28ALLOW_EMPTY_${PN}-drivers = "1"
28PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ 29PACKAGES =+ "${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 @@
1uclibc headers need to know if _GNU_SOURCE is defined or not and its defined
2in config.h so include it first to get the definition if its there fixed build
3problems on uclibc
4
5test_decode.c:107:2: error: implicit declaration of function 'open_memstream' [-Werror=implicit-function-declaration]
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8Upstream-Status: Pending
9
10Index: libdrm-2.4.30/intel/test_decode.c
11===================================================================
12--- libdrm-2.4.30.orig/intel/test_decode.c 2012-02-03 14:28:46.409355918 -0800
13+++ libdrm-2.4.30/intel/test_decode.c 2012-02-03 14:29:02.357356689 -0800
14@@ -21,6 +21,8 @@
15 * IN THE SOFTWARE.
16 */
17
18+#include "config.h"
19+
20 #include <string.h>
21 #include <stdlib.h>
22 #include <stdio.h>
23@@ -31,7 +33,6 @@
24 #include <sys/mman.h>
25 #include <err.h>
26
27-#include "config.h"
28 #include "intel_bufmgr.h"
29 #include "intel_chipset.h"
30
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 @@
1require libdrm.inc
2
3SRC_URI += "file://installtests.patch \
4 file://GNU_SOURCE_definition.patch \
5 "
6SRC_URI[md5sum] = "56e98a9c2073c3fab7f95e003b657f46"
7SRC_URI[sha256sum] = "d94001ebfbe80e1523d1228ee2df57294698d1c734fad9ccf53efde8932fe4e9"
8
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 @@
1require libdrm.inc
2
3SRC_URI += "file://installtests.patch "
4
5SRC_URI[md5sum] = "24213913333d72b36c16463ed92e522a"
6SRC_URI[sha256sum] = "b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd"