From 2c2994718c3dde6249afe66ebffb5c3cec0c313f Mon Sep 17 00:00:00 2001
From: Joshua Lock <josh@linux.intel.com>
Date: Wed, 10 Feb 2010 14:01:46 +0000
Subject: libdrm: bump version to 2.4.17 as required by mesa 7.7

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/packages/drm/libdrm-2.4.16/installtests.patch | 39 ----------------------
 meta/packages/drm/libdrm-2.4.17/installtests.patch | 39 ++++++++++++++++++++++
 meta/packages/drm/libdrm_2.4.16.bb                 |  4 ---
 meta/packages/drm/libdrm_2.4.17.bb                 |  4 +++
 4 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 meta/packages/drm/libdrm-2.4.16/installtests.patch
 create mode 100644 meta/packages/drm/libdrm-2.4.17/installtests.patch
 delete mode 100644 meta/packages/drm/libdrm_2.4.16.bb
 create mode 100644 meta/packages/drm/libdrm_2.4.17.bb

(limited to 'meta/packages')

diff --git a/meta/packages/drm/libdrm-2.4.16/installtests.patch b/meta/packages/drm/libdrm-2.4.16/installtests.patch
deleted file mode 100644
index a16c8a738..000000000
--- a/meta/packages/drm/libdrm-2.4.16/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.17/installtests.patch b/meta/packages/drm/libdrm-2.4.17/installtests.patch
new file mode 100644
index 000000000..a16c8a738
--- /dev/null
+++ b/meta/packages/drm/libdrm-2.4.17/installtests.patch
@@ -0,0 +1,39 @@
+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.16.bb b/meta/packages/drm/libdrm_2.4.16.bb
deleted file mode 100644
index 767903586..000000000
--- a/meta/packages/drm/libdrm_2.4.16.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require libdrm.inc
-
-SRC_URI += "file://installtests.patch;patch=1"
-PR = "r1"
diff --git a/meta/packages/drm/libdrm_2.4.17.bb b/meta/packages/drm/libdrm_2.4.17.bb
new file mode 100644
index 000000000..767903586
--- /dev/null
+++ b/meta/packages/drm/libdrm_2.4.17.bb
@@ -0,0 +1,4 @@
+require libdrm.inc
+
+SRC_URI += "file://installtests.patch;patch=1"
+PR = "r1"
-- 
cgit v1.2.3