libdrm: port to Meson

Message ID 20180613115053.28394-1-ross.burton@intel.com
State Accepted
Commit 8dcebad54ded4fa9b3455b674be37ad0b10190d8
Headers show
Series
  • libdrm: port to Meson
Related show

Commit Message

Ross Burton June 13, 2018, 11:50 a.m.
Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 ...ac-Allow-explicit-enabling-of-cunit-tests.patch | 53 ----------------------
 .../recipes-graphics/drm/libdrm/installtests.patch | 25 ----------
 meta/recipes-graphics/drm/libdrm_2.4.92.bb         | 23 ++++------
 3 files changed, 9 insertions(+), 92 deletions(-)
 delete mode 100644 meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch
 delete mode 100644 meta/recipes-graphics/drm/libdrm/installtests.patch

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Richard Purdie June 16, 2018, 9:33 p.m. | #1
On Wed, 2018-06-13 at 12:50 +0100, Ross Burton wrote:
> Signed-off-by: Ross Burton <ross.burton@intel.com>

> ---

>  ...ac-Allow-explicit-enabling-of-cunit-tests.patch | 53 ------------

> ----------

>  .../recipes-graphics/drm/libdrm/installtests.patch | 25 ----------

>  meta/recipes-graphics/drm/libdrm_2.4.92.bb         | 23 ++++------

>  3 files changed, 9 insertions(+), 92 deletions(-)

>  delete mode 100644 meta/recipes-graphics/drm/libdrm/0001-

> configure.ac-Allow-explicit-enabling-of-cunit-tests.patch

>  delete mode 100644 meta/recipes-

> graphics/drm/libdrm/installtests.patch


Fails generally on x86[1] until you add:

EXTRA_OEMESON_append_x86 = " -Dintel=true"
EXTRA_OEMESON_append_x86-64 = " -Dintel=true"

since the arch detection in cross builds is obviously not quite
functioning correctly.

[1] https://autobuilder.yocto.io/builders/nightly-deb-non-deb/builds/1068/steps/BuildImages/logs/stdio

after the above 'fix', it still fails on musl:

https://autobuilder.yocto.io/builders/nightly-musl/builds/1095
https://autobuilder.yocto.io/builders/nightly-musl-x86-64/builds/541

Cheers,

Richard


-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ross Burton June 17, 2018, 1:23 p.m. | #2
Arch detection in Meson isn't quite there, for Mesa it fails to build
assembly bits because host != target (x86-64 != x86-64)...

Ross

On 16 June 2018 at 22:33,  <richard.purdie@linuxfoundation.org> wrote:
> On Wed, 2018-06-13 at 12:50 +0100, Ross Burton wrote:

>> Signed-off-by: Ross Burton <ross.burton@intel.com>

>> ---

>>  ...ac-Allow-explicit-enabling-of-cunit-tests.patch | 53 ------------

>> ----------

>>  .../recipes-graphics/drm/libdrm/installtests.patch | 25 ----------

>>  meta/recipes-graphics/drm/libdrm_2.4.92.bb         | 23 ++++------

>>  3 files changed, 9 insertions(+), 92 deletions(-)

>>  delete mode 100644 meta/recipes-graphics/drm/libdrm/0001-

>> configure.ac-Allow-explicit-enabling-of-cunit-tests.patch

>>  delete mode 100644 meta/recipes-

>> graphics/drm/libdrm/installtests.patch

>

> Fails generally on x86[1] until you add:

>

> EXTRA_OEMESON_append_x86 = " -Dintel=true"

> EXTRA_OEMESON_append_x86-64 = " -Dintel=true"

>

> since the arch detection in cross builds is obviously not quite

> functioning correctly.

>

> [1] https://autobuilder.yocto.io/builders/nightly-deb-non-deb/builds/1068/steps/BuildImages/logs/stdio

>

> after the above 'fix', it still fails on musl:

>

> https://autobuilder.yocto.io/builders/nightly-musl/builds/1095

> https://autobuilder.yocto.io/builders/nightly-musl-x86-64/builds/541

>

> Cheers,

>

> Richard

>

>

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch b/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch
deleted file mode 100644
index 40bebc0f50c..00000000000
--- a/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch
+++ /dev/null
@@ -1,53 +0,0 @@ 
-From e6bd4205b0b546afe991ae6f72256645f4404ad4 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Mon, 5 Sep 2016 14:41:37 +0300
-Subject: [PATCH libdrm] configure.ac: Allow explicit enabling of cunit tests
-
-Add --with-cunit to make it easier to do reproducible builds. Default
-is still to probe cunit and build opportunistically.
-
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Upstream-Status: Submitted [mailing list]
----
- configure.ac | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-Index: libdrm-2.4.91/configure.ac
-===================================================================
---- libdrm-2.4.91.orig/configure.ac
-+++ libdrm-2.4.91/configure.ac
-@@ -163,6 +163,12 @@ AC_ARG_ENABLE(install-test-programs,
- 		  [Install test programs (default: no)]),
- 		  [INSTALL_TESTS=$enableval], [INSTALL_TESTS=no])
- 
-+AC_ARG_WITH([cunit],
-+            [AS_HELP_STRING([--with-cunit],
-+                            [Build tests that use cunit (default: auto)])],
-+            [],
-+            [with_cunit=auto])
-+
- dnl ===========================================================================
- dnl check compiler flags
- AC_DEFUN([LIBDRM_CC_TRY_FLAG], [
-@@ -411,7 +417,7 @@ else
- 	AC_DEFINE(HAVE_RADEON, 0)
- fi
- 
--if test "x$AMDGPU" != xno; then
-+if test "x$with_cunit" != xno -a "x$AMDGPU" != xno; then
- 	# Detect cunit library
- 	PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
- 	# If pkg-config does not find cunit, check it using AC_CHECK_LIB.  We
-@@ -436,7 +442,11 @@ if test "x$AMDGPU" = xyes; then
- 	AC_DEFINE(HAVE_AMDGPU, 1, [Have amdgpu support])
- 
- 	if test "x$have_cunit" = "xno"; then
--		AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests])
-+		if test "x$with_cunit" = "xyes"; then
-+			AC_MSG_ERROR([Could not find cunit library but --with-cunit was given])
-+		elif test "x$with_cunit" = "xauto"; then
-+			AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests])
-+		fi
- 	fi
- else
- 	AC_DEFINE(HAVE_AMDGPU, 0)
diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch b/meta/recipes-graphics/drm/libdrm/installtests.patch
deleted file mode 100644
index ec1fb0236e4..00000000000
--- a/meta/recipes-graphics/drm/libdrm/installtests.patch
+++ /dev/null
@@ -1,25 +0,0 @@ 
-From 5c6eb43c2f6e7f2ee7c25c92e42f4e4403fa0527 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Tue, 21 Feb 2017 14:37:52 +0200
-Subject: [PATCH] tests: also install test apps
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
----
- tests/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 0355a92..b4882cd 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -45,3 +45,4 @@ TESTS = \
- check_PROGRAMS = \
- 	$(TESTS) \
- 	drmdevice
-+bin_PROGRAMS = $(check_PROGRAMS)
--- 
-2.1.4
-
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.92.bb b/meta/recipes-graphics/drm/libdrm_2.4.92.bb
index 2b3bf4f83d2..e77ac671e9d 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.92.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.92.bb
@@ -10,24 +10,19 @@  LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c5
 PROVIDES = "drm"
 DEPENDS = "libpthread-stubs libpciaccess"
 
-SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
-           file://installtests.patch \
-           file://0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch \
-          "
-
+SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2"
 SRC_URI[md5sum] = "f9b00d985f82d0be6ecc20c799acc89e"
 SRC_URI[sha256sum] = "e9e48fdb4de139dc4d9880aa1473158a16ff6aff63d14341367bd30a51ff39fa"
 
-inherit autotools pkgconfig manpages
+inherit meson pkgconfig manpages
+
+EXTRA_OEMESON = "-Dvalgrind=false \
+                 -Dcairo-tests=false \
+                 -Dinstall-test-programs=true \
+                 -Domap=true \
+                 -Detnaviv=true"
 
-EXTRA_OECONF += "--disable-cairo-tests \
-                 --without-cunit \
-                 --enable-omap-experimental-api \
-                 --enable-etnaviv-experimental-api \
-                 --enable-install-test-programs \
-                 --disable-valgrind \
-                "
-PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
+PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native"
 
 ALLOW_EMPTY_${PN}-drivers = "1"
 PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \