libdrm: upgrade to latest version 2.4.21

Signed-off-by: Yu Ke <ke.yu@intel.com>

4 files changed, 19 insertions, 15 deletions

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index c8935ecf98..5148873b6a 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -137,7 +137,7 @@ PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.2"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
 PREFERRED_VERSION_xwininfo ?= "1.0.4"
 PREFERRED_VERSION_mesa-dri ?= "7.7"
-PREFERRED_VERSION_libdrm ?= "2.4.17"
+PREFERRED_VERSION_libdrm ?= "2.4.21"
 PREFERRED_VERSION_xcb-proto ?= "1.5"
 PREFERRED_VERSION_libxcb ?= "1.3"
 PREFERRED_VERSION_libxcb-nativesdk ?= "1.3"
diff --git a/meta/packages/drm/libdrm-2.4.17/installtests.patch b/meta/packages/drm/libdrm-2.4.21/installtests.patch
index a16c8a738b..9d6a168bbc 100644
--- a/meta/packages/drm/libdrm-2.4.17/installtests.patch
+++ b/meta/packages/drm/libdrm-2.4.21/installtests.patch
@@ -2,15 +2,19 @@ Index: libdrm-2.4.7/tests/Makefile.am
 ===================================================================
 --- libdrm-2.4.7.orig/tests/Makefile.am 2009-04-09 20:16:35.000000000 +0100
 +++ libdrm-2.4.7/tests/Makefile.am      2009-04-17 12:35:14.000000000 +0100
-@@ -4,7 +4,7 @@
- 
- LDADD = $(top_builddir)/libdrm/libdrm.la
- 
--noinst_PROGRAMS = \
+@@ -6,10 +6,11 @@
+
+ LDADD = $(top_builddir)/libdrm.la
+
+-check_PROGRAMS = \
 +bin_PROGRAMS = \
         dristat \
         drmstat
- 
+
++check_PROGRAMS =
+ SUBDIRS =
+
+ if HAVE_LIBKMS
 Index: libdrm-2.4.7/tests/modeprint/Makefile.am
 ===================================================================
 --- libdrm-2.4.7.orig/tests/modeprint/Makefile.am       2009-02-17 19:52:37.000000000 +0000
@@ -18,11 +22,11 @@ Index: libdrm-2.4.7/tests/modeprint/Makefile.am
 @@ -3,7 +3,7 @@
         -I$(top_srcdir)/libdrm/intel/ \
         -I$(top_srcdir)/libdrm
- 
+
 -noinst_PROGRAMS = \
 +bin_PROGRAMS = \
         modeprint
- 
+
  modeprint_SOURCES = \
 Index: libdrm-2.4.7/tests/modetest/Makefile.am
 ===================================================================
@@ -31,9 +35,9 @@ Index: libdrm-2.4.7/tests/modetest/Makefile.am
 @@ -4,7 +4,7 @@
         -I$(top_srcdir)/libdrm \
         $(CAIRO_CFLAGS)
- 
+
 -noinst_PROGRAMS = \
 +bin_PROGRAMS = \
         modetest
- 
+
  modetest_SOURCES = \
diff --git a/meta/packages/drm/libdrm_2.4.17.bb b/meta/packages/drm/libdrm_2.4.17.bb
deleted file mode 100644
index 67ddd01937..0000000000
--- a/meta/packages/drm/libdrm_2.4.17.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require libdrm.inc
-
-SRC_URI += "file://installtests.patch;patch=1"
-PR = "r2"
diff --git a/meta/packages/drm/libdrm_2.4.21.bb b/meta/packages/drm/libdrm_2.4.21.bb
new file mode 100644
index 0000000000..97ca069004
--- /dev/null
+++ b/meta/packages/drm/libdrm_2.4.21.bb
@@ -0,0 +1,4 @@
+require libdrm.inc
+
+SRC_URI += "file://installtests.patch"
+PR = "r0"