libdrm: upgrade to 2.4.25

* difference to oe-core version is different packaging and glamo/uclibc patches

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2011-04-18 11:37:02 +02:00
parent 876a9efdf8
commit fc04fe74ed
4 changed files with 51 additions and 47 deletions
@@ -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 = \
@@ -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 = \
@@ -24,13 +24,11 @@ LEAD_SONAME = "libdrm.so"
EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '', '--disable-intel --disable-radeon',d)}" EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '', '--disable-intel --disable-radeon',d)}"
EXTRA_OECONF_append_shr = " --enable-glamo-experimental-api" EXTRA_OECONF_append_shr = " --enable-glamo-experimental-api"
PR = "r8"
SRC_URI += "file://installtests.patch" SRC_URI += "file://installtests.patch"
SRC_URI += "file://glamo.patch" SRC_URI += "file://glamo.patch"
SRC_URI[md5sum] = "8d802bf3b368f9fac0d7d17516a9436f" SRC_URI[md5sum] = "f53dc4c72109b17908e4113c3b8addfe"
SRC_URI[sha256sum] = "c7012381f64458af9f291d913309448aac7dd23a28dc86c6970e4bf38effb6a5" SRC_URI[sha256sum] = "51f99a815a18876977991bbc6f190607791d25a6e47a3269880ce7679dbd0e9f"
do_compile_prepend_libc-uclibc() { do_compile_prepend_libc-uclibc() {
eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "/_FILE_OFFSET_BITS/d" ${S}/libkms/intel.c', d)}" eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "/_FILE_OFFSET_BITS/d" ${S}/libkms/intel.c', d)}"