diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/distro/include/preferred-xorg-versions.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/drm/libdrm-2.4.23/installtests.patch | 43 | ||||
-rw-r--r-- | meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch | 49 | ||||
-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 fb21c2c1f..46fd104eb 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" PREFERRED_VERSION_xvinfo ?= "1.1.1" PREFERRED_VERSION_xwininfo ?= "1.1.1" PREFERRED_VERSION_mesa-dri ?= "7.10" -PREFERRED_VERSION_libdrm ?= "2.4.23" +PREFERRED_VERSION_libdrm ?= "2.4.25" PREFERRED_VERSION_xcb-proto ?= "1.6" PREFERRED_VERSION_libxcb ?= "1.7" PREFERRED_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 9d6a168bb..000000000 --- a/meta/recipes-graphics/drm/libdrm-2.4.23/installtests.patch +++ /dev/null @@ -1,43 +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 -@@ -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/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 000000000..2704ee6c6 --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch @@ -0,0 +1,49 @@ +tests: also install tests app + +Upstream-Status: Pending + +Signed-off-by: Yu Ke <ke.yu@intel.com> + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index bf1987f..d909e19 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -6,10 +6,11 @@ AM_CPPFLAGS = \ + + LDADD = $(top_builddir)/libdrm.la + +-check_PROGRAMS = \ ++bin_PROGRAMS = \ + dristat \ + drmstat + ++check_PROGRAMS = + SUBDIRS = modeprint + + if HAVE_LIBKMS +diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am +index c4862ac..7db76ea 100644 +--- a/tests/modeprint/Makefile.am ++++ b/tests/modeprint/Makefile.am +@@ -2,7 +2,7 @@ AM_CFLAGS = \ + -I$(top_srcdir)/include/drm \ + -I$(top_srcdir) + +-noinst_PROGRAMS = \ ++bin_PROGRAMS = \ + modeprint + + modeprint_SOURCES = \ +diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am +index 2191242..1d2c1b0 100644 +--- a/tests/modetest/Makefile.am ++++ b/tests/modetest/Makefile.am +@@ -4,7 +4,7 @@ AM_CFLAGS = \ + -I$(top_srcdir) \ + $(CAIRO_CFLAGS) + +-noinst_PROGRAMS = \ ++bin_PROGRAMS = \ + modetest + + 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 1546ceae6..177e444b4 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 LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71" SRC_URI += "file://installtests.patch" -SRC_URI[md5sum] = "7577ff36ec364d88fae466d4f7fc5fc6" -SRC_URI[sha256sum] = "c0f06d68c3edba7a1ad937f5481a8c287efd4cd368cee66cd9e678b06a911c18" + +SRC_URI[md5sum] = "f53dc4c72109b17908e4113c3b8addfe" +SRC_URI[sha256sum] = "51f99a815a18876977991bbc6f190607791d25a6e47a3269880ce7679dbd0e9f" PR = "r0" |