diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-05-10 16:23:33 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-12 09:37:32 +0100 |
commit | 4cda8d767cc2add46dd8192b58ddc9def735c584 (patch) | |
tree | bb849806f65d4b9d4aab34d3be71bdfe64045d02 | |
parent | 64919232b48d1ced08fe2f14f019a7de2f888a2a (diff) | |
download | poky-4cda8d767cc2add46dd8192b58ddc9def735c584.tar.gz |
libdrm: upgrade to 2.4.44
Removed part of the installtests.patch since tests can now be installed
giving an option to configure script.
(From OE-Core rev: 563edb321594b007cae2294e807235ad22fd27da)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/drm/libdrm.inc | 1 | ||||
-rw-r--r-- | meta/recipes-graphics/drm/libdrm/installtests.patch | 26 | ||||
-rw-r--r-- | meta/recipes-graphics/drm/libdrm_2.4.42.bb | 10 | ||||
-rw-r--r-- | meta/recipes-graphics/drm/libdrm_2.4.44.bb | 8 |
4 files changed, 9 insertions, 36 deletions
diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc index 9c1124e181..e395e0324a 100644 --- a/meta/recipes-graphics/drm/libdrm.inc +++ b/meta/recipes-graphics/drm/libdrm.inc | |||
@@ -20,6 +20,7 @@ inherit autotools pkgconfig | |||
20 | 20 | ||
21 | EXTRA_OECONF += "--disable-cairo-tests \ | 21 | EXTRA_OECONF += "--disable-cairo-tests \ |
22 | --enable-omap-experimental-api \ | 22 | --enable-omap-experimental-api \ |
23 | --enable-install-test-programs \ | ||
23 | " | 24 | " |
24 | ALLOW_EMPTY_${PN}-drivers = "1" | 25 | ALLOW_EMPTY_${PN}-drivers = "1" |
25 | PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ | 26 | PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ |
diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch b/meta/recipes-graphics/drm/libdrm/installtests.patch index 1f39719a07..7d443af663 100644 --- a/meta/recipes-graphics/drm/libdrm/installtests.patch +++ b/meta/recipes-graphics/drm/libdrm/installtests.patch | |||
@@ -21,29 +21,3 @@ index bf1987f..d909e19 100644 | |||
21 | SUBDIRS = modeprint | 21 | SUBDIRS = modeprint |
22 | 22 | ||
23 | if HAVE_LIBKMS | 23 | if HAVE_LIBKMS |
24 | diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am | ||
25 | index 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 = \ | ||
37 | diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am | ||
38 | index 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.42.bb b/meta/recipes-graphics/drm/libdrm_2.4.42.bb deleted file mode 100644 index 67ae2e6b48..0000000000 --- a/meta/recipes-graphics/drm/libdrm_2.4.42.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | require libdrm.inc | ||
2 | |||
3 | PR = "${INC_PR}.0" | ||
4 | |||
5 | SRC_URI += "file://installtests.patch \ | ||
6 | file://GNU_SOURCE_definition.patch \ | ||
7 | " | ||
8 | |||
9 | SRC_URI[md5sum] = "a6e2e26951bcc920b2049b65e86a659f" | ||
10 | SRC_URI[sha256sum] = "e0671082a77871c8474d3c0f09dbf5ff82d2429cd248088a691f7b484cbc76e1" | ||
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.44.bb b/meta/recipes-graphics/drm/libdrm_2.4.44.bb new file mode 100644 index 0000000000..b01695848e --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm_2.4.44.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | require libdrm.inc | ||
2 | |||
3 | SRC_URI += "file://installtests.patch \ | ||
4 | file://GNU_SOURCE_definition.patch \ | ||
5 | " | ||
6 | SRC_URI[md5sum] = "b760b1f2ae4ec6452383164ec697cd5d" | ||
7 | SRC_URI[sha256sum] = "42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2" | ||
8 | |||