From 4855794c2c329bcd1b1642caf43cb48616d5e95d Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Wed, 29 Jun 2011 15:52:13 +0800 Subject: libdrm: upgrade to 2.4.26 Signed-off-by: Yu Ke --- .../drm/libdrm-2.4.25/installtests.patch | 49 ---------------------- meta/recipes-graphics/drm/libdrm.inc | 3 ++ .../recipes-graphics/drm/libdrm/installtests.patch | 49 ++++++++++++++++++++++ meta/recipes-graphics/drm/libdrm_2.4.25.bb | 10 ----- meta/recipes-graphics/drm/libdrm_2.4.26.bb | 10 +++++ 5 files changed, 62 insertions(+), 59 deletions(-) delete mode 100644 meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch create mode 100644 meta/recipes-graphics/drm/libdrm/installtests.patch delete mode 100644 meta/recipes-graphics/drm/libdrm_2.4.25.bb create mode 100644 meta/recipes-graphics/drm/libdrm_2.4.26.bb (limited to 'meta/recipes-graphics/drm') diff --git a/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch b/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch deleted file mode 100644 index 1f39719a07..0000000000 --- a/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch +++ /dev/null @@ -1,49 +0,0 @@ -tests: also install tests app - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Yu Ke - -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.inc b/meta/recipes-graphics/drm/libdrm.inc index a66afad803..1ad9dc3c57 100644 --- a/meta/recipes-graphics/drm/libdrm.inc +++ b/meta/recipes-graphics/drm/libdrm.inc @@ -10,6 +10,9 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" PROVIDES = "drm" DEPENDS = "libpthread-stubs udev cairo virtual/libx11" +#libpciaccess is required starting from libdrm 2.4.26 +DEPENDS += " libpciaccess" + inherit autotools pkgconfig PACKAGES =+ "libdrm-tests" diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch b/meta/recipes-graphics/drm/libdrm/installtests.patch new file mode 100644 index 0000000000..1f39719a07 --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm/installtests.patch @@ -0,0 +1,49 @@ +tests: also install tests app + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Yu Ke + +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.25.bb b/meta/recipes-graphics/drm/libdrm_2.4.25.bb deleted file mode 100644 index 177e444b41..0000000000 --- a/meta/recipes-graphics/drm/libdrm_2.4.25.bb +++ /dev/null @@ -1,10 +0,0 @@ -require libdrm.inc - -LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71" - -SRC_URI += "file://installtests.patch" - -SRC_URI[md5sum] = "f53dc4c72109b17908e4113c3b8addfe" -SRC_URI[sha256sum] = "51f99a815a18876977991bbc6f190607791d25a6e47a3269880ce7679dbd0e9f" - -PR = "r0" diff --git a/meta/recipes-graphics/drm/libdrm_2.4.26.bb b/meta/recipes-graphics/drm/libdrm_2.4.26.bb new file mode 100644 index 0000000000..e5aa6a4814 --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm_2.4.26.bb @@ -0,0 +1,10 @@ +require libdrm.inc + +LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71" + +SRC_URI += "file://installtests.patch" + +SRC_URI[md5sum] = "062569426773f69b11a47a7712bba770" +SRC_URI[sha256sum] = "b25b06ab5a077736044cbd9a3a05a9a23b873a0887ab1aaf93aa2b3218b2d3dc" + +PR = "r0" -- cgit 1.2.3-korg