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 B1E10158003 for ; Wed, 1 Feb 2023 15:59:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A6B1E0D05; Wed, 1 Feb 2023 15:59:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 E1FA0E0D05 for ; Wed, 1 Feb 2023 15:59:24 +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 0ED2233BF08 for ; Wed, 1 Feb 2023 15:59:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A74D6771 for ; Wed, 1 Feb 2023 15:59:22 +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: <1675267157.8db7539aaf8fd57a238d15db9b7f92f7e2e47dc2.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: 8db7539aaf8fd57a238d15db9b7f92f7e2e47dc2 X-VCS-Branch: master Date: Wed, 1 Feb 2023 15:59:22 +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: ce0bce5b-89c6-44a0-a05d-2c59f3299908 X-Archives-Hash: 97b34bd0f9e6876bd1ea0396da3124ec commit: 8db7539aaf8fd57a238d15db9b7f92f7e2e47dc2 Author: orbea riseup net> AuthorDate: Fri Jan 27 14:46:46 2023 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Feb 1 15:59:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db7539a x11-apps/mesa-progs: Rebase patch Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/gentoo/pull/29302 Signed-off-by: Matt Turner gentoo.org> .../files/9999-Disable-things-we-don-t-want.patch | 67 +++++++--------------- 1 file changed, 20 insertions(+), 47 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 ec3219ae6ce3..fe4ced863480 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,24 +1,24 @@ -From e23cb684ce6ca066c73b426d9974a7c823891d88 Mon Sep 17 00:00:00 2001 +From 0baebcca66eb06aba0831e6596ff5c3245038cae Mon Sep 17 00:00:00 2001 From: Matt Turner -Date: Sun, 28 Aug 2022 10:34:42 +0100 +Date: Fri, 27 Jan 2023 06:40:05 -0800 Subject: [PATCH] Disable things we don't want +v2: Enable libglad to satisfy egl dependencies --- meson.build | 11 +++-------- src/egl/opengl/meson.build | 26 ------------------------- src/egl/opengles2/meson.build | 5 ----- - src/glad/meson.build | 17 ----------------- src/meson.build | 2 -- src/util/gl_wrap.h | 2 -- - src/util/meson.build | 20 ------------------- + src/util/meson.build | 21 -------------------- src/xdemos/meson.build | 36 ----------------------------------- - 8 files changed, 3 insertions(+), 116 deletions(-) + 7 files changed, 3 insertions(+), 100 deletions(-) diff --git a/meson.build b/meson.build -index 0c15274b..36276541 100644 +index 1fb8eeb1..76f035fb 100644 --- a/meson.build +++ b/meson.build -@@ -75,14 +75,7 @@ endif +@@ -80,14 +80,7 @@ endif dep_threads = dependency('threads') @@ -34,17 +34,17 @@ index 0c15274b..36276541 100644 # GBM is needed for EGL on KMS dep_gbm = dependency('gbm', required : false, disabler : true) -@@ -117,6 +110,8 @@ else - ) +@@ -126,6 +119,8 @@ else + dep_glut = dependency('', required : false) endif +dep_glut = disabler() + if dep_glut.found() and cc.has_function('glutInitContextProfile', - include_directories: glut_incdir, + dependencies: [dep_glut], prefix : '#include ') diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build -index c0d4792b..f27b6885 100644 +index 22b8d23c..18ec823d 100644 --- a/src/egl/opengl/meson.build +++ b/src/egl/opengl/meson.build @@ -4,32 +4,11 @@ executable( @@ -90,11 +90,11 @@ index c0d4792b..f27b6885 100644 -) - diff --git a/src/egl/opengles2/meson.build b/src/egl/opengles2/meson.build -index 59f69ed7..7137a961 100644 +index 9a442988..e912333b 100644 --- a/src/egl/opengles2/meson.build +++ b/src/egl/opengles2/meson.build @@ -9,11 +9,6 @@ executable( - dependencies: [dep_gles2, idep_eglut_x11, dep_m], + dependencies: [dep_gles2, idep_eglut_x11, idep_util], install: true ) -executable( @@ -104,37 +104,12 @@ index 59f69ed7..7137a961 100644 -) executable( 'es2gears_wayland', files('es2gears.c'), - dependencies: [dep_gles2, idep_eglut_wayland, dep_m], -diff --git a/src/glad/meson.build b/src/glad/meson.build -index 2d107609..23dacd45 100644 ---- a/src/glad/meson.build -+++ b/src/glad/meson.build -@@ -19,20 +19,3 @@ - # SOFTWARE. - - inc_glad = include_directories('include') -- --_libglad_files = files('src/glad.c') --if host_machine.system() == 'windows' -- _libglad_files += files('src/glad_wgl.c') --endif -- --_libglad = static_library( -- 'glad', -- _libglad_files, -- include_directories: inc_glad --) -- --idep_glad = declare_dependency( -- link_with: _libglad, -- dependencies: dep_dl, -- include_directories: inc_glad, --) + dependencies: [dep_gles2, idep_eglut_wayland, idep_util], diff --git a/src/meson.build b/src/meson.build -index 39cac78d..4d4abbf8 100644 +index e230057a..198ab59d 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -55,5 +55,3 @@ endif +@@ -58,5 +58,3 @@ endif if host_machine.system() == 'windows' subdir('wgl') endif @@ -156,10 +131,10 @@ index b2ff9c8f..f482df5e 100644 #ifndef GLAPIENTRY diff --git a/src/util/meson.build b/src/util/meson.build -index 959e2170..066073cc 100644 +index ddcd4834..066073cc 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -20,26 +20,6 @@ +@@ -20,27 +20,6 @@ inc_util = include_directories('.') @@ -167,9 +142,10 @@ index 959e2170..066073cc 100644 - 'readtex.c', - 'showbuffer.c', - 'trackball.c', +- 'matrix.c', -) - --_deps = [dep_glu] +-_deps = [dep_glu, dep_m] -if dep_glut.found() - files_libutil += files('shaderutil.c') - _deps += dep_glut @@ -249,6 +225,3 @@ index d6d5d5d5..ce26699f 100644 ] foreach p : thread_progs executable( --- -2.37.2 -