* difference to oe-core version is different packaging and glamo/uclibc patches
Signed-off-by: Martin Jansa <[email protected]> --- .../drm/libdrm-2.4.24/installtests.patch | 43 ----------------- .../{libdrm-2.4.24 => libdrm-2.4.25}/glamo.patch | 0 .../drm/libdrm-2.4.25/installtests.patch | 49 ++++++++++++++++++++ .../drm/{libdrm_2.4.24.bb => libdrm_2.4.25.bb} | 6 +-- 4 files changed, 51 insertions(+), 47 deletions(-) delete mode 100644 meta-oe/recipes-graphics/drm/libdrm-2.4.24/installtests.patch rename meta-oe/recipes-graphics/drm/{libdrm-2.4.24 => libdrm-2.4.25}/glamo.patch (100%) create mode 100644 meta-oe/recipes-graphics/drm/libdrm-2.4.25/installtests.patch rename meta-oe/recipes-graphics/drm/{libdrm_2.4.24.bb => libdrm_2.4.25.bb} (91%) diff --git a/meta-oe/recipes-graphics/drm/libdrm-2.4.24/installtests.patch b/meta-oe/recipes-graphics/drm/libdrm-2.4.24/installtests.patch deleted file mode 100644 index 9d6a168..0000000 --- a/meta-oe/recipes-graphics/drm/libdrm-2.4.24/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-oe/recipes-graphics/drm/libdrm-2.4.24/glamo.patch b/meta-oe/recipes-graphics/drm/libdrm-2.4.25/glamo.patch similarity index 100% rename from meta-oe/recipes-graphics/drm/libdrm-2.4.24/glamo.patch rename to meta-oe/recipes-graphics/drm/libdrm-2.4.25/glamo.patch diff --git a/meta-oe/recipes-graphics/drm/libdrm-2.4.25/installtests.patch b/meta-oe/recipes-graphics/drm/libdrm-2.4.25/installtests.patch new file mode 100644 index 0000000..2704ee6 --- /dev/null +++ b/meta-oe/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 <[email protected]> + +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-oe/recipes-graphics/drm/libdrm_2.4.24.bb b/meta-oe/recipes-graphics/drm/libdrm_2.4.25.bb similarity index 91% rename from meta-oe/recipes-graphics/drm/libdrm_2.4.24.bb rename to meta-oe/recipes-graphics/drm/libdrm_2.4.25.bb index 0a2365e..4ffdcac 100644 --- a/meta-oe/recipes-graphics/drm/libdrm_2.4.24.bb +++ b/meta-oe/recipes-graphics/drm/libdrm_2.4.25.bb @@ -24,13 +24,11 @@ LEAD_SONAME = "libdrm.so" EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '', '--disable-intel --disable-radeon',d)}" EXTRA_OECONF_append_shr = " --enable-glamo-experimental-api" -PR = "r8" - SRC_URI += "file://installtests.patch" SRC_URI += "file://glamo.patch" -SRC_URI[md5sum] = "8d802bf3b368f9fac0d7d17516a9436f" -SRC_URI[sha256sum] = "c7012381f64458af9f291d913309448aac7dd23a28dc86c6970e4bf38effb6a5" +SRC_URI[md5sum] = "f53dc4c72109b17908e4113c3b8addfe" +SRC_URI[sha256sum] = "51f99a815a18876977991bbc6f190607791d25a6e47a3269880ce7679dbd0e9f" do_compile_prepend_libc-uclibc() { eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "/_FILE_OFFSET_BITS/d" ${S}/libkms/intel.c', d)}" -- 1.7.5.rc1 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
