From unknown Sat Jun 14 03:56:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#34824] [PATCH staging] libdrm/Mesa Meson patch series Resent-From: Rutger Helling Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Mar 2019 13:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34824@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155239746531629 (code B ref -1); Tue, 12 Mar 2019 13:32:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Mar 2019 13:31:05 +0000 Received: from localhost ([127.0.0.1]:39853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h3hUn-0008E4-5d for submit@debbugs.gnu.org; Tue, 12 Mar 2019 09:31:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41077) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h3hUj-0008DX-FW for submit@debbugs.gnu.org; Tue, 12 Mar 2019 09:31:03 -0400 Received: from lists.gnu.org ([209.51.188.17]:33972) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h3hUc-00009L-5R for submit@debbugs.gnu.org; Tue, 12 Mar 2019 09:30:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3hUZ-00035N-Hl for guix-patches@gnu.org; Tue, 12 Mar 2019 09:30:53 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3hGg-0008Rd-Q3 for guix-patches@gnu.org; Tue, 12 Mar 2019 09:16:32 -0400 Received: from mx.kolabnow.com ([95.128.36.42]:33642) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3hGe-0008Ne-BO for guix-patches@gnu.org; Tue, 12 Mar 2019 09:16:29 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out001.mykolab.com (Postfix) with ESMTP id 1B84029C for ; Tue, 12 Mar 2019 14:16:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:message-id:subject :subject:from:from:date:date:received:received:received; s= dkim20160331; t=1552396580; x=1554210981; bh=VcP194Axv9WNFpP173w NiX9JHRhsjIOtTJyKnVNheH0=; b=Svtw9LLbC2SteGtzInh7vjuvDsSWc8xzFHC o+busb68NCwNdklYerPW5CgJ3De72fpwmuAZe1PqPgdXm21rqe32qTaKdLnImSB+ l7yW7cOYjgsQq6JaYuC0UQTSYf0yomV00oZ2xD98IdflwpNukfrHqHS/qCFd6SQb WxNu0qg56s5+y+6D7AXMggJ5+WM+STF4hBxMUjkYmSVJfOjFf/f9G2jU4/C63Q6F b3RpaAZ6xiCX0xD8kpVh3DVLc5Y2I2/WkCCp+SVDWs+xKpkZPdj8azJ3j17RC6OV 835CNSgjy8JmJPkxJA8kWVrGtyOqSBXu7/3tPoVUJ7tvY/djGQhwlfFbFBX1/2mO g98TnebWgMlu31ofweN/bxZCNrK017V+4ZXJv+we40bhTwJn2aInvgT3xQmxjJLJ pq7KKI2XD+H84o0fmXb4IHYQKqZKK3IQT9XM8QTMIINrqNymwiRkTN1e9XjExDO+ d0IcUc0L2hXHeNIj6Szo2YDErOjPg0ucYJenO3+Rua78WGdcQz+3KqJtCNvBGulM iSHaE0WJwLpNCXQCd7i7B2bEDfkFxHYKyXD5W1NIUNzAVBOB9rwzPcd5z5gLRnoT LqfWxJ1mVEp9Wg8XEAj7nEwY1UFeKl/X94o6XmvEP+Okt+1QpWYuFrrXeKBBPar1 ElsYTue8= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jX3Uf6woTwNT for ; Tue, 12 Mar 2019 14:16:20 +0100 (CET) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by ext-mx-out001.mykolab.com (Postfix) with ESMTPS id 33638DA2 for ; Tue, 12 Mar 2019 14:16:20 +0100 (CET) Received: from ext-subm002.mykolab.com (unknown [10.9.6.2]) by int-mx002.mykolab.com (Postfix) with ESMTPS id 1A2972464 for ; Tue, 12 Mar 2019 14:16:20 +0100 (CET) Date: Tue, 12 Mar 2019 14:16:15 +0100 From: Rutger Helling Message-ID: <20190312141615.2d96bb7d@mykolab.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/.db9P1op.y1Ac.5c3+3Q.pK"; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 95.128.36.42 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --Sig_/.db9P1op.y1Ac.5c3+3Q.pK Content-Type: multipart/mixed; boundary="MP_/77Ucc3tmY2U1fHFqtKYXnnd" --MP_/77Ucc3tmY2U1fHFqtKYXnnd Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hey Guix, this patch series changes libdrm and Mesa to use Meson. A few notes to go along with the patches: Patch #1: Libdrm on Github mentions that Autotools is the legacy build system for libdrm, so it seems better to change this to use Meson. Patch #2: Mesa is gonna drop support for Autotools entirely at some point in 2019, so it seems good to make the switch sooner rather than later. I think I converted all the configure flags to the new format. Patches #3-6: For some reason these packages now need an explicit mesa input. I haven't run into other packages that have this problem yet. --MP_/77Ucc3tmY2U1fHFqtKYXnnd Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-libdrm-Switch-to-meson-build-system.patch =46rom e87f54563723c5dd8fd3fdcc0ce1772fa4c28284 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 12 Mar 2019 12:16:38 +0100 Subject: [PATCH] gnu: libdrm: Switch to meson-build-system. * gnu/packages/xdisorg.scm (libdrm)[build-system]: Switch to meson-build-system. [arguments]: Adjust arguments to Meson. --- gnu/packages/xdisorg.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index ed801d623..2cb8f3b13 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -391,20 +391,20 @@ rasterisation.") (base32 "08yimlp6jir1rs5ajgdx74xa5qdzcqahpdzdk0rmkmhh7vdcrl3p")) (patches (search-patches "libdrm-symbol-check.patch")))) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments `(#:configure-flags '(,@(match (%current-system) ("armhf-linux" - '("--enable-exynos-experimental-api" - "--enable-omap-experimental-api" - "--enable-etnaviv-experimental-api" - "--enable-tegra-experimental-api" - "--enable-freedreno-kgsl")) - ("aarch64-linux" - '("--enable-tegra-experimental-api" - "--enable-etnaviv-experimental-api" - "--enable-freedreno-kgsl")) + '("-Dexynos-experimental-api=3Dtrue" + "-Domap-experimental-api=3Dtrue" + "-Detnaviv-experimental-api=3Dtrue" + "-Dtegra-experimental-api=3Dtrue" + "-Dfreedreno-kgsl=3Dtrue")) + ("aarch64-linux=3Dtrue" + '("-Dtegra-experimental-api=3Dtrue" + "-Detnaviv-experimental-api=3Dtrue" + "-Dfreedreno-kgsl=3Dtrue")) (_ '()))))) (inputs `(("libpciaccess" ,libpciaccess))) --=20 2.21.0 --MP_/77Ucc3tmY2U1fHFqtKYXnnd Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-gnu-mesa-Switch-to-meson-build-system.patch =46rom d164ccb0220756444dcc46675ede0f706255d076 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 12 Mar 2019 14:05:09 +0100 Subject: [PATCH] gnu: mesa: Switch to meson-build-system. * gnu/packages/gl.scm (mesa)[build-system]: Switch to meson-build-system. [native-inputs]: Add "bison", "flex" and "gettext-minimal". [arguments]: Adjust arguments to Meson. --- gnu/packages/gl.scm | 46 ++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c3cb9cab2..daa5f54d7 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") "01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) - (build-system gnu-build-system) + (build-system meson-build-system) (propagated-inputs `(;; The following are in the Requires.private field of gl.pc. ("libdrm" ,libdrm) @@ -264,7 +264,10 @@ also known as DXTn or DXTC) for Mesa.") ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("bison" ,bison) + ("flex" ,flex) + ("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) ("python" ,python) ("python-mako" ,python-mako) ("which" ,(@ (gnu packages base) which)))) @@ -273,47 +276,48 @@ also known as DXTn or DXTC) for Mesa.") '(,@(match (%current-system) ((or "armhf-linux" "aarch64-linux") ;; TODO: Fix svga driver for aarch64 and armhf. - '("--with-gallium-drivers=3Detnaviv,freedreno,imx,nouveau,pl= 111,r300,r600,swrast,tegra,v3d,vc4,virgl")) + '("-Dgallium-drivers=3Detnaviv,freedreno,imx,nouveau,pl111,r= 300,r600,swrast,tegra,v3d,vc4,virgl")) (_ - '("--with-gallium-drivers=3Di915,nouveau,r300,r600,radeonsi,= svga,swrast,virgl"))) + '("-Dgallium-drivers=3Dnouveau,r300,r600,radeonsi,svga,swras= t,virgl"))) ;; Enable various optional features. TODO: opencl requires libcl= c, ;; omx requires libomxil-bellagio - "--with-platforms=3Dx11,drm,surfaceless,wayland" - "--enable-glx-tls" ;Thread Local Storage, improves perform= ance - ;; "--enable-opencl" - ;; "--enable-omx" - "--enable-osmesa" - "--enable-xa" + "-Dplatforms=3Dx11,drm,surfaceless,wayland" + "-Dglx=3Ddri" ;Thread Local Storage, improves performance + ;; "-Dopencl=3Dtrue" + ;; "-Domx=3Dtrue" + "-Dosmesa=3Dgallium" + "-Dgallium-xa=3Dtrue" + ;; features required by wayland - "--enable-gles2" - "--enable-gbm" - "--enable-shared-glapi" + "-Dgles2=3Dtrue" + "-Dgbm=3Dtrue" + "-Dshared-glapi=3Dtrue" =20 ;; Enable Vulkan on i686-linux and x86-64-linux. ,@(match (%current-system) ("x86_64-linux" - '("--with-vulkan-drivers=3Dintel,radeon")) + '("-Dvulkan-drivers=3Dintel,amd")) ;; TODO: Fix intel driver on i686-linux. ("i686-linux" - '("--with-vulkan-drivers=3Dradeon")) + '("-Dvulkan-drivers=3Damd")) (_ '(""))) =20 ;; Also enable the tests. - "--enable-gallium-tests" + "-Dbuild-tests=3Dtrue" =20 ;; on non-intel systems, drop i915 and i965 ;; from the default dri drivers ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - '("--with-dri-drivers=3Di915,i965,nouveau,r200,radeon,swrast" - "--enable-llvm")) ; default is x86/x86_64 only + '("-Ddri-drivers=3Di915,i965,nouveau,r200,r100" + "-Dllvm=3Dtrue")) ; default is x86/x86_64 only (_ - '("--with-dri-drivers=3Dnouveau,r200,radeon,swrast")))) + '("-Ddri-drivers=3Dnouveau,r200,r100")))) #:modules ((ice-9 match) (srfi srfi-1) (guix build utils) - (guix build gnu-build-system)) + (guix build meson-build-system)) #:phases (modify-phases %standard-phases (add-after @@ -323,7 +327,7 @@ also known as DXTn or DXTC) for Mesa.") (("/usr/bin/env python2") (which "python"))) #t)) (add-before - 'build 'fix-dlopen-libnames + 'configure 'fix-dlopen-libnames (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) ;; Remain agnostic to .so.X.Y.Z versions while doing --=20 2.21.0 --MP_/77Ucc3tmY2U1fHFqtKYXnnd Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0003-gnu-libsmpeg-Add-mesa-input.patch =46rom 5c69bc199728d3928d65f5fd6ba2b2ba659193fb Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 12 Mar 2019 12:52:34 +0100 Subject: [PATCH 1/4] gnu: libsmpeg: Add mesa input. * gnu/packages/video.scm (libsmpeg)[inputs]: Add "mesa". --- gnu/packages/video.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e9f5aa751..7eb225a61 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2421,7 +2421,8 @@ Other features include a live preview and live stream= ing.") `(("autoconf" ,autoconf) ("automake" ,automake))) (inputs - `(("sdl" ,sdl2))) + `(("mesa" ,mesa) + ("sdl" ,sdl2))) (home-page "http://icculus.org/smpeg/") (synopsis "SDL MPEG decoding library") (description --=20 2.21.0 --MP_/77Ucc3tmY2U1fHFqtKYXnnd Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0004-gnu-sdl-image-Add-mesa-input.patch =46rom d38cf8a83e2e649f92e5c2259ba5b7ed4ae9c4d3 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 12 Mar 2019 12:53:48 +0100 Subject: [PATCH 2/4] gnu: sdl-image: Add mesa input. * gnu/packages/sdl.scm (sdl-image)[inputs]: Add "mesa". --- gnu/packages/sdl.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 8d2a02437..6d1cdba5f 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -214,6 +214,7 @@ other supporting functions for SDL.") "--disable-tif-shared" "--disable-webp-shared"))) (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa))) ;; libjpeg, libpng, and libtiff are propagated inputs because the ;; SDL_image headers include the headers of these libraries. SDL is a ;; propagated input because the pkg-config file refers to SDL's pkg-co= nfig --=20 2.21.0 --MP_/77Ucc3tmY2U1fHFqtKYXnnd Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0005-gnu-sdl-mixer-Add-mesa-input.patch =46rom 0dac26ad22330302b0068788bab8d0a4180491f8 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 12 Mar 2019 12:54:39 +0100 Subject: [PATCH 3/4] gnu: sdl-mixer: Add mesa input. * gnu/packages/sdl.scm (sdl-mixer)[inputs]: Add "mesa". --- gnu/packages/sdl.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 6d1cdba5f..634b77648 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -259,7 +259,8 @@ WEBP, XCF, XPM, and XV.") ("libflac" ,flac) ("libmad" ,libmad) ("libmikmod" ,libmikmod) - ("libmodplug" ,libmodplug))) + ("libmodplug" ,libmodplug) + ("mesa" ,mesa))) ;; FIXME: Add libfluidsynth (propagated-inputs `(("sdl" ,sdl))) (synopsis "SDL multi-channel audio mixer library") --=20 2.21.0 --MP_/77Ucc3tmY2U1fHFqtKYXnnd Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0006-gnu-sdl-net-Add-mesa-input.patch =46rom fd059a1b42a5ba4b21ffe996d65159fa93736bee Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 12 Mar 2019 12:55:25 +0100 Subject: [PATCH 4/4] gnu: sdl-net: Add mesa input. * gnu/packages/sdl.scm (sdl-net)[inputs]: Add "mesa". --- gnu/packages/sdl.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 634b77648..0c4a5bee1 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -286,6 +286,7 @@ MIDI, Ogg Vorbis, and MP3.") (build-system gnu-build-system) (propagated-inputs `(("sdl" ,sdl))) (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa))) (outputs '("out" "debug")) (synopsis "SDL networking library") (description "SDL_net is a small, cross-platform networking library for --=20 2.21.0 --MP_/77Ucc3tmY2U1fHFqtKYXnnd-- --Sig_/.db9P1op.y1Ac.5c3+3Q.pK Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlyHsR8ACgkQ86cn20T8 yjauywf/T5xzUrEXlMXUvMSP+PG3/XMyguw+unMAnQlXTZfy09UPnx8OnRwv6mYO OAcwwhvXtqXjJsbcRYxKsOQwtOtuvYVJbzf9nYrdnOAcxcFodikq3dmbHRsTL+D7 rHlURORTd/ef57syqtjVXFvPpKJN3sSzXVqPmKeBninWIWpj4Nxpy6XNCNPuRjUH JAmrb5O/pxW4LnYJ9kxcs0dFEmnmKv9HgHKavmAQ+qOJLjcMhdKRFhl7DnlQxOGD BM1287EI7tSZ/QzHWrEDWIKN3jA3ntJafvn+Np1dsCP3bA0mR1Srkdy4QQ10kSgF M//8qsm9sVHarutpje4yr3SsNZiu9w== =EMbj -----END PGP SIGNATURE----- --Sig_/.db9P1op.y1Ac.5c3+3Q.pK-- From unknown Sat Jun 14 03:56:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#34824] [PATCH staging] libdrm/Mesa Meson patch series Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Mar 2019 18:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Rutger Helling , 34824@debbugs.gnu.org Received: via spool by 34824-submit@debbugs.gnu.org id=B34824.155284573027810 (code B ref 34824); Sun, 17 Mar 2019 18:03:01 +0000 Received: (at 34824) by debbugs.gnu.org; 17 Mar 2019 18:02:10 +0000 Received: from localhost ([127.0.0.1]:47725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5a6s-0007ET-3G for submit@debbugs.gnu.org; Sun, 17 Mar 2019 14:02:10 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:45851) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5a6q-0007ED-7U for 34824@debbugs.gnu.org; Sun, 17 Mar 2019 14:02:08 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id AB03D210DC; Sun, 17 Mar 2019 14:02:02 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 17 Mar 2019 14:02:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=aN5rE8OC022NyPe3O8POEFDyn0 DqlXLXFelIcYksRxw=; b=3MxDUMt9p3nPZlwCffEg5Jqu8W0248I6lX/IJ5J9pN Zyxp/hmJVcVnagCksqRA9kXP0XlTfMNRa5MYPKG1W2nLnJrwykPWYFDWJh/DmkNt JKvdF+Gs8uTsEp36j+SmEoXXICfrO74xEVI2/tWjX/rOonPBBSXBbrwey9tOEzau 10EopHlsSzVIpU8mCfmXV1YwK1mVjpCKmgYO/KixPn68wyIjMS0+kiz9UOjcxuLT 9yHRJN2E9mCMPjYwQz4vCXsdKuAH+hlnoe5nhi9clQ/psLZ3qgENdlYhnuBaEjyw D0DevNxTSaYDAzzC07FeKdVPkQQaXain9XqLCBFhL3SA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=aN5rE8 OC022NyPe3O8POEFDyn0DqlXLXFelIcYksRxw=; b=eRfeWqnTK8pwn+T70OZbUc 1VEsvRbhx8aepeuZ9T9NKA8u5E1l6ptFmAxnqOruF/rODni8DMjbgfIv6N89PAjz c7h7vbpVzMYIDEBsWnCDh1BD/DmXGD7MOKEIugBQQBwRJNuzeck+vg+X0uC7tM/K YM41HdrKLxq/gFCY0dsyc7IELtSGf68iHpv1riDC9ppNHxCYelpOqAvFd/WMwqtF SLovz8oEYftwBu6SR6O0TI8AEE7lRwDIE5oyFZGef/JnEKYFxc+RsX90Q82QmLMk Ezbeh18q4Sue55B0TCj/fJd7TqSGTRPTLVUdnVR/PrpveT09+g2T7Zf7fQR74lAw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrheelgdduuddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhgffffkgggtsehgtderredtredtnecuhfhrohhmpeforghrihhu shcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucfkphepie dvrdduiedrvddviedrudegtdenucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgv sehfrghsthhmrghilhdrtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id A1DF910311; Sun, 17 Mar 2019 14:02:01 -0400 (EDT) From: Marius Bakke In-Reply-To: <20190312141615.2d96bb7d@mykolab.com> References: <20190312141615.2d96bb7d@mykolab.com> User-Agent: Notmuch/0.28.2 (https://notmuchmail.org) Emacs/26.1 (x86_64-pc-linux-gnu) Date: Sun, 17 Mar 2019 19:01:59 +0100 Message-ID: <87y35d8jmw.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Rutger Helling writes: > Hey Guix, > > this patch series changes libdrm and Mesa to use Meson. > > A few notes to go along with the patches: > > Patch #1: Libdrm on Github mentions that Autotools is the legacy build > system for libdrm, so it seems better to change this to use Meson. > Patch #2: Mesa is gonna drop support for Autotools entirely at some > point in 2019, so it seems good to make the switch sooner rather than > later. I think I converted all the configure flags to the new format. > Patches #3-6: For some reason these packages now need an explicit mesa > input. I haven't run into other packages that have this problem yet. The first two patches LGTM, but we should figure out why some packages need special attention and squash the fixes with the Mesa (or libdrm) change. I see the other packages are SDL-related, maybe the libSDL pkg-config files are different after this change? Or "sdl-config" prints something weird? Thanks for looking after these packages :-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlyOi5cACgkQoqBt8qM6 VPrnpAf+MDmBDTJkTU1ZRmATbMUludQPfBR5eQtMX6QPBQeuibxPnqUEseo+/Za5 Rm9yclwT6AFbMtlT+JezcYlSYuySJ90kTbPN34iHoeqELM91RozMn3fBxxxT6vnE J2X0ASEatyzV4Xz669u9NuW6kFuuzv3JxQd7DpA8IfAc2G21xT0ObmOy1q7Z09xY ona5IbV1ql9PhOcNE4H89qBsYAGEkFmXGsd4/T2fMxliItxwjOhC10X7vtDTyQhC dwsl5C7vjD8orz6YgUdxq0SNE5uU9jW+R1fBX5SOQup6VNcseOrS8lnQbm9CwD0u BJekaXQm0inKI1woYZF/y6ZLC7mh5A== =Lccv -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Jun 14 03:56:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#34824] [PATCH staging] libdrm/Mesa Meson patch series Resent-From: Rutger Helling Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Mar 2019 09:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: 34824@debbugs.gnu.org Received: via spool by 34824-submit@debbugs.gnu.org id=B34824.155290229522643 (code B ref 34824); Mon, 18 Mar 2019 09:45:02 +0000 Received: (at 34824) by debbugs.gnu.org; 18 Mar 2019 09:44:55 +0000 Received: from localhost ([127.0.0.1]:48111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5opC-0005t9-PV for submit@debbugs.gnu.org; Mon, 18 Mar 2019 05:44:55 -0400 Received: from mx.kolabnow.com ([95.128.36.40]:37698) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5opA-0005su-Fa for 34824@debbugs.gnu.org; Mon, 18 Mar 2019 05:44:53 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out003.mykolab.com (Postfix) with ESMTP id E7AD6403BE; Mon, 18 Mar 2019 10:44:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:references:in-reply-to :message-id:subject:subject:from:from:date:date:received :received:received; s=dkim20160331; t=1552902285; x=1554716686; bh=c9VR1vfINBhtBO/7IzsL2KARP6B/9pnG64hM1CITOsw=; b=ghERNPJu2nq9 UF1mw8+fbNoQZJi6fl+0ZWQLnyMsLke+nth5VZShQ+ZiaWf/F6837hhgG8JQMZcp 8v8qBMtOisbYZo/H5yENWCogiZDYYcXXUDyMwC0jrIsyLupRSUDxKKdFKD4z55UH yHeSmpHXHvLOfpnojg8Sd1ncbm8O8JWL2k5QbKjnhgx/4MC1prtUiHFVuHukQ+U3 Hlm2EgodvX7CanD0C7ziZ5hqCEQZdS1k9WbYLHFyqGTnLd16BLQZatTSWwRs/Lv5 ByHDx1/YTHs0Rmq3Y2qln43GkF+c66YxSS7dWsv2N9pHscdv0SqENhgE6LAqrXC3 d83409jfQdeABKtV1n6JmCt82mzApffCS4PjvOBG6XCqJCdPh/vlHHHJpTKnZT9d tX0HyaDfWdNxHwOpgQmP7XweE/F8uqHWsNE8W8hKtAEfGJ5PvGBN8g8EdZ1aMZLu 7/5ikrkCwDzCsIUGYr/Gd8Rq6OvUyVk4hQAYgJE+8bJ/SnZn7/mpBQOw7SmexAlh Vu5JD6QjJD6Ikh43RSjUePZ6wXINa7l9W2LpZ385+QRjLziCZ/tZv0RJxY9w92iO EJhFD9xldwptFox9x9Vbtz0NL96gMEnmnhJdzJVCtXAlJTtRO6N/M9dGNnXkxyy5 hVGVPyTLb6wQc9foYL/3g9WcKv76mgs= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: 0.001 X-Spam-Level: X-Spam-Status: No, score=0.001 tagged_above=-10 required=5 tests=[FREEMAIL_FROM=0.001] autolearn=disabled Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out003.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g9Ey6-voaxF8; Mon, 18 Mar 2019 10:44:45 +0100 (CET) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by ext-mx-out003.mykolab.com (Postfix) with ESMTPS id 2C72D403BB; Mon, 18 Mar 2019 10:44:45 +0100 (CET) Received: from ext-subm003.mykolab.com (unknown [10.9.6.3]) by int-mx002.mykolab.com (Postfix) with ESMTPS id 14F6025E0; Mon, 18 Mar 2019 10:44:45 +0100 (CET) Date: Mon, 18 Mar 2019 10:44:41 +0100 From: Rutger Helling Message-ID: <20190318104441.2dacc080@mykolab.com> In-Reply-To: <87y35d8jmw.fsf@fastmail.com> References: <20190312141615.2d96bb7d@mykolab.com> <87y35d8jmw.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/vzb4_hMf5bNhgSPxhtbfipL"; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Sig_/vzb4_hMf5bNhgSPxhtbfipL Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Marius, thanks for the review. So when I rebuilt my entire system a while back with these patches it was only those few SDL packages that were affected. Unfortunately I have no way of knowing for sure if it won't happen anywhere else, but it does seem to be something contained to just SDL(1). The packages fail with the following error if "mesa" isn't an explicit input: ld: cannot find -lGL collect2: error: ld returned 1 exit status WDYT? Should I go ahead and push these patches or do you have other ideas? On Sun, 17 Mar 2019 19:01:59 +0100 Marius Bakke wrote: > Rutger Helling writes: >=20 > > Hey Guix, > > > > this patch series changes libdrm and Mesa to use Meson. > > > > A few notes to go along with the patches: > > > > Patch #1: Libdrm on Github mentions that Autotools is the legacy > > build system for libdrm, so it seems better to change this to use > > Meson. Patch #2: Mesa is gonna drop support for Autotools entirely > > at some point in 2019, so it seems good to make the switch sooner > > rather than later. I think I converted all the configure flags to > > the new format. Patches #3-6: For some reason these packages now > > need an explicit mesa input. I haven't run into other packages that > > have this problem yet. =20 >=20 > The first two patches LGTM, but we should figure out why some packages > need special attention and squash the fixes with the Mesa (or libdrm) > change. >=20 > I see the other packages are SDL-related, maybe the libSDL pkg-config > files are different after this change? Or "sdl-config" prints > something weird? >=20 > Thanks for looking after these packages :-) --Sig_/vzb4_hMf5bNhgSPxhtbfipL Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlyPaIkACgkQ86cn20T8 yjZq1Qf/ZDA/HuhZcfFAZn9zkVuicCoru86ogha1nPI2tyDJ0vzjwBxaR3zPVT84 SYTn0wwW0wlcrd7yCWcobR61PxfmuB42p6kcldO0fE10RyfEycdpwGWL5+w0AfIw 7iYUCru3SlTaI/1LWUEx82BLQqqgQLDv6h5aq7HdIUK4WaoO3wFr7fR9K1b/xERV uKf7RdWnFVT9Mn9l6JkBLWJHf5HleUSq3bDC3bL5Qyt6iWNEAxg2v9P3QeQN2Xh8 cWb9PPTpUSPF87EUi9YKFdfX1QaRw+kj5fYNND51fMtSqz4LgS3fdr04u1xXbQo2 r5aPkud8A1w3EHNqBV4lfmxITxSyvw== =VKVn -----END PGP SIGNATURE----- --Sig_/vzb4_hMf5bNhgSPxhtbfipL-- From unknown Sat Jun 14 03:56:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#34824] [PATCH staging] libdrm/Mesa Meson patch series Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Mar 2019 14:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Rutger Helling Cc: 34824@debbugs.gnu.org Received: via spool by 34824-submit@debbugs.gnu.org id=B34824.15529186607756 (code B ref 34824); Mon, 18 Mar 2019 14:18:02 +0000 Received: (at 34824) by debbugs.gnu.org; 18 Mar 2019 14:17:40 +0000 Received: from localhost ([127.0.0.1]:48982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5t5A-000211-BG for submit@debbugs.gnu.org; Mon, 18 Mar 2019 10:17:40 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:35847) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5t57-00020o-U1 for 34824@debbugs.gnu.org; Mon, 18 Mar 2019 10:17:38 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 611CB2210C; Mon, 18 Mar 2019 10:17:32 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 18 Mar 2019 10:17:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=TkVLdK5R4FhhHAWsp38dzqG+X1 rAAtgvjdfW7Xu4ngk=; b=t8R24w4QwNTLRo4h+tHOrr3E1w2vPDN+ENjFavtPhx 0yjSJOYIv5QOZ8dqyHdSNU9zjt+PucJd2cUJkhGFXZmUaqUM+KPM7nFdl11YPX7w C950jRPKpqPPKvayL0D0l7kaCb8n1NrE4mZXN5PZU3XPCx+lFTeHQTskRD2K1nMA aAQ0oMUkNMbbgVPXfBui4ghXtRRfprGaEECt49bKvU/aS8llLea4V4oIk1cKSP2+ FIRJPAWOFfhP6WzoPrgfNcpoqoLIOLVbWWEMmTfoo5OIFQ89m+7e5W2gMkduwGmI ZvxEfDv2w1is7xcwx/7nNt6g7Agu1Njb75W5Gaq/eAyw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=TkVLdK 5R4FhhHAWsp38dzqG+X1rAAtgvjdfW7Xu4ngk=; b=Rksjo4hQ8tXMTW4TRBl09F 3pPaNe2xByX7zmGysjRmYq9J7nPQW1NEkWt2oY3IwxKTnFCn7Y4xvBzY65bLfAa+ plJwWkyJEL4mapeb6mXSXolez+LEivdfGyN084wYJPvL7hi2E5VeMDawd8vVgDfX 5Jg4YNk54J1mh/XSXv0SqDUtBzjJddY0Owku3KQGaXNKfyIVrw8PXjh7FP3XVw04 NjBy6Q4vuUmT7QBzBUITIyUWRWQP2x9seq/qYVXIDpRUBhfu+bMCYpd9EMR4B329 Jj6UPxaaHHEWayZaU/xid2jJnbmUQEGj54LOfAG0gS4oEPpd0qaNPOSc9vPtwffg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddriedugdeifecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffujghffgffkfggtgesghdtreertdertdenucfhrhhomhepofgrrhhiuhhs uceurghkkhgvuceomhgsrghkkhgvsehfrghsthhmrghilhdrtghomheqnecukfhppeeivd drudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvges fhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 6259CE4240; Mon, 18 Mar 2019 10:17:31 -0400 (EDT) From: Marius Bakke In-Reply-To: <20190318104441.2dacc080@mykolab.com> References: <20190312141615.2d96bb7d@mykolab.com> <87y35d8jmw.fsf@fastmail.com> <20190318104441.2dacc080@mykolab.com> User-Agent: Notmuch/0.28.2 (https://notmuchmail.org) Emacs/26.1 (x86_64-pc-linux-gnu) Date: Mon, 18 Mar 2019 15:17:27 +0100 Message-ID: <87r2b48dxk.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Rutger Helling writes: > Hi Marius, > > thanks for the review. > > So when I rebuilt my entire system a while back with these patches it > was only those few SDL packages that were affected. Unfortunately I have > no way of knowing for sure if it won't happen anywhere else, but it > does seem to be something contained to just SDL(1). > > The packages fail with the following error if "mesa" isn't an explicit > input: > > ld: cannot find -lGL > collect2: error: ld returned 1 exit status > > WDYT? Should I go ahead and push these patches or do you have other > ideas? Well, we still don't know why -lGL is suddenly there. Did you inspect the pkg-config files or sdl-config output to figure out why? I suspect Mesa should be propagated somewhere, instead of added as an input in a bunch of places. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlyPqHgACgkQoqBt8qM6 VPqxPQf8DoSS28oUy3n/WGV4Jn+NzoR7SBSnXz/Rw7jbleOZKdBCN3L47ymL2mX6 nsAsNWvv62hwaz7+MQF68rCvgosrCbhqe4zk5hKhwJv/3NVimIJt/aErfKhFdjg2 0Ye9P0mqnc3hwAwzXHFW44M2lu7FFlFbiVum3Y2oTxSz3dNZ16h4VJV8p1sostnY DvqSUtUsOU2tc4bv4zQ/3qqKuJpF02K2qeYgLt0/JrRB86B8x7PKl3UZsU1glq1R FQKLCPBjqE2kBgrHb6tfC3tj7fasDuZ14+UOCeCqNsIWKxERSGoPwLSv+qpYWaRs ywTiKsOfIl0L2uAne0aX9m+g8qJj0A== =xpht -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Jun 14 03:56:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#34824] [PATCH staging] libdrm/Mesa Meson patch series Resent-From: Rutger Helling Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Mar 2019 15:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: 34824@debbugs.gnu.org Received: via spool by 34824-submit@debbugs.gnu.org id=B34824.155292277014600 (code B ref 34824); Mon, 18 Mar 2019 15:27:02 +0000 Received: (at 34824) by debbugs.gnu.org; 18 Mar 2019 15:26:10 +0000 Received: from localhost ([127.0.0.1]:49019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5u9S-0003nQ-6I for submit@debbugs.gnu.org; Mon, 18 Mar 2019 11:26:10 -0400 Received: from mx.kolabnow.com ([95.128.36.40]:42386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5u9Q-0003nC-AW for 34824@debbugs.gnu.org; Mon, 18 Mar 2019 11:26:09 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out003.mykolab.com (Postfix) with ESMTP id DFBEB40535; Mon, 18 Mar 2019 16:26:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:references:in-reply-to :message-id:subject:subject:from:from:date:date:received :received:received; s=dkim20160331; t=1552922761; x=1554737162; bh=Ad1tt2uyP2SvvLA3XSBBdLgpPM3BtWdBJbzGZAA5/Ks=; b=FDN0nbxBdUKW EmOnJpySnSlShPyr47KRctTg7i6owIBvKfZGM0/ZobtUYZSNOJl2Bg2Uwy0LuXpf zhLA/fiHPeNHm1C/bGnNC6y9C7lUOMQbJTQaM/GVH3k6yJXEP9vL2CjZkoPknwZn OfYLGIyt/Pe0sdrl6AJEhc3Dp9BCenZ/hjZeRTW6Pe8TiTckPvwXg695pMBhVJ3a q4Fk35VDOIu+9Veh8DlZ81Qgo8EHyXmVjwUlPeJZivZJVXhpg/x5Iixh8r5+9MTk dpTNBA5bxCkjqL7T5YAH25r09+RpEB0dAWpf061gTEEGjUJDiysk9SMc/BPLfZJW o8Ry8hsUN8O9geKJmO86jtyrBCI98mB/IAINEKol9xbL0oiGVWTqhr1tSpYYZ9ox Ui+0Z9LEBnNYhMSRSAwzBzmcigXJ6ImK4FBX/Bxp9E8YCgNal+C15jbU3ow9Z/eO JqW8K4c1G1+WyFPolLTnGPG3Tzoel2EMzPHB6fnUwDZFEk9ii9Ax7T/NmJNIjU1d +ko8GTuwwbqeklIiMHxtYRpX1dPwyBFL00/r10Jc/9xn9nib/YUL6ylgpMcYIjVx qS46BEAwMAYcExlAjvQMvci3hsSYrrRFWOFfi2HIWPWsno7PDeA/VAilRjlxxsyM B207e7WW+7ZuZD0d1JBj8KOcUxp1wPs= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: 0.001 X-Spam-Level: X-Spam-Status: No, score=0.001 tagged_above=-10 required=5 tests=[FREEMAIL_FROM=0.001] autolearn=disabled Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out003.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Zlu9mdq17SUT; Mon, 18 Mar 2019 16:26:01 +0100 (CET) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by ext-mx-out003.mykolab.com (Postfix) with ESMTPS id 05393404B7; Mon, 18 Mar 2019 16:26:01 +0100 (CET) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx002.mykolab.com (Postfix) with ESMTPS id E3FF7233A; Mon, 18 Mar 2019 16:26:00 +0100 (CET) Date: Mon, 18 Mar 2019 16:25:45 +0100 From: Rutger Helling Message-ID: <20190318162545.4d746971@mykolab.com> In-Reply-To: <87r2b48dxk.fsf@fastmail.com> References: <20190312141615.2d96bb7d@mykolab.com> <87y35d8jmw.fsf@fastmail.com> <20190318104441.2dacc080@mykolab.com> <87r2b48dxk.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/Px_zcKkl72=goS2qsgQ24l_"; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Sig_/Px_zcKkl72=goS2qsgQ24l_ Content-Type: multipart/mixed; boundary="MP_/b_10foXn5ckJgnzYSXDcuYk" --MP_/b_10foXn5ckJgnzYSXDcuYk Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline I think you're right! Changing mesa from a regular input to a propogated one seems to have fixed all the issues for SDL. I no longer need patches 3-6. See below for what we can use instead. Can I push the patches now? * gnu/packages/sdl.scm (sdl)[propogated-inputs]: Add mesa. [inputs]: Remove mesa. --- gnu/packages/sdl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 8d2a02437..e13958984 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -87,10 +87,10 @@ (propagated-inputs ;; SDL headers include X11 headers. `(("libx11" ,libx11) - ("libcap" ,libcap))) ; 'libSDL.la' contain `-lcap'. + ("libcap" ,libcap) ; 'libSDL.la' contain `-lcap'. + ("mesa" ,mesa))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("libxrandr" ,libxrandr) - ("mesa" ,mesa) ("glu" ,glu) ("alsa-lib" ,alsa-lib) ("pulseaudio" ,pulseaudio))) --=20 2.21.0 On Mon, 18 Mar 2019 15:17:27 +0100 Marius Bakke wrote: > Rutger Helling writes: >=20 > > Hi Marius, > > > > thanks for the review. > > > > So when I rebuilt my entire system a while back with these patches > > it was only those few SDL packages that were affected. > > Unfortunately I have no way of knowing for sure if it won't happen > > anywhere else, but it does seem to be something contained to just > > SDL(1). > > > > The packages fail with the following error if "mesa" isn't an > > explicit input: > > > > ld: cannot find -lGL > > collect2: error: ld returned 1 exit status > > > > WDYT? Should I go ahead and push these patches or do you have other > > ideas? =20 >=20 > Well, we still don't know why -lGL is suddenly there. Did you inspect > the pkg-config files or sdl-config output to figure out why? >=20 > I suspect Mesa should be propagated somewhere, instead of added as an > input in a bunch of places. --MP_/b_10foXn5ckJgnzYSXDcuYk Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0003-gnu-sdl-Propogate-mesa-input.patch =46rom b46743817e2bd5d1a8bd266f3b5ad27799468a87 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 18 Mar 2019 16:11:41 +0100 Subject: [PATCH] gnu: sdl: Propogate mesa input. * gnu/packages/sdl.scm (sdl)[propogated-inputs]: Add mesa. [inputs]: Remove mesa. --- gnu/packages/sdl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 8d2a02437..e13958984 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -87,10 +87,10 @@ (propagated-inputs ;; SDL headers include X11 headers. `(("libx11" ,libx11) - ("libcap" ,libcap))) ; 'libSDL.la' contain `-lcap'. + ("libcap" ,libcap) ; 'libSDL.la' contain `-lcap'. + ("mesa" ,mesa))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("libxrandr" ,libxrandr) - ("mesa" ,mesa) ("glu" ,glu) ("alsa-lib" ,alsa-lib) ("pulseaudio" ,pulseaudio))) --=20 2.21.0 --MP_/b_10foXn5ckJgnzYSXDcuYk-- --Sig_/Px_zcKkl72=goS2qsgQ24l_ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlyPuHkACgkQ86cn20T8 yjZzlQf/bqCX/kxw4/KmK1V1q+l5FTFtaryJBTgohmZYOAH4hnZVZbwzQjX8wIpp Zdi00+Bv2EmxFhldZsf2F+/mtcHeKgCHvYoyZztuVeWgPQfHRX+TEeOZ30ALW7jo Nep6mDAgQUHCKmaJefonF/QCN7NukWDm0NlCFY4h627NOd5Ae5YO4Sd+srhYZWOJ rwACyqVs2QcKrx7BxetpAh8ADyLuVC/XbfmgvgaIjjKahWZduvPXlcOCdVZJp1BP +HLg78mC3fOAPKpdvENP0unOXxVIsBNrjLNa85bIPhqiokG+N+00TXj+qv4Lktd3 O+mBUwpH23VHE8sM/Ry72CxoFBELaQ== =y7qP -----END PGP SIGNATURE----- --Sig_/Px_zcKkl72=goS2qsgQ24l_-- From unknown Sat Jun 14 03:56:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#34824] [PATCH staging] libdrm/Mesa Meson patch series Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Mar 2019 16:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Rutger Helling Cc: 34824@debbugs.gnu.org Received: via spool by 34824-submit@debbugs.gnu.org id=B34824.155292782031344 (code B ref 34824); Mon, 18 Mar 2019 16:51:02 +0000 Received: (at 34824) by debbugs.gnu.org; 18 Mar 2019 16:50:20 +0000 Received: from localhost ([127.0.0.1]:49086 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5vSu-00089U-Jr for submit@debbugs.gnu.org; Mon, 18 Mar 2019 12:50:20 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:41153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5vSq-00089A-5i for 34824@debbugs.gnu.org; Mon, 18 Mar 2019 12:50:18 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id B68CA22F5B; Mon, 18 Mar 2019 12:50:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 18 Mar 2019 12:50:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=41s2jd2GSajAwLvwp8cFJxlhnW q+SRiPECB4d+xPNs8=; b=D8vLLRRl4K/yAJDvC+iyQVIRjp+cReS51Ziq6iUsMe w038zPAJRVXD/QZpplpm0f4eFkB5zxpy0WsfVeGWFoji3y+0vf47MJ1d4R3IWj/w bV3BYImO61rs8pGnuq3SKZ/OExutx7X1HSlHqmqG8FtbeYzEExp+nrJHewMV+kVb YXpeituIxAFxICfrPITYEFr2fPeAkebQ31H+inGVWiJXE6iRZKMdlOlQ1EZ5+Gj+ v08NjcH4M3sYNW/q/PGyqhpk/d6f8FCFD9FEA4gqshf9SIquZMbr+f4Eb+Y5eNTb ibudWXKa89308nsyc6VdIL9M+xiVrJja7tNpAi77ADFw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=41s2jd 2GSajAwLvwp8cFJxlhnWq+SRiPECB4d+xPNs8=; b=10E4Q3J8TwHqfNba/dWpu9 h3rvWm7Kuf4D9pFyDh4ZzlQTFQW4bstnP+GF0lKnyzeJ5ONAhT+b2PhsBfQPLgNo 3Bp3F69jggoEM6pc73igjJZFI7vmMsyUBtON523pwtmrnpYPqhXKxx+2VczBb05G 29nJQl32FygW2f14KVQVFBuvZPdIDdflk4YEKn/hR4rvEEcnO00XRfTbSe3Kps9j cyaSnxwzKrxsKYnyDxcmhKSScOQ+OlcTq51hGhk054HKHZdA2FazwdSQaEUMG9w8 AoVgQp0PGcVk5APlmUZcTHNr+S3v4p9zGb/GZanRGp8A7WWAPX5/FL3m7Rx1wW6g == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddriedugdelgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffujghffgffkfggtgesghdtreertdertdenucfhrhhomhepofgrrhhiuhhs uceurghkkhgvuceomhgsrghkkhgvsehfrghsthhmrghilhdrtghomheqnecukfhppeeivd drudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvges fhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id C16B9E4684; Mon, 18 Mar 2019 12:50:09 -0400 (EDT) From: Marius Bakke In-Reply-To: <20190318162545.4d746971@mykolab.com> References: <20190312141615.2d96bb7d@mykolab.com> <87y35d8jmw.fsf@fastmail.com> <20190318104441.2dacc080@mykolab.com> <87r2b48dxk.fsf@fastmail.com> <20190318162545.4d746971@mykolab.com> User-Agent: Notmuch/0.28.2 (https://notmuchmail.org) Emacs/26.1 (x86_64-pc-linux-gnu) Date: Mon, 18 Mar 2019 17:50:07 +0100 Message-ID: <87o96886v4.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Rutger Helling writes: > I think you're right! Changing mesa from a regular input to a > propogated one seems to have fixed all the issues for SDL. I no longer > need patches 3-6. See below for what we can use instead. Can I push the > patches now? Well, we still don't know *why* it is needed :-) Could you add a comment about where it comes from (e.g. pkg-config or the .la files) and squash this commit with the Mesa patch? LGTM with that change, thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlyPzD8ACgkQoqBt8qM6 VPoA3Af+J/RwlAzhNZkpyC3PgJMJZdThHw1bVGJ3EUsOUMXR1MrGDbBpyu19nFZL RN6QCFOK+Cc8kYiFZhmBNl+fwEt7MxfQO3IbX4YEBubD9Un4zTkLhKWlgj+l1cAU cM/yQDQ1OoEt2/bIM1U9azs0H0R4R3yBRqyWKGIsF2STFMI2IcOr+5HnkYKHZGIK +m7zO/cTRQHKeXL5i3tbdCxDEP5OKbeLyvm4t0Kb1VOaVlAyFeudPS1ICePoglIS qQOCLV6chT5ISS27EaYncqbxhJffWqqKCseQDuAxjgOzQvKzwrJH6ztuhN6qeUF8 RRquoJFFDUuSukrIpuTJMUYQMSQPtA== =zv5c -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Jun 14 03:56:33 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Rutger Helling Subject: bug#34824: closed (Re: [bug#34824] [PATCH staging] libdrm/Mesa Meson patch series) Message-ID: References: <20190319111044.6fd2f909@mykolab.com> <20190312141615.2d96bb7d@mykolab.com> X-Gnu-PR-Message: they-closed 34824 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 34824@debbugs.gnu.org Date: Tue, 19 Mar 2019 10:12:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1552990322-15815-1" This is a multi-part message in MIME format... ------------=_1552990322-15815-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #34824: [PATCH staging] libdrm/Mesa Meson patch series which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 34824@debbugs.gnu.org. --=20 34824: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D34824 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1552990322-15815-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 34824-done) by debbugs.gnu.org; 19 Mar 2019 10:11:05 +0000 Received: from localhost ([127.0.0.1]:49579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h6Bi4-00045p-JS for submit@debbugs.gnu.org; Tue, 19 Mar 2019 06:11:04 -0400 Received: from mx.kolabnow.com ([95.128.36.42]:34894) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h6Bi0-00045I-Ny for 34824-done@debbugs.gnu.org; Tue, 19 Mar 2019 06:11:01 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTP id 3095115F8; Tue, 19 Mar 2019 11:10:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:references:in-reply-to :message-id:subject:subject:from:from:date:date:received :received:received; s=dkim20160331; t=1552990253; x=1554804654; bh=DCDfF58qrPsQTqL3Z3WCm4L7W+LypVR/jdvvaVzpgSw=; b=E0sZVu8TdYiI q9b2Nt7M6qtkE2W3r9T4yEFsZTZy8w97RLVAfSVvPMRYfnXtX7dVZ5DZvli2AmTS Ny84HpKAX4vov4PYTmlBQzzbmB7NWlrN++PJFMJCHF+Vbs23Yincmu1zDRvOtN9n GaqpPm8AoFqPIXywvih7cywukCqA3IQfpb2qnH+EEBMeowDxOkHb8uSB6enhqA0p yXWtzggD0nQFqbtT30Q5CieQMdPaROMkURYWclAO/Gjkyyq58BdrlPPXFENEjDeW hN0IjKcfckh8DoSv9J+/iRS/7rMzYOGrGWBF7OXLvGwxlpmJKyQIT5QUUGEK0Mq6 HlKXYSrKAitvylVmPQd0/Sj0v9NdJanWwx5VV7b/dAoXb3oul/wfwLI97zka9/gz CYaLWGPqm0ekivd1Nwovt34wT1BBykkgqjLEoEApMGoIFHirEnC7N1kOGU8yyyLK 8p6owPuvPNQCvGK/Y1dyPK8SA+Bu9+NADu62w8VnFGQtdT10hM9yh1Kyh19F+Tgo Dqg0ttA2hFmDcL9qD3PG9qOwXNnEcglpo9Wjgm8yJXttCytAKe0e7W2fk1gDddH3 Pknsp2Rq/qKdKPuOMUAcAzx6c00vQHUW+vW/G6LMBodCHmLjMjs0BqFfBjOMduiJ aIchyOKQ0U3gxRndcER7u9GSly+egm8= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: 0.002 X-Spam-Level: X-Spam-Status: No, score=0.002 tagged_above=-10 required=5 tests=[FREEMAIL_FROM=0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ssKp8bdqbFad; Tue, 19 Mar 2019 11:10:53 +0100 (CET) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTPS id 12E6315F5; Tue, 19 Mar 2019 11:10:53 +0100 (CET) Received: from ext-subm003.mykolab.com (unknown [10.9.6.3]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 00E053DF; Tue, 19 Mar 2019 11:10:52 +0100 (CET) Date: Tue, 19 Mar 2019 11:10:44 +0100 From: Rutger Helling To: Marius Bakke Subject: Re: [bug#34824] [PATCH staging] libdrm/Mesa Meson patch series Message-ID: <20190319111044.6fd2f909@mykolab.com> In-Reply-To: <87o96886v4.fsf@fastmail.com> References: <20190312141615.2d96bb7d@mykolab.com> <87y35d8jmw.fsf@fastmail.com> <20190318104441.2dacc080@mykolab.com> <87r2b48dxk.fsf@fastmail.com> <20190318162545.4d746971@mykolab.com> <87o96886v4.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/iTpSbVp09+GRrdorV7A_ypi"; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 34824-done Cc: 34824-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Sig_/iTpSbVp09+GRrdorV7A_ypi Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Done, along with an update to 18.3.5. On Mon, 18 Mar 2019 17:50:07 +0100 Marius Bakke wrote: > Rutger Helling writes: >=20 > > I think you're right! Changing mesa from a regular input to a > > propogated one seems to have fixed all the issues for SDL. I no > > longer need patches 3-6. See below for what we can use instead. Can > > I push the patches now? =20 >=20 > Well, we still don't know *why* it is needed :-) >=20 > Could you add a comment about where it comes from (e.g. pkg-config or > the .la files) and squash this commit with the Mesa patch? LGTM with > that change, thanks! --Sig_/iTpSbVp09+GRrdorV7A_ypi Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlyQwCQACgkQ86cn20T8 yjZvRQf+OKjtYi9BqXPS7RlOSqKLdcKA1pJTubWs9uv/pyxCcNi//ezNumnLiXoT W4yTFSgtKD/Em9VZdXTMyKDhlLtdlhEf5r1ScRJJ9JOldIH/hUQXnoEr5xlpACPr J8+hbcjAlHum67hOCT2nuP21G29tqSmqFcqZM35cW9GmuTh/cb7NZkE6r7hU3GYU t/wBnbXHSh7/pev6DN5L96S6Bup0+/f6rY0ow8XTUu9jmHNiiHFnduEy6DrC6B9P JahhstqFYNrrF7BEY8UIcv6xNfg8TLYXXnq4uhp6oEEOdeD70LYBj8RyGmIrEvqA BOxt5VeNO9ou4ictcyEqXGuja2nCEA== =rMsN -----END PGP SIGNATURE----- --Sig_/iTpSbVp09+GRrdorV7A_ypi-- ------------=_1552990322-15815-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 12 Mar 2019 13:31:05 +0000 Received: from localhost ([127.0.0.1]:39853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h3hUn-0008E4-5d for submit@debbugs.gnu.org; Tue, 12 Mar 2019 09:31:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41077) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h3hUj-0008DX-FW for submit@debbugs.gnu.org; Tue, 12 Mar 2019 09:31:03 -0400 Received: from lists.gnu.org ([209.51.188.17]:33972) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h3hUc-00009L-5R for submit@debbugs.gnu.org; Tue, 12 Mar 2019 09:30:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3hUZ-00035N-Hl for guix-patches@gnu.org; Tue, 12 Mar 2019 09:30:53 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3hGg-0008Rd-Q3 for guix-patches@gnu.org; Tue, 12 Mar 2019 09:16:32 -0400 Received: from mx.kolabnow.com ([95.128.36.42]:33642) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3hGe-0008Ne-BO for guix-patches@gnu.org; Tue, 12 Mar 2019 09:16:29 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out001.mykolab.com (Postfix) with ESMTP id 1B84029C for ; Tue, 12 Mar 2019 14:16:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:message-id:subject :subject:from:from:date:date:received:received:received; s= dkim20160331; t=1552396580; x=1554210981; bh=VcP194Axv9WNFpP173w NiX9JHRhsjIOtTJyKnVNheH0=; b=Svtw9LLbC2SteGtzInh7vjuvDsSWc8xzFHC o+busb68NCwNdklYerPW5CgJ3De72fpwmuAZe1PqPgdXm21rqe32qTaKdLnImSB+ l7yW7cOYjgsQq6JaYuC0UQTSYf0yomV00oZ2xD98IdflwpNukfrHqHS/qCFd6SQb WxNu0qg56s5+y+6D7AXMggJ5+WM+STF4hBxMUjkYmSVJfOjFf/f9G2jU4/C63Q6F b3RpaAZ6xiCX0xD8kpVh3DVLc5Y2I2/WkCCp+SVDWs+xKpkZPdj8azJ3j17RC6OV 835CNSgjy8JmJPkxJA8kWVrGtyOqSBXu7/3tPoVUJ7tvY/djGQhwlfFbFBX1/2mO g98TnebWgMlu31ofweN/bxZCNrK017V+4ZXJv+we40bhTwJn2aInvgT3xQmxjJLJ pq7KKI2XD+H84o0fmXb4IHYQKqZKK3IQT9XM8QTMIINrqNymwiRkTN1e9XjExDO+ d0IcUc0L2hXHeNIj6Szo2YDErOjPg0ucYJenO3+Rua78WGdcQz+3KqJtCNvBGulM iSHaE0WJwLpNCXQCd7i7B2bEDfkFxHYKyXD5W1NIUNzAVBOB9rwzPcd5z5gLRnoT LqfWxJ1mVEp9Wg8XEAj7nEwY1UFeKl/X94o6XmvEP+Okt+1QpWYuFrrXeKBBPar1 ElsYTue8= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jX3Uf6woTwNT for ; Tue, 12 Mar 2019 14:16:20 +0100 (CET) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by ext-mx-out001.mykolab.com (Postfix) with ESMTPS id 33638DA2 for ; Tue, 12 Mar 2019 14:16:20 +0100 (CET) Received: from ext-subm002.mykolab.com (unknown [10.9.6.2]) by int-mx002.mykolab.com (Postfix) with ESMTPS id 1A2972464 for ; Tue, 12 Mar 2019 14:16:20 +0100 (CET) Date: Tue, 12 Mar 2019 14:16:15 +0100 From: Rutger Helling To: guix-patches@gnu.org Subject: [PATCH staging] libdrm/Mesa Meson patch series Message-ID: <20190312141615.2d96bb7d@mykolab.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/.db9P1op.y1Ac.5c3+3Q.pK"; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 95.128.36.42 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --Sig_/.db9P1op.y1Ac.5c3+3Q.pK Content-Type: multipart/mixed; boundary="MP_/77Ucc3tmY2U1fHFqtKYXnnd" --MP_/77Ucc3tmY2U1fHFqtKYXnnd Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hey Guix, this patch series changes libdrm and Mesa to use Meson. A few notes to go along with the patches: Patch #1: Libdrm on Github mentions that Autotools is the legacy build system for libdrm, so it seems better to change this to use Meson. Patch #2: Mesa is gonna drop support for Autotools entirely at some point in 2019, so it seems good to make the switch sooner rather than later. I think I converted all the configure flags to the new format. Patches #3-6: For some reason these packages now need an explicit mesa input. I haven't run into other packages that have this problem yet. --MP_/77Ucc3tmY2U1fHFqtKYXnnd Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-libdrm-Switch-to-meson-build-system.patch =46rom e87f54563723c5dd8fd3fdcc0ce1772fa4c28284 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 12 Mar 2019 12:16:38 +0100 Subject: [PATCH] gnu: libdrm: Switch to meson-build-system. * gnu/packages/xdisorg.scm (libdrm)[build-system]: Switch to meson-build-system. [arguments]: Adjust arguments to Meson. --- gnu/packages/xdisorg.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index ed801d623..2cb8f3b13 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -391,20 +391,20 @@ rasterisation.") (base32 "08yimlp6jir1rs5ajgdx74xa5qdzcqahpdzdk0rmkmhh7vdcrl3p")) (patches (search-patches "libdrm-symbol-check.patch")))) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments `(#:configure-flags '(,@(match (%current-system) ("armhf-linux" - '("--enable-exynos-experimental-api" - "--enable-omap-experimental-api" - "--enable-etnaviv-experimental-api" - "--enable-tegra-experimental-api" - "--enable-freedreno-kgsl")) - ("aarch64-linux" - '("--enable-tegra-experimental-api" - "--enable-etnaviv-experimental-api" - "--enable-freedreno-kgsl")) + '("-Dexynos-experimental-api=3Dtrue" + "-Domap-experimental-api=3Dtrue" + "-Detnaviv-experimental-api=3Dtrue" + "-Dtegra-experimental-api=3Dtrue" + "-Dfreedreno-kgsl=3Dtrue")) + ("aarch64-linux=3Dtrue" + '("-Dtegra-experimental-api=3Dtrue" + "-Detnaviv-experimental-api=3Dtrue" + "-Dfreedreno-kgsl=3Dtrue")) (_ '()))))) (inputs `(("libpciaccess" ,libpciaccess))) --=20 2.21.0 --MP_/77Ucc3tmY2U1fHFqtKYXnnd Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-gnu-mesa-Switch-to-meson-build-system.patch =46rom d164ccb0220756444dcc46675ede0f706255d076 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 12 Mar 2019 14:05:09 +0100 Subject: [PATCH] gnu: mesa: Switch to meson-build-system. * gnu/packages/gl.scm (mesa)[build-system]: Switch to meson-build-system. [native-inputs]: Add "bison", "flex" and "gettext-minimal". [arguments]: Adjust arguments to Meson. --- gnu/packages/gl.scm | 46 ++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c3cb9cab2..daa5f54d7 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") "01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) - (build-system gnu-build-system) + (build-system meson-build-system) (propagated-inputs `(;; The following are in the Requires.private field of gl.pc. ("libdrm" ,libdrm) @@ -264,7 +264,10 @@ also known as DXTn or DXTC) for Mesa.") ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("bison" ,bison) + ("flex" ,flex) + ("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) ("python" ,python) ("python-mako" ,python-mako) ("which" ,(@ (gnu packages base) which)))) @@ -273,47 +276,48 @@ also known as DXTn or DXTC) for Mesa.") '(,@(match (%current-system) ((or "armhf-linux" "aarch64-linux") ;; TODO: Fix svga driver for aarch64 and armhf. - '("--with-gallium-drivers=3Detnaviv,freedreno,imx,nouveau,pl= 111,r300,r600,swrast,tegra,v3d,vc4,virgl")) + '("-Dgallium-drivers=3Detnaviv,freedreno,imx,nouveau,pl111,r= 300,r600,swrast,tegra,v3d,vc4,virgl")) (_ - '("--with-gallium-drivers=3Di915,nouveau,r300,r600,radeonsi,= svga,swrast,virgl"))) + '("-Dgallium-drivers=3Dnouveau,r300,r600,radeonsi,svga,swras= t,virgl"))) ;; Enable various optional features. TODO: opencl requires libcl= c, ;; omx requires libomxil-bellagio - "--with-platforms=3Dx11,drm,surfaceless,wayland" - "--enable-glx-tls" ;Thread Local Storage, improves perform= ance - ;; "--enable-opencl" - ;; "--enable-omx" - "--enable-osmesa" - "--enable-xa" + "-Dplatforms=3Dx11,drm,surfaceless,wayland" + "-Dglx=3Ddri" ;Thread Local Storage, improves performance + ;; "-Dopencl=3Dtrue" + ;; "-Domx=3Dtrue" + "-Dosmesa=3Dgallium" + "-Dgallium-xa=3Dtrue" + ;; features required by wayland - "--enable-gles2" - "--enable-gbm" - "--enable-shared-glapi" + "-Dgles2=3Dtrue" + "-Dgbm=3Dtrue" + "-Dshared-glapi=3Dtrue" =20 ;; Enable Vulkan on i686-linux and x86-64-linux. ,@(match (%current-system) ("x86_64-linux" - '("--with-vulkan-drivers=3Dintel,radeon")) + '("-Dvulkan-drivers=3Dintel,amd")) ;; TODO: Fix intel driver on i686-linux. ("i686-linux" - '("--with-vulkan-drivers=3Dradeon")) + '("-Dvulkan-drivers=3Damd")) (_ '(""))) =20 ;; Also enable the tests. - "--enable-gallium-tests" + "-Dbuild-tests=3Dtrue" =20 ;; on non-intel systems, drop i915 and i965 ;; from the default dri drivers ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - '("--with-dri-drivers=3Di915,i965,nouveau,r200,radeon,swrast" - "--enable-llvm")) ; default is x86/x86_64 only + '("-Ddri-drivers=3Di915,i965,nouveau,r200,r100" + "-Dllvm=3Dtrue")) ; default is x86/x86_64 only (_ - '("--with-dri-drivers=3Dnouveau,r200,radeon,swrast")))) + '("-Ddri-drivers=3Dnouveau,r200,r100")))) #:modules ((ice-9 match) (srfi srfi-1) (guix build utils) - (guix build gnu-build-system)) + (guix build meson-build-system)) #:phases (modify-phases %standard-phases (add-after @@ -323,7 +327,7 @@ also known as DXTn or DXTC) for Mesa.") (("/usr/bin/env python2") (which "python"))) #t)) (add-before - 'build 'fix-dlopen-libnames + 'configure 'fix-dlopen-libnames (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) ;; Remain agnostic to .so.X.Y.Z versions while doing --=20 2.21.0 --MP_/77Ucc3tmY2U1fHFqtKYXnnd Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0003-gnu-libsmpeg-Add-mesa-input.patch =46rom 5c69bc199728d3928d65f5fd6ba2b2ba659193fb Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 12 Mar 2019 12:52:34 +0100 Subject: [PATCH 1/4] gnu: libsmpeg: Add mesa input. * gnu/packages/video.scm (libsmpeg)[inputs]: Add "mesa". --- gnu/packages/video.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e9f5aa751..7eb225a61 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2421,7 +2421,8 @@ Other features include a live preview and live stream= ing.") `(("autoconf" ,autoconf) ("automake" ,automake))) (inputs - `(("sdl" ,sdl2))) + `(("mesa" ,mesa) + ("sdl" ,sdl2))) (home-page "http://icculus.org/smpeg/") (synopsis "SDL MPEG decoding library") (description --=20 2.21.0 --MP_/77Ucc3tmY2U1fHFqtKYXnnd Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0004-gnu-sdl-image-Add-mesa-input.patch =46rom d38cf8a83e2e649f92e5c2259ba5b7ed4ae9c4d3 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 12 Mar 2019 12:53:48 +0100 Subject: [PATCH 2/4] gnu: sdl-image: Add mesa input. * gnu/packages/sdl.scm (sdl-image)[inputs]: Add "mesa". --- gnu/packages/sdl.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 8d2a02437..6d1cdba5f 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -214,6 +214,7 @@ other supporting functions for SDL.") "--disable-tif-shared" "--disable-webp-shared"))) (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa))) ;; libjpeg, libpng, and libtiff are propagated inputs because the ;; SDL_image headers include the headers of these libraries. SDL is a ;; propagated input because the pkg-config file refers to SDL's pkg-co= nfig --=20 2.21.0 --MP_/77Ucc3tmY2U1fHFqtKYXnnd Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0005-gnu-sdl-mixer-Add-mesa-input.patch =46rom 0dac26ad22330302b0068788bab8d0a4180491f8 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 12 Mar 2019 12:54:39 +0100 Subject: [PATCH 3/4] gnu: sdl-mixer: Add mesa input. * gnu/packages/sdl.scm (sdl-mixer)[inputs]: Add "mesa". --- gnu/packages/sdl.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 6d1cdba5f..634b77648 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -259,7 +259,8 @@ WEBP, XCF, XPM, and XV.") ("libflac" ,flac) ("libmad" ,libmad) ("libmikmod" ,libmikmod) - ("libmodplug" ,libmodplug))) + ("libmodplug" ,libmodplug) + ("mesa" ,mesa))) ;; FIXME: Add libfluidsynth (propagated-inputs `(("sdl" ,sdl))) (synopsis "SDL multi-channel audio mixer library") --=20 2.21.0 --MP_/77Ucc3tmY2U1fHFqtKYXnnd Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0006-gnu-sdl-net-Add-mesa-input.patch =46rom fd059a1b42a5ba4b21ffe996d65159fa93736bee Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 12 Mar 2019 12:55:25 +0100 Subject: [PATCH 4/4] gnu: sdl-net: Add mesa input. * gnu/packages/sdl.scm (sdl-net)[inputs]: Add "mesa". --- gnu/packages/sdl.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 634b77648..0c4a5bee1 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -286,6 +286,7 @@ MIDI, Ogg Vorbis, and MP3.") (build-system gnu-build-system) (propagated-inputs `(("sdl" ,sdl))) (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa))) (outputs '("out" "debug")) (synopsis "SDL networking library") (description "SDL_net is a small, cross-platform networking library for --=20 2.21.0 --MP_/77Ucc3tmY2U1fHFqtKYXnnd-- --Sig_/.db9P1op.y1Ac.5c3+3Q.pK Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlyHsR8ACgkQ86cn20T8 yjauywf/T5xzUrEXlMXUvMSP+PG3/XMyguw+unMAnQlXTZfy09UPnx8OnRwv6mYO OAcwwhvXtqXjJsbcRYxKsOQwtOtuvYVJbzf9nYrdnOAcxcFodikq3dmbHRsTL+D7 rHlURORTd/ef57syqtjVXFvPpKJN3sSzXVqPmKeBninWIWpj4Nxpy6XNCNPuRjUH JAmrb5O/pxW4LnYJ9kxcs0dFEmnmKv9HgHKavmAQ+qOJLjcMhdKRFhl7DnlQxOGD BM1287EI7tSZ/QzHWrEDWIKN3jA3ntJafvn+Np1dsCP3bA0mR1Srkdy4QQ10kSgF M//8qsm9sVHarutpje4yr3SsNZiu9w== =EMbj -----END PGP SIGNATURE----- --Sig_/.db9P1op.y1Ac.5c3+3Q.pK-- ------------=_1552990322-15815-1--