From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79E8D15800A for ; Tue, 15 Aug 2023 14:39:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E4C12BC013; Tue, 15 Aug 2023 14:39:20 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 76ABA2BC013 for ; Tue, 15 Aug 2023 14:39:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA9EF340E43 for ; Tue, 15 Aug 2023 14:39:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 435E1EBF for ; Tue, 15 Aug 2023 14:39:18 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1692110354.c893b5ef17bcd89e009f765f813b9da3a7771d88.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch X-VCS-Directories: x11-apps/mesa-progs/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: c893b5ef17bcd89e009f765f813b9da3a7771d88 X-VCS-Branch: master Date: Tue, 15 Aug 2023 14:39:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5c2ba3a1-3b24-4b03-9c28-c9e8ff8bb1db X-Archives-Hash: 5813409df1e4ad0d3f4df655ded480ca commit: c893b5ef17bcd89e009f765f813b9da3a7771d88 Author: orbea riseup net> AuthorDate: Tue Aug 15 14:12:24 2023 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Aug 15 14:39:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c893b5ef x11-apps/mesa-progs: rebase live patch Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/gentoo/pull/32322 Signed-off-by: Matt Turner gentoo.org> .../mesa-progs/files/9999-Disable-things-we-don-t-want.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch index 417ee5b14185..55483ad5ec23 100644 --- a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch +++ b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch @@ -1,4 +1,4 @@ -From fa9eb6da5af8f55c49e4594b490d8af5904835f7 Mon Sep 17 00:00:00 2001 +From 639005a81abf915e7b6450baacf40ede01121cb7 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 27 Jan 2023 06:40:05 -0800 Subject: [PATCH] Disable things we don't want @@ -16,7 +16,7 @@ v3: Enable most of libutil to fix undefined references in es2gears 7 files changed, 4 insertions(+), 89 deletions(-) diff --git a/meson.build b/meson.build -index bc3278e1..66433403 100644 +index 3e39b5a2..6d064ef6 100644 --- a/meson.build +++ b/meson.build @@ -87,16 +87,7 @@ endif @@ -37,15 +37,15 @@ index bc3278e1..66433403 100644 dep_glx = dependency('glx', required: false, disabler : true) if not dep_glx.found() -@@ -145,6 +136,8 @@ else +@@ -165,6 +156,8 @@ else dep_glut = dependency('', required : false) endif +dep_glut = disabler() + - if dep_glut.found() and cc.has_function('glutInitContextProfile', - dependencies: [dep_glut], - prefix : '#include ') + if dep_glut.found() and (dep_glut.type_name() == 'internal' or + cc.has_function('glutInitContextProfile', + dependencies: [dep_glut], diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build index 9bca049c..e7122027 100644 --- a/src/egl/opengl/meson.build