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 D0C0E158095 for ; Sun, 28 Aug 2022 17:57:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E06DEE0916; Sun, 28 Aug 2022 17:57:17 +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 C3B0FE0916 for ; Sun, 28 Aug 2022 17:57:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C3257340FB4 for ; Sun, 28 Aug 2022 17:57:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 27EBF574 for ; Sun, 28 Aug 2022 17:57:15 +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: <1661709428.10a4f9686a67378a3c49aa2297091f420b7a5e4c.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: 10a4f9686a67378a3c49aa2297091f420b7a5e4c X-VCS-Branch: master Date: Sun, 28 Aug 2022 17:57:15 +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: b14377fe-0737-4183-8316-62510ca3fa71 X-Archives-Hash: e74083ae78d503fed5aee2fd33eecf98 commit: 10a4f9686a67378a3c49aa2297091f420b7a5e4c Author: Mike Lothian fireburn co uk> AuthorDate: Sun Aug 28 09:37:15 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Aug 28 17:57:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a4f968 x11-apps/mesa-progs-9999: Update patch This allows the patch to apply cleanly Signed-off-by: Mike Lothian fireburn.co.uk> Signed-off-by: Matt Turner gentoo.org> .../files/9999-Disable-things-we-don-t-want.patch | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 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 9d923a9cbc5c..ec3219ae6ce3 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,21 +1,21 @@ -From caa6f31f1032f21756ab327429702feb4381045e Mon Sep 17 00:00:00 2001 +From e23cb684ce6ca066c73b426d9974a7c823891d88 Mon Sep 17 00:00:00 2001 From: Matt Turner -Date: Mon, 30 May 2022 12:16:24 -0400 +Date: Sun, 28 Aug 2022 10:34:42 +0100 Subject: [PATCH] Disable things we don't want --- meson.build | 11 +++-------- - src/egl/opengl/meson.build | 29 ---------------------------- + 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/xdemos/meson.build | 36 ----------------------------------- - 8 files changed, 3 insertions(+), 119 deletions(-) + 8 files changed, 3 insertions(+), 116 deletions(-) diff --git a/meson.build b/meson.build -index e1968fab..9d59c1ec 100644 +index 0c15274b..36276541 100644 --- a/meson.build +++ b/meson.build @@ -75,14 +75,7 @@ endif @@ -44,12 +44,12 @@ index e1968fab..9d59c1ec 100644 include_directories: glut_incdir, prefix : '#include ') diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build -index ba7cadc3..789b25a5 100644 +index c0d4792b..f27b6885 100644 --- a/src/egl/opengl/meson.build +++ b/src/egl/opengl/meson.build -@@ -4,41 +4,12 @@ executable( +@@ -4,32 +4,11 @@ executable( 'eglgears_x11', files('eglgears.c'), - dependencies: [_deps, idep_eglut_x11] + dependencies: [_deps, dep_glu, idep_eglut_x11] ) -executable( - 'egltri_x11', files('egltri.c'), @@ -63,7 +63,7 @@ index ba7cadc3..789b25a5 100644 - 'xeglthreads', files('xeglthreads.c'), - dependencies: [_deps, dep_x11] -) -- + executable( 'eglgears_wayland', files('eglgears.c'), dependencies: [_deps, dep_glu, idep_eglut_wayland] @@ -77,13 +77,13 @@ index ba7cadc3..789b25a5 100644 - 'eglkms', 'eglkms.c', - dependencies: [_deps, dep_drm, dep_gbm, dep_egl] -) -- + executable( 'eglinfo', 'eglinfo.c', - dependencies: [dep_egl], +@@ -38,8 +17,3 @@ executable( install: true ) -- + -executable( - 'peglgears', 'peglgears.c', - dependencies: [dep_gl, dep_glu, dep_egl, dep_m, idep_util] @@ -156,7 +156,7 @@ index b2ff9c8f..f482df5e 100644 #ifndef GLAPIENTRY diff --git a/src/util/meson.build b/src/util/meson.build -index 9168aecf..066073cc 100644 +index 959e2170..066073cc 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -20,26 +20,6 @@ @@ -250,5 +250,5 @@ index d6d5d5d5..ce26699f 100644 foreach p : thread_progs executable( -- -2.35.1 +2.37.2