From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:33138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5uAP-0007Hb-50 for guix-patches@gnu.org; Mon, 18 Mar 2019 11:27:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h5uAL-00007b-NH for guix-patches@gnu.org; Mon, 18 Mar 2019 11:27:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35475) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h5uAI-0008PV-Bj for guix-patches@gnu.org; Mon, 18 Mar 2019 11:27:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h5uAI-0003od-2d for guix-patches@gnu.org; Mon, 18 Mar 2019 11:27:02 -0400 Subject: [bug#34824] [PATCH staging] libdrm/Mesa Meson patch series Resent-Message-ID: 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" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Marius Bakke Cc: 34824@debbugs.gnu.org --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_--