diff options
| author |   orbea <orbea@riseup.net> | 2023-02-17 07:06:17 -0800 |
|---|---|---|
| committer |   Matt Turner <mattst88@gentoo.org> | 2023-02-17 10:19:35 -0500 |
| commit | 3d0bf5f876dd08de8a820da21d1cd7cc98d504cd (patch) | |
| tree | d695a9cfdb362bde9d6f23eb83e2b871c7c9f8c5 /x11-apps/mesa-progs | |
| parent | net-libs/webkit-gtk: Stabilize 2.38.3-r410 ppc64, #888573 (diff) | |
| download | gentoo-3d0bf5f876dd08de8a820da21d1cd7cc98d504cd.tar.gz gentoo-3d0bf5f876dd08de8a820da21d1cd7cc98d504cd.tar.bz2 gentoo-3d0bf5f876dd08de8a820da21d1cd7cc98d504cd.zip | |
x11-apps/mesa-progs: Remove upstreamed patch
Upstream-PR: https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/114
Upstream-Commit: https://gitlab.freedesktop.org/mesa/demos/-/commit/3a9d085315d530d6d9da0887279057077bf65714
Signed-off-by: orbea <orbea@riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/29635
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'x11-apps/mesa-progs')
| -rw-r--r-- | x11-apps/mesa-progs/files/9999-wayland-build.patch | 25 | ||||
| -rw-r--r-- | x11-apps/mesa-progs/mesa-progs-9999.ebuild | 1 |
2 files changed, 0 insertions, 26 deletions
diff --git a/x11-apps/mesa-progs/files/9999-wayland-build.patch b/x11-apps/mesa-progs/files/9999-wayland-build.patch deleted file mode 100644 index 24af53dbc450..000000000000 --- a/x11-apps/mesa-progs/files/9999-wayland-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-PR: -https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/114 - -From 84e12c852937c03218e39048d7a2642d27e5d037 Mon Sep 17 00:00:00 2001 -From: orbea <orbea@riseup.net> -Date: Fri, 10 Feb 2023 07:44:54 -0800 -Subject: [PATCH] meson: dep_libdecor is disabled without wayland - ---- - meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/meson.build b/meson.build -index f93a731d..cd3f6048 100644 ---- a/meson.build -+++ b/meson.build -@@ -77,6 +77,8 @@ if dep_wayland.found() - 'xdg-shell', 'xdg-shell.xml' - ) - dep_libdecor = dependency('libdecor-0', version : '>= 0.1') -+else -+ dep_libdecor = dependency('', required : false) - endif - - dep_threads = dependency('threads') diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild index 50eb10914473..e41db480b343 100644 --- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild @@ -42,7 +42,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/9999-Disable-things-we-don-t-want.patch - "${FILESDIR}"/9999-wayland-build.patch ) pkg_setup() { |