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 09B1E15800F for ; Thu, 2 Feb 2023 17:11:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5076BE07C9; Thu, 2 Feb 2023 17:11:08 +0000 (UTC) Received: from smtp.gentoo.org (dev.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 38EB7E07C9 for ; Thu, 2 Feb 2023 17:11:08 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 390C8335DCC for ; Thu, 2 Feb 2023 17:11:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 805B1531 for ; Thu, 2 Feb 2023 17:11:05 +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: <1675357859.9ebcb19270a73ada62218837526a42e93cb0730f.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: 9ebcb19270a73ada62218837526a42e93cb0730f X-VCS-Branch: master Date: Thu, 2 Feb 2023 17:11:05 +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: b4db5bfe-379d-438f-be24-2a5967317e10 X-Archives-Hash: d7ad93cf77d4f857d7594204ef2134aa commit: 9ebcb19270a73ada62218837526a42e93cb0730f Author: orbea riseup net> AuthorDate: Thu Feb 2 16:54:54 2023 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Feb 2 17:10:59 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ebcb192 x11-apps/mesa-progs: Update live patch The build fails with USE=gles2 because libutil was disabled in the live patch, but upstream now changed es2gears_x11 to depend on it. To fix this most of libutil was enabled again excluding the parts that depend on glu which do not seem to be required. Closes: https://bugs.gentoo.org/892860 Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/gentoo/pull/29396 Signed-off-by: Matt Turner gentoo.org> .../files/9999-Disable-things-we-don-t-want.patch | 50 +++++++++------------- 1 file changed, 21 insertions(+), 29 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 fe4ced863480..393330b56e6c 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,18 +1,19 @@ -From 0baebcca66eb06aba0831e6596ff5c3245038cae Mon Sep 17 00:00:00 2001 +From 60fbad38f9a394607ac265902fc56c13dd8c9afc 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 v2: Enable libglad to satisfy egl dependencies +v3: Enable most of libutil to fix undefined references in es2gears --- meson.build | 11 +++-------- src/egl/opengl/meson.build | 26 ------------------------- src/egl/opengles2/meson.build | 5 ----- src/meson.build | 2 -- src/util/gl_wrap.h | 2 -- - src/util/meson.build | 21 -------------------- + src/util/meson.build | 7 +------ src/xdemos/meson.build | 36 ----------------------------------- - 7 files changed, 3 insertions(+), 100 deletions(-) + 7 files changed, 4 insertions(+), 85 deletions(-) diff --git a/meson.build b/meson.build index 1fb8eeb1..76f035fb 100644 @@ -44,10 +45,10 @@ index 1fb8eeb1..76f035fb 100644 dependencies: [dep_glut], prefix : '#include ') diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build -index 22b8d23c..18ec823d 100644 +index 6b7039dc..46e4bec7 100644 --- a/src/egl/opengl/meson.build +++ b/src/egl/opengl/meson.build -@@ -4,32 +4,11 @@ executable( +@@ -24,32 +24,11 @@ executable( 'eglgears_x11', files('eglgears.c'), dependencies: [_deps, dep_glu, idep_eglut_x11] ) @@ -80,7 +81,7 @@ index 22b8d23c..18ec823d 100644 executable( 'eglinfo', 'eglinfo.c', -@@ -38,8 +17,3 @@ executable( +@@ -58,8 +37,3 @@ executable( install: true ) @@ -90,10 +91,10 @@ index 22b8d23c..18ec823d 100644 -) - diff --git a/src/egl/opengles2/meson.build b/src/egl/opengles2/meson.build -index 9a442988..e912333b 100644 +index de47a69c..9b073a88 100644 --- a/src/egl/opengles2/meson.build +++ b/src/egl/opengles2/meson.build -@@ -9,11 +9,6 @@ executable( +@@ -29,11 +29,6 @@ executable( dependencies: [dep_gles2, idep_eglut_x11, idep_util], install: true ) @@ -131,37 +132,28 @@ index b2ff9c8f..f482df5e 100644 #ifndef GLAPIENTRY diff --git a/src/util/meson.build b/src/util/meson.build -index ddcd4834..066073cc 100644 +index ddcd4834..72e9480d 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -20,27 +20,6 @@ - +@@ -21,17 +21,12 @@ inc_util = include_directories('.') --files_libutil = files( + files_libutil = files( - 'readtex.c', -- 'showbuffer.c', -- 'trackball.c', -- 'matrix.c', --) -- + 'showbuffer.c', + 'trackball.c', + 'matrix.c', + ) + -_deps = [dep_glu, dep_m] -if dep_glut.found() - files_libutil += files('shaderutil.c') - _deps += dep_glut -endif -- --_libutil = static_library( -- 'util', -- files_libutil, -- include_directories: inc_glad, -- dependencies: _deps, --) -- - idep_util = declare_dependency( -- link_with: _libutil, - include_directories: inc_util, - ) ++_deps = [dep_m] + + _libutil = static_library( + 'util', diff --git a/src/xdemos/meson.build b/src/xdemos/meson.build index d6d5d5d5..ce26699f 100644 --- a/src/xdemos/meson.build