summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-04-07 15:16:01 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-18 05:49:40 +0100
commitd890254ee571447dfb5d7bde7545254acfa10eb9 (patch)
tree07c2df091e0c6e438039c413aa8c1c696a6f883b
parentd02a174cb637ede72cdd6cef28ebde4d12bb97e9 (diff)
downloadpoky-d890254ee571447dfb5d7bde7545254acfa10eb9.tar.gz
libdrm: upgrade from 2.4.23 to 2.4.25
(From OE-Core rev: fe051ffdbad7e87fc8dfdb2017ca79ca1f533edc) Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc2
-rw-r--r--meta/recipes-graphics/drm/libdrm-2.4.23/installtests.patch43
-rw-r--r--meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch49
-rw-r--r--meta/recipes-graphics/drm/libdrm_2.4.25.bb (renamed from meta/recipes-graphics/drm/libdrm_2.4.23.bb)5
4 files changed, 53 insertions, 46 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index fb21c2c1f7..46fd104eb4 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -136,7 +136,7 @@ PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.6"
136PREFERRED_VERSION_xvinfo ?= "1.1.1" 136PREFERRED_VERSION_xvinfo ?= "1.1.1"
137PREFERRED_VERSION_xwininfo ?= "1.1.1" 137PREFERRED_VERSION_xwininfo ?= "1.1.1"
138PREFERRED_VERSION_mesa-dri ?= "7.10" 138PREFERRED_VERSION_mesa-dri ?= "7.10"
139PREFERRED_VERSION_libdrm ?= "2.4.23" 139PREFERRED_VERSION_libdrm ?= "2.4.25"
140PREFERRED_VERSION_xcb-proto ?= "1.6" 140PREFERRED_VERSION_xcb-proto ?= "1.6"
141PREFERRED_VERSION_libxcb ?= "1.7" 141PREFERRED_VERSION_libxcb ?= "1.7"
142PREFERRED_VERSION_libxcb-nativesdk ?= "1.7" 142PREFERRED_VERSION_libxcb-nativesdk ?= "1.7"
diff --git a/meta/recipes-graphics/drm/libdrm-2.4.23/installtests.patch b/meta/recipes-graphics/drm/libdrm-2.4.23/installtests.patch
deleted file mode 100644
index 9d6a168bbc..0000000000
--- a/meta/recipes-graphics/drm/libdrm-2.4.23/installtests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1Index: libdrm-2.4.7/tests/Makefile.am
2===================================================================
3--- libdrm-2.4.7.orig/tests/Makefile.am 2009-04-09 20:16:35.000000000 +0100
4+++ libdrm-2.4.7/tests/Makefile.am 2009-04-17 12:35:14.000000000 +0100
5@@ -6,10 +6,11 @@
6
7 LDADD = $(top_builddir)/libdrm.la
8
9-check_PROGRAMS = \
10+bin_PROGRAMS = \
11 dristat \
12 drmstat
13
14+check_PROGRAMS =
15 SUBDIRS =
16
17 if HAVE_LIBKMS
18Index: libdrm-2.4.7/tests/modeprint/Makefile.am
19===================================================================
20--- libdrm-2.4.7.orig/tests/modeprint/Makefile.am 2009-02-17 19:52:37.000000000 +0000
21+++ libdrm-2.4.7/tests/modeprint/Makefile.am 2009-04-17 12:35:32.000000000 +0100
22@@ -3,7 +3,7 @@
23 -I$(top_srcdir)/libdrm/intel/ \
24 -I$(top_srcdir)/libdrm
25
26-noinst_PROGRAMS = \
27+bin_PROGRAMS = \
28 modeprint
29
30 modeprint_SOURCES = \
31Index: libdrm-2.4.7/tests/modetest/Makefile.am
32===================================================================
33--- libdrm-2.4.7.orig/tests/modetest/Makefile.am 2009-02-17 19:52:37.000000000 +0000
34+++ libdrm-2.4.7/tests/modetest/Makefile.am 2009-04-17 12:35:42.000000000 +0100
35@@ -4,7 +4,7 @@
36 -I$(top_srcdir)/libdrm \
37 $(CAIRO_CFLAGS)
38
39-noinst_PROGRAMS = \
40+bin_PROGRAMS = \
41 modetest
42
43 modetest_SOURCES = \
diff --git a/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch b/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch
new file mode 100644
index 0000000000..2704ee6c6b
--- /dev/null
+++ b/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch
@@ -0,0 +1,49 @@
1tests: also install tests app
2
3Upstream-Status: Pending
4
5Signed-off-by: Yu Ke <ke.yu@intel.com>
6
7diff --git a/tests/Makefile.am b/tests/Makefile.am
8index bf1987f..d909e19 100644
9--- a/tests/Makefile.am
10+++ b/tests/Makefile.am
11@@ -6,10 +6,11 @@ AM_CPPFLAGS = \
12
13 LDADD = $(top_builddir)/libdrm.la
14
15-check_PROGRAMS = \
16+bin_PROGRAMS = \
17 dristat \
18 drmstat
19
20+check_PROGRAMS =
21 SUBDIRS = modeprint
22
23 if HAVE_LIBKMS
24diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am
25index c4862ac..7db76ea 100644
26--- a/tests/modeprint/Makefile.am
27+++ b/tests/modeprint/Makefile.am
28@@ -2,7 +2,7 @@ AM_CFLAGS = \
29 -I$(top_srcdir)/include/drm \
30 -I$(top_srcdir)
31
32-noinst_PROGRAMS = \
33+bin_PROGRAMS = \
34 modeprint
35
36 modeprint_SOURCES = \
37diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
38index 2191242..1d2c1b0 100644
39--- a/tests/modetest/Makefile.am
40+++ b/tests/modetest/Makefile.am
41@@ -4,7 +4,7 @@ AM_CFLAGS = \
42 -I$(top_srcdir) \
43 $(CAIRO_CFLAGS)
44
45-noinst_PROGRAMS = \
46+bin_PROGRAMS = \
47 modetest
48
49 modetest_SOURCES = \
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.23.bb b/meta/recipes-graphics/drm/libdrm_2.4.25.bb
index 1546ceae60..177e444b41 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.23.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.25.bb
@@ -3,7 +3,8 @@ require libdrm.inc
3LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71" 3LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
4 4
5SRC_URI += "file://installtests.patch" 5SRC_URI += "file://installtests.patch"
6SRC_URI[md5sum] = "7577ff36ec364d88fae466d4f7fc5fc6" 6
7SRC_URI[sha256sum] = "c0f06d68c3edba7a1ad937f5481a8c287efd4cd368cee66cd9e678b06a911c18" 7SRC_URI[md5sum] = "f53dc4c72109b17908e4113c3b8addfe"
8SRC_URI[sha256sum] = "51f99a815a18876977991bbc6f190607791d25a6e47a3269880ce7679dbd0e9f"
8 9
9PR = "r0" 10PR = "r0"