From 375f6a64be5c04718415f66e0720b4351c9dc53f Mon Sep 17 00:00:00 2001 From: Sean Nyekjaer Date: Wed, 5 Oct 2016 12:01:05 +0200 Subject: [PATCH 1/3] libdrm: add version 2.4.71 Signed-off-by: Sean Nyekjaer --- recipes/drm/libdrm.inc | 3 ++- recipes/drm/libdrm_2.4.71.oe | 2 ++ recipes/drm/libdrm_2.4.71.oe.sig | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 recipes/drm/libdrm_2.4.71.oe create mode 100644 recipes/drm/libdrm_2.4.71.oe.sig diff --git a/recipes/drm/libdrm.inc b/recipes/drm/libdrm.inc index bdd8d58..18fd7bc 100644 --- a/recipes/drm/libdrm.inc +++ b/recipes/drm/libdrm.inc @@ -10,7 +10,8 @@ inherit autotools-autoreconf pkgconfig library SRC_URI = "https://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" #libpciaccess is required starting from libdrm 2.4.26 -DEPENDS = "libpciaccess libpthread-stubs libx11" +DEPENDS = "libpciaccess libpthread-stubs libx11 util-macros libm" + COMMON_DEPENDS += "librt libc libgcc" DEPENDS += "${COMMON_DEPENDS}" diff --git a/recipes/drm/libdrm_2.4.71.oe b/recipes/drm/libdrm_2.4.71.oe new file mode 100644 index 0000000..c050dd8 --- /dev/null +++ b/recipes/drm/libdrm_2.4.71.oe @@ -0,0 +1,2 @@ +require libdrm.inc +LICENSE = "MIT" diff --git a/recipes/drm/libdrm_2.4.71.oe.sig b/recipes/drm/libdrm_2.4.71.oe.sig new file mode 100644 index 0000000..dc911f2 --- /dev/null +++ b/recipes/drm/libdrm_2.4.71.oe.sig @@ -0,0 +1 @@ +5c9cd0c45d92bcd4809e42681494163ba9f31f3d libdrm-2.4.71.tar.bz2 From 3afa515d9c74bc8810f0dbff63a5168bdd017933 Mon Sep 17 00:00:00 2001 From: Sean Nyekjaer Date: Wed, 5 Oct 2016 12:01:31 +0200 Subject: [PATCH 2/3] libdrm: add compilation of etnaviv api Signed-off-by: Sean Nyekjaer --- recipes/drm/libdrm.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/drm/libdrm.inc b/recipes/drm/libdrm.inc index 18fd7bc..4896fea 100644 --- a/recipes/drm/libdrm.inc +++ b/recipes/drm/libdrm.inc @@ -12,6 +12,7 @@ SRC_URI = "https://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" #libpciaccess is required starting from libdrm 2.4.26 DEPENDS = "libpciaccess libpthread-stubs libx11 util-macros libm" +EXTRA_OECONF += " --enable-etnaviv-experimental-api" COMMON_DEPENDS += "librt libc libgcc" DEPENDS += "${COMMON_DEPENDS}" From 99fcf2bdf73195baf9ff16b6d3b7a1a67dd92f74 Mon Sep 17 00:00:00 2001 From: Sean Nyekjaer Date: Wed, 5 Oct 2016 12:04:34 +0200 Subject: [PATCH 3/3] libdrm: remove version 2.4.36 Signed-off-by: Sean Nyekjaer --- .../drm/libdrm/GNU_SOURCE_definition.patch | 30 ------------ recipes/drm/libdrm/installtests.patch | 49 ------------------- recipes/drm/libdrm_2.4.36.oe | 7 --- recipes/drm/libdrm_2.4.36.oe.sig | 1 - 4 files changed, 87 deletions(-) delete mode 100644 recipes/drm/libdrm/GNU_SOURCE_definition.patch delete mode 100644 recipes/drm/libdrm/installtests.patch delete mode 100644 recipes/drm/libdrm_2.4.36.oe delete mode 100644 recipes/drm/libdrm_2.4.36.oe.sig diff --git a/recipes/drm/libdrm/GNU_SOURCE_definition.patch b/recipes/drm/libdrm/GNU_SOURCE_definition.patch deleted file mode 100644 index 8eb1d5e..0000000 --- a/recipes/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/recipes/drm/libdrm/installtests.patch b/recipes/drm/libdrm/installtests.patch deleted file mode 100644 index 1f39719..0000000 --- a/recipes/drm/libdrm/installtests.patch +++ /dev/null @@ -1,49 +0,0 @@ -tests: also install tests app - -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 -@@ -6,10 +6,11 @@ AM_CPPFLAGS = \ - - LDADD = $(top_builddir)/libdrm.la - --check_PROGRAMS = \ -+bin_PROGRAMS = \ - dristat \ - drmstat - -+check_PROGRAMS = - SUBDIRS = modeprint - - if HAVE_LIBKMS -diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am -index c4862ac..7db76ea 100644 ---- a/tests/modeprint/Makefile.am -+++ b/tests/modeprint/Makefile.am -@@ -2,7 +2,7 @@ AM_CFLAGS = \ - -I$(top_srcdir)/include/drm \ - -I$(top_srcdir) - --noinst_PROGRAMS = \ -+bin_PROGRAMS = \ - modeprint - - modeprint_SOURCES = \ -diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am -index 2191242..1d2c1b0 100644 ---- a/tests/modetest/Makefile.am -+++ b/tests/modetest/Makefile.am -@@ -4,7 +4,7 @@ AM_CFLAGS = \ - -I$(top_srcdir) \ - $(CAIRO_CFLAGS) - --noinst_PROGRAMS = \ -+bin_PROGRAMS = \ - modetest - - modetest_SOURCES = \ diff --git a/recipes/drm/libdrm_2.4.36.oe b/recipes/drm/libdrm_2.4.36.oe deleted file mode 100644 index d074fb8..0000000 --- a/recipes/drm/libdrm_2.4.36.oe +++ /dev/null @@ -1,7 +0,0 @@ -require libdrm.inc -LICENSE = "MIT" - -SRC_URI += "file://installtests.patch \ - file://GNU_SOURCE_definition.patch \ - " - diff --git a/recipes/drm/libdrm_2.4.36.oe.sig b/recipes/drm/libdrm_2.4.36.oe.sig deleted file mode 100644 index 1ef5c94..0000000 --- a/recipes/drm/libdrm_2.4.36.oe.sig +++ /dev/null @@ -1 +0,0 @@ -bbf0efd37e806ea7fa83fab19e032eac1cdc775f libdrm-2.4.36.tar.bz2