From 41111d4ff54bcbc2111239944c44c789890ddcb4 Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Tue, 16 Nov 2010 14:39:13 +0800 Subject: libdrm: upgrade from 2.4.21 to 2.4.22 Signed-off-by: Yu Ke --- .../distro/include/preferred-xorg-versions.inc | 2 +- .../drm/libdrm-2.4.21/installtests.patch | 43 ---------------------- .../drm/libdrm-2.4.22/installtests.patch | 43 ++++++++++++++++++++++ meta/recipes-graphics/drm/libdrm_2.4.21.bb | 4 -- meta/recipes-graphics/drm/libdrm_2.4.22.bb | 7 ++++ 5 files changed, 51 insertions(+), 48 deletions(-) delete mode 100644 meta/recipes-graphics/drm/libdrm-2.4.21/installtests.patch create mode 100644 meta/recipes-graphics/drm/libdrm-2.4.22/installtests.patch delete mode 100644 meta/recipes-graphics/drm/libdrm_2.4.21.bb create mode 100644 meta/recipes-graphics/drm/libdrm_2.4.22.bb diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 56ae237..3dee7d5 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -137,7 +137,7 @@ PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.5" PREFERRED_VERSION_xvinfo ?= "1.0.2" PREFERRED_VERSION_xwininfo ?= "1.1.0" PREFERRED_VERSION_mesa-dri ?= "7.8.2" -PREFERRED_VERSION_libdrm ?= "2.4.21" +PREFERRED_VERSION_libdrm ?= "2.4.22" PREFERRED_VERSION_xcb-proto ?= "1.6" PREFERRED_VERSION_libxcb ?= "1.6" PREFERRED_VERSION_libxcb-nativesdk ?= "1.6" diff --git a/meta/recipes-graphics/drm/libdrm-2.4.21/installtests.patch b/meta/recipes-graphics/drm/libdrm-2.4.21/installtests.patch deleted file mode 100644 index 9d6a168..0000000 --- a/meta/recipes-graphics/drm/libdrm-2.4.21/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.22/installtests.patch b/meta/recipes-graphics/drm/libdrm-2.4.22/installtests.patch new file mode 100644 index 0000000..9d6a168 --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm-2.4.22/installtests.patch @@ -0,0 +1,43 @@ +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.21.bb b/meta/recipes-graphics/drm/libdrm_2.4.21.bb deleted file mode 100644 index 97ca069..0000000 --- a/meta/recipes-graphics/drm/libdrm_2.4.21.bb +++ /dev/null @@ -1,4 +0,0 @@ -require libdrm.inc - -SRC_URI += "file://installtests.patch" -PR = "r0" diff --git a/meta/recipes-graphics/drm/libdrm_2.4.22.bb b/meta/recipes-graphics/drm/libdrm_2.4.22.bb new file mode 100644 index 0000000..e0c0f01 --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm_2.4.22.bb @@ -0,0 +1,7 @@ +require libdrm.inc + +SRC_URI += "file://installtests.patch" +SRC_URI[md5sum] = "3bdfa33f35d1c902e5115cceb5500c83" +SRC_URI[sha256sum] = "0bb0e594e4094d9000d80f38e96e8f640b6364f96cfef5b970cf4481443c6b3d" + +PR = "r0" -- cgit v1.1