From 5e2162039e08df3b19080d5c25aeece514add238 Mon Sep 17 00:00:00 2001
From: Yu Ke <ke.yu@intel.com>
Date: Wed, 23 Jun 2010 21:15:26 +0800
Subject: libdrm: upgrade to latest version 2.4.21

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../distro/include/preferred-xorg-versions.inc     |  2 +-
 meta/packages/drm/libdrm-2.4.17/installtests.patch | 39 --------------------
 meta/packages/drm/libdrm-2.4.21/installtests.patch | 43 ++++++++++++++++++++++
 meta/packages/drm/libdrm_2.4.17.bb                 |  4 --
 meta/packages/drm/libdrm_2.4.21.bb                 |  4 ++
 5 files changed, 48 insertions(+), 44 deletions(-)
 delete mode 100644 meta/packages/drm/libdrm-2.4.17/installtests.patch
 create mode 100644 meta/packages/drm/libdrm-2.4.21/installtests.patch
 delete mode 100644 meta/packages/drm/libdrm_2.4.17.bb
 create mode 100644 meta/packages/drm/libdrm_2.4.21.bb

(limited to 'meta')

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index c8935ecf9..5148873b6 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.17/installtests.patch
deleted file mode 100644
index a16c8a738..000000000
--- a/meta/packages/drm/libdrm-2.4.17/installtests.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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 = \
-+bin_PROGRAMS = \
- 	dristat \
- 	drmstat
- 
-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
-+++ libdrm-2.4.7/tests/modeprint/Makefile.am	2009-04-17 12:35:32.000000000 +0100
-@@ -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
-===================================================================
---- libdrm-2.4.7.orig/tests/modetest/Makefile.am	2009-02-17 19:52:37.000000000 +0000
-+++ libdrm-2.4.7/tests/modetest/Makefile.am	2009-04-17 12:35:42.000000000 +0100
-@@ -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.21/installtests.patch b/meta/packages/drm/libdrm-2.4.21/installtests.patch
new file mode 100644
index 000000000..9d6a168bb
--- /dev/null
+++ b/meta/packages/drm/libdrm-2.4.21/installtests.patch
@@ -0,0 +1,43 @@
+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
+@@ -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
++++ libdrm-2.4.7/tests/modeprint/Makefile.am	2009-04-17 12:35:32.000000000 +0100
+@@ -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
+===================================================================
+--- libdrm-2.4.7.orig/tests/modetest/Makefile.am	2009-02-17 19:52:37.000000000 +0000
++++ libdrm-2.4.7/tests/modetest/Makefile.am	2009-04-17 12:35:42.000000000 +0100
+@@ -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 67ddd0193..000000000
--- 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 000000000..97ca06900
--- /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"
-- 
cgit v1.2.3