From 6391725f947ac216d168a37e10d174eab8542ab7 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Tue, 26 Jan 2010 16:17:37 +0000
Subject: libdrm: 2.4.7 -> 2.4.15

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/drm/libdrm-2.4.15/installtests.patch | 39 ++++++++++++++++++++++
 meta/packages/drm/libdrm-2.4.7/installtests.patch  | 39 ----------------------
 meta/packages/drm/libdrm_2.4.15.bb                 | 12 +++++++
 meta/packages/drm/libdrm_2.4.7.bb                  | 12 -------
 meta/packages/drm/libdrm_git.bb                    |  4 +--
 5 files changed, 53 insertions(+), 53 deletions(-)
 create mode 100644 meta/packages/drm/libdrm-2.4.15/installtests.patch
 delete mode 100644 meta/packages/drm/libdrm-2.4.7/installtests.patch
 create mode 100644 meta/packages/drm/libdrm_2.4.15.bb
 delete mode 100644 meta/packages/drm/libdrm_2.4.7.bb

(limited to 'meta/packages/drm')

diff --git a/meta/packages/drm/libdrm-2.4.15/installtests.patch b/meta/packages/drm/libdrm-2.4.15/installtests.patch
new file mode 100644
index 000000000..a16c8a738
--- /dev/null
+++ b/meta/packages/drm/libdrm-2.4.15/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.7/installtests.patch b/meta/packages/drm/libdrm-2.4.7/installtests.patch
deleted file mode 100644
index a16c8a738..000000000
--- a/meta/packages/drm/libdrm-2.4.7/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.15.bb b/meta/packages/drm/libdrm_2.4.15.bb
new file mode 100644
index 000000000..f0d566893
--- /dev/null
+++ b/meta/packages/drm/libdrm_2.4.15.bb
@@ -0,0 +1,12 @@
+SECTION = "x11/base"
+LICENSE = "MIT"
+SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2 \
+           file://installtests.patch;patch=1"
+PR = "r1"
+PROVIDES = "drm"
+DEPENDS = "libpthread-stubs udev cairo"
+
+PACKAGES =+ "libdrm-tests"
+FILES_libdrm-tests = "${bindir}/dr* ${bindir}/mode*"
+
+inherit autotools_stage pkgconfig
diff --git a/meta/packages/drm/libdrm_2.4.7.bb b/meta/packages/drm/libdrm_2.4.7.bb
deleted file mode 100644
index f0d566893..000000000
--- a/meta/packages/drm/libdrm_2.4.7.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SECTION = "x11/base"
-LICENSE = "MIT"
-SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2 \
-           file://installtests.patch;patch=1"
-PR = "r1"
-PROVIDES = "drm"
-DEPENDS = "libpthread-stubs udev cairo"
-
-PACKAGES =+ "libdrm-tests"
-FILES_libdrm-tests = "${bindir}/dr* ${bindir}/mode*"
-
-inherit autotools_stage pkgconfig
diff --git a/meta/packages/drm/libdrm_git.bb b/meta/packages/drm/libdrm_git.bb
index a09d1d260..bb8402294 100644
--- a/meta/packages/drm/libdrm_git.bb
+++ b/meta/packages/drm/libdrm_git.bb
@@ -7,8 +7,8 @@ S = ${WORKDIR}/git
 
 DEPENDS = "libpthread-stubs"
 
-PV = "2.4.7+git${SRCREV}"
-PR = "r1"
+PV = "2.4.15+git${SRCREV}"
+PR = "r0"
 
 LEAD_SONAME = "libdrm.so"
 
-- 
cgit v1.2.3