From 0a648c5255c22a6092b8de20ffba9e235299a293 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 3 Mar 2024 23:42:57 +0000
Subject: gentoo auto-resync : 03:03:2024 - 23:42:57
---
media-gfx/Manifest.gz | Bin 37654 -> 37647 bytes
media-gfx/gthumb/Manifest | 11 +-
media-gfx/gthumb/files/3.12.2-date-format.patch | 32 ---
media-gfx/gthumb/files/3.12.2-libraw-0.21.patch | 55 -----
media-gfx/gthumb/files/3.12.2-link-with-x11.patch | 14 --
media-gfx/gthumb/gthumb-3.12.2-r5.ebuild | 113 ---------
media-gfx/gthumb/gthumb-3.12.3.ebuild | 5 +-
media-gfx/gthumb/gthumb-3.12.4.ebuild | 5 +-
media-gfx/gthumb/gthumb-3.12.5.ebuild | 107 ++++++++
media-gfx/renderdoc/Manifest | 13 +-
.../files/renderdoc-1.18-system-compress.patch | 142 -----------
.../files/renderdoc-1.22-r1-system-glslang.patch | 215 -----------------
.../files/renderdoc-1.29-r2-system-compress.patch | 144 -----------
.../files/renderdoc-1.29-r2-system-glslang.patch | 268 ---------------------
media-gfx/renderdoc/renderdoc-1.27-r1.ebuild | 202 ----------------
media-gfx/renderdoc/renderdoc-1.29-r2.ebuild | 202 ----------------
media-gfx/renderdoc/renderdoc-1.30-r1.ebuild | 2 +-
media-gfx/renderdoc/renderdoc-1.30.ebuild | 202 ----------------
18 files changed, 121 insertions(+), 1611 deletions(-)
delete mode 100644 media-gfx/gthumb/files/3.12.2-date-format.patch
delete mode 100644 media-gfx/gthumb/files/3.12.2-libraw-0.21.patch
delete mode 100644 media-gfx/gthumb/files/3.12.2-link-with-x11.patch
delete mode 100644 media-gfx/gthumb/gthumb-3.12.2-r5.ebuild
create mode 100644 media-gfx/gthumb/gthumb-3.12.5.ebuild
delete mode 100644 media-gfx/renderdoc/files/renderdoc-1.18-system-compress.patch
delete mode 100644 media-gfx/renderdoc/files/renderdoc-1.22-r1-system-glslang.patch
delete mode 100644 media-gfx/renderdoc/files/renderdoc-1.29-r2-system-compress.patch
delete mode 100644 media-gfx/renderdoc/files/renderdoc-1.29-r2-system-glslang.patch
delete mode 100644 media-gfx/renderdoc/renderdoc-1.27-r1.ebuild
delete mode 100644 media-gfx/renderdoc/renderdoc-1.29-r2.ebuild
delete mode 100644 media-gfx/renderdoc/renderdoc-1.30.ebuild
(limited to 'media-gfx')
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ac4f6b5d7c83..870dfccd1000 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 2706b7f13703..73f7cda0ede5 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,10 +1,7 @@
-AUX 3.12.2-date-format.patch 1030 BLAKE2B 923887a29732aca84e24813594ed5543fa9561e94c6078a097a1b5d810f4a5207607aad0731539ec2a312930acbdaa234a37e6f85b07a96856d051f09a462250 SHA512 6af14e131aa401d0223879c4a42d615c3c798aac901e702fe93994e31bed5419f7438b05b7b8f739b8d3fea41255daf403da33582114f0c2cd7f94a0f799134f
-AUX 3.12.2-libraw-0.21.patch 2037 BLAKE2B c70fce8223c08c4bb9dafa5c03251314a30e28aa0ce51672f8677fcd55451c29a96f9c92ad3fc383a867435737069e07a701a30dbc2ecbc6b1cdcf69a1a3d8c5 SHA512 eb8b83ca35612abf8433f1ad87b0e50defe4ed3dff3140c6de95df79842f5ecc1f6620d935cdf087a1fd3dd9efc035a2d36c21953f876a7f33933b386d5a6240
-AUX 3.12.2-link-with-x11.patch 419 BLAKE2B f13fc6aead441d83ba55fafd3528a96691c18bca894c5aed6f8e6e1a9084059ec1843668ef8f76697a866979de4d2aaed944ca1729dd6f49d0aa1af316ecb7cc SHA512 667aed7e8dae78b19e0df37ca7f03b565d87a2ffa05a8ef3e3460c3cc491c263ba29781b0659c9a57595e735d38d27ae78f37898011189514ff6a1c237d2b1bb
-DIST gthumb-3.12.2.tar.xz 7585700 BLAKE2B 9fb4fd934975fb775b82cf17028abd6d4ac3c31ee30458c377d36d3af97e59218e621d09768eebec096c64e3d01697bd3080409fd2191c2af29d84c9b53508c1 SHA512 5304b5cfefa4ced6a244db5a6e2880dad4f5a598654c9ea6c7707ddc0a766bdfa108f827a74e400168dbc338e35db519fffb7ac7382e0ee564771d56af3ac97c
DIST gthumb-3.12.3.tar.xz 7604504 BLAKE2B 1db5007a8ea659d59d8ac1b3c3c07c494db719788678588e801560796c0453ccf83abbfb2c9976a7977d19e6fbb2d4540cc5c6675629219e8aba3a031acb61be SHA512 d538d7b306dac391283229147eccc2eef8933107676c0645b08371754d5956729d3747a5b7393366e25967924dee73255fde3d96d3d8e2fc8e7d47a91ceafa94
DIST gthumb-3.12.4.tar.xz 7617528 BLAKE2B 2119692d460d12351273b8e7a9e14cf97c486cf283331f3e5d842cdc3c8b42edf4cdaf87d19962c1a162b956682a7aed34dba7e43130d49603d30441c5f8d12c SHA512 0a15f78e65c7dc8e45b6410052a2ebd480247828e48dbb59d80447d97f2d83a3914fa513b1cf5a9f3a0ce620fb49245a919e3ca5b61cf8a144806c724e14a747
-EBUILD gthumb-3.12.2-r5.ebuild 2720 BLAKE2B ae9e821416a3a5a0bb8cebf87e0a5d6932832e85791455c7d6a9add356c40a562266f7aaf6d2a215b89c2f8a1f0bcf27d29baffc9e3972cd85bb477de7f1f4a2 SHA512 4eab6db2b4ecbd6dfceb92bcf91ba66abefb7fb66c047372e1590c7facfccefd3dff3f8c2f33cdb0c8f597c833644531f96f821486d01c715ce2f672b9e19775
-EBUILD gthumb-3.12.3.ebuild 2589 BLAKE2B 3c05da40aaa31f066fbc732d34270a9d705124f95fb0c2b65e07efe88a47998cd44a49a0619e14893ffeb12e52f482c37d55703b8d5df74a4f1b3324d9df9af0 SHA512 aa27fe962d353698ecc262bc32e4214b601fde10d3fb95a2fbe2b5f6d1c72d6f1fb6a3826713de41edb44a5e22d152179bd754e5c21baf37f52a8323dea664f4
-EBUILD gthumb-3.12.4.ebuild 2593 BLAKE2B 39546c5b8b908dc93d9f0d9e586d96e302c4daca8fb706270a53c26850071401c15d04528b39deefcda9ecc8bcfa898af1ad5b98e9b248c505d28d2c0971de31 SHA512 ab1d91b5e33840e5fb26c4b96e2c48d423bed8d5d86a848f115adc82959df53d2363b732a09f90872a777741505e9ada48b00f798e4ff4e52f5ac01a26d00a87
+DIST gthumb-3.12.5.tar.xz 7618720 BLAKE2B beeac0c62934555dd306ab2319598de7703a10f01498972e7d177286b5f298070274e44977abc665c5e33e996ae884ffb0dfe80641a396425bdf549252c8832d SHA512 acdaef8cddcd68d9dd269bf1c000c50ab8dcb359df18337de243398448407beef1fe6daaeb99e161486a5a5575919779eb7d335c38ea4a4196c2a32d46aa5517
+EBUILD gthumb-3.12.3.ebuild 2617 BLAKE2B 082d1dae7261dc526dad6f2c6694b1fae79a84d9777518e0340e9399d832b2a92f9acc13bebf657fb460bfa4197e3273b45b5cdc30d538e5085a020d9047a3c9 SHA512 b19863634dc2c6c38c693eec3fbd315f4dabe4c759ece8630f45ac6bd80a48890e28b47537472aee8f60e09ec1329062435bb92baac255a719caba16d4c53fd9
+EBUILD gthumb-3.12.4.ebuild 2621 BLAKE2B 8112e5577c316fcea6f09103831de0952f956e9770ecda50dfbd78bc072940ed467a39f572dab6a2766400047148445087a47fd7b3b8638ce41bd91c641a5a9f SHA512 ca6bb57df38bd085fa21049361d78a2dea93e1da980584fb172c8c3f92d3cedbcdcb6424599563a17792824f8d8174e4a2490dba5df14b0a8d258dd3fd65b1e8
+EBUILD gthumb-3.12.5.ebuild 2593 BLAKE2B 39546c5b8b908dc93d9f0d9e586d96e302c4daca8fb706270a53c26850071401c15d04528b39deefcda9ecc8bcfa898af1ad5b98e9b248c505d28d2c0971de31 SHA512 ab1d91b5e33840e5fb26c4b96e2c48d423bed8d5d86a848f115adc82959df53d2363b732a09f90872a777741505e9ada48b00f798e4ff4e52f5ac01a26d00a87
MISC metadata.xml 422 BLAKE2B 7d64079a62a7643024e096edf47d5605ef25c0ea566d2496763f6b18e254c19594317492b77d38f2e841b15160138a958d80d0fce0d399cf527ca53dbe438038 SHA512 d1894107a2dfdb5609c163e90322aece9b49fefc7f3f0f9bd2a4cf25688ab3f63d445ae0cdb688f8ef1defe5b1de9ab5430bfeb7c61fe737bafbfeb9e97b12d2
diff --git a/media-gfx/gthumb/files/3.12.2-date-format.patch b/media-gfx/gthumb/files/3.12.2-date-format.patch
deleted file mode 100644
index 1bc2309abf20..000000000000
--- a/media-gfx/gthumb/files/3.12.2-date-format.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://gitlab.gnome.org/GNOME/gthumb/-/issues/235
-
-From 77b0e6186579fccfca8a516b1399564228e01793 Mon Sep 17 00:00:00 2001
-From: Paolo Bacchilega <paobac@src.gnome.org>
-Date: Wed, 10 Aug 2022 07:49:00 +0200
-Subject: [PATCH] rename series: fixed date format not applied correctly
-
-Closes #235
----
- extensions/rename_series/dlg-rename-series.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/extensions/rename_series/dlg-rename-series.c b/extensions/rename_series/dlg-rename-series.c
-index 60c784fe..cc0612da 100644
---- a/extensions/rename_series/dlg-rename-series.c
-+++ b/extensions/rename_series/dlg-rename-series.c
-@@ -162,6 +162,12 @@ template_eval_cb (TemplateFlags flags,
- char *path;
- GTimeVal timeval;
-
-+ if ((parent_code == 'D') || (parent_code == 'M')) {
-+ /* strftime code, return the code itself. */
-+ _g_string_append_template_code (result, code, args);
-+ return FALSE;
-+ }
-+
- switch (code) {
- case '#':
- text = _g_template_replace_enumerator (args[0], template_data->n);
---
-GitLab
-
diff --git a/media-gfx/gthumb/files/3.12.2-libraw-0.21.patch b/media-gfx/gthumb/files/3.12.2-libraw-0.21.patch
deleted file mode 100644
index 4fef16dc9843..000000000000
--- a/media-gfx/gthumb/files/3.12.2-libraw-0.21.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://bugs.gentoo.org/887769
-https://gitlab.gnome.org/GNOME/gthumb/-/merge_requests/42
-
-From 2133520496afd179702953a5d07aa99b5209f9cf Mon Sep 17 00:00:00 2001
-From: Chris Mayo <aklhfex@gmail.com>
-Date: Wed, 21 Dec 2022 19:21:12 +0000
-Subject: [PATCH] raw: make compatible with LibRaw 0.21.0 release
-
-Memory error callback removed
-https://github.com/LibRaw/LibRaw/blob/979160ff13/Changelog.txt#L127
-
-Typo in LIBRAW_OPTIONS_* flag names fixed
-https://github.com/LibRaw/LibRaw/blob/979160ff13/Changelog.txt#L170
---- a/extensions/raw_files/gth-metadata-provider-raw.c
-+++ b/extensions/raw_files/gth-metadata-provider-raw.c
-@@ -62,7 +62,11 @@ gth_metadata_provider_raw_read (GthMetadataProvider *self,
- if (!_g_mime_type_is_raw (gth_file_data_get_mime_type (file_data)))
- return;
-
-+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
-+ raw_data = libraw_init (LIBRAW_OPTIONS_NO_DATAERR_CALLBACK);
-+#else
- raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
-+#endif
- if (raw_data == NULL)
- goto fatal_error;
-
---- a/extensions/raw_files/main.c
-+++ b/extensions/raw_files/main.c
-@@ -213,7 +213,11 @@ _cairo_image_surface_create_from_raw (GInputStream *istream,
- size_t size;
- GthImage *image = NULL;
-
-+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
-+ raw_data = libraw_init (LIBRAW_OPTIONS_NO_DATAERR_CALLBACK);
-+#else
- raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
-+#endif
- if (raw_data == NULL) {
- _libraw_set_gerror (error, errno);
- goto fatal_error;
-@@ -300,7 +304,11 @@ _cairo_image_surface_create_from_raw (GInputStream *istream,
- if ((original_width != NULL) && (original_height != NULL)) {
- libraw_close (raw_data);
-
-+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
-+ raw_data = libraw_init (LIBRAW_OPTIONS_NO_DATAERR_CALLBACK);
-+#else
- raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
-+#endif
- if (raw_data == NULL)
- goto fatal_error;
-
---
-GitLab
diff --git a/media-gfx/gthumb/files/3.12.2-link-with-x11.patch b/media-gfx/gthumb/files/3.12.2-link-with-x11.patch
deleted file mode 100644
index b5e84710e5e1..000000000000
--- a/media-gfx/gthumb/files/3.12.2-link-with-x11.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://gitlab.gnome.org/GNOME/gthumb/-/issues/222
-
-diff --git a/meson.build b/meson.build
-index 2a970673..4cdc1a5e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -232,6 +232,7 @@ common_deps = [
- dependency('gmodule-2.0'),
- dependency('gio-unix-2.0'),
- dependency('gtk+-3.0', version : gtk_version),
-+ dependency('x11'),
- dependency('libpng'),
- dependency('zlib'),
- dependency('gsettings-desktop-schemas')
diff --git a/media-gfx/gthumb/gthumb-3.12.2-r5.ebuild b/media-gfx/gthumb/gthumb-3.12.2-r5.ebuild
deleted file mode 100644
index 971f6ec08a16..000000000000
--- a/media-gfx/gthumb/gthumb-3.12.2-r5.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gthumb"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="cdr colord exif keyring gstreamer heif jpegxl lcms raw slideshow svg tiff webkit webp"
-
-# libX11 dep is a workaround. See files/3.12.2-link-with-x11.patch
-RDEPEND="
- x11-libs/libX11
-
- >=dev-libs/glib-2.54.0:2
- >=x11-libs/gtk+-3.16.0:3
- exif? ( >=media-gfx/exiv2-0.21:= )
- slideshow? (
- >=media-libs/clutter-1.12.0:1.0
- >=media-libs/clutter-gtk-1:1.0
- )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-plugins/gst-plugins-gtk:1.0
- )
- raw? (
- >=media-libs/libraw-0.14:=
- )
- webkit? (
- >=net-libs/libsoup-2.42.0:2.4
- >=dev-libs/json-glib-0.15.0
- >=net-libs/webkit-gtk-1.10.0:4
- )
- keyring? ( >=app-crypt/libsecret-0.11 )
- cdr? ( >=app-cdr/brasero-3.2.0 )
- svg? ( >=gnome-base/librsvg-2.34:2 )
- webp? ( >=media-libs/libwebp-0.2.0:= )
- jpegxl? ( >=media-libs/libjxl-0.3.0 )
- heif? ( >=media-libs/libheif-1.11:= )
- lcms? ( >=media-libs/lcms-2.6:2 )
- colord? (
- >=x11-misc/colord-1.3
- >=media-libs/lcms-2.6:2
- )
-
- sys-libs/zlib
- media-libs/libjpeg-turbo:=
- tiff? ( media-libs/tiff:= )
- media-libs/libpng:0=
- >=gnome-base/gsettings-desktop-schemas-0.1.4
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- >=dev-libs/appstream-0.14.6
- dev-util/glib-utils
- dev-util/itstool
- app-alternatives/yacc
- app-alternatives/lex
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-link-with-x11.patch
- "${FILESDIR}"/${PV}-libraw-0.21.patch
- "${FILESDIR}"/${PV}-date-format.patch
-)
-
-src_configure() {
- local emesonargs=(
- -Drun-in-place=false
- $(meson_use exif exiv2)
- $(meson_use slideshow clutter)
- $(meson_use gstreamer)
- -Dlibchamplain=false # Upstream still doesn't seem to consider this ready
- $(meson_use colord)
- $(meson_use tiff libtiff)
- $(meson_use webp libwebp)
- $(meson_use jpegxl libjxl)
- $(meson_use heif libheif)
- $(meson_use raw libraw)
- $(meson_use svg librsvg)
- $(meson_use keyring libsecret)
- $(meson_use webkit webservices)
- $(meson_use cdr libbrasero)
- )
-
- # colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms";
- # some of upstream HAVE_COLORD code depends on HAVE_LCMS2
- if use lcms || use colord; then
- emesonargs+=( -Dlcms2=true )
- else
- emesonargs+=( -Dlcms2=false )
- fi
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/media-gfx/gthumb/gthumb-3.12.3.ebuild b/media-gfx/gthumb/gthumb-3.12.3.ebuild
index d32de8c3f4be..69cc7d97c322 100644
--- a/media-gfx/gthumb/gthumb-3.12.3.ebuild
+++ b/media-gfx/gthumb/gthumb-3.12.3.ebuild
@@ -41,7 +41,10 @@ RDEPEND="
cdr? ( >=app-cdr/brasero-3.2.0 )
svg? ( >=gnome-base/librsvg-2.34:2 )
webp? ( >=media-libs/libwebp-0.2.0:= )
- jpegxl? ( >=media-libs/libjxl-0.3.0 )
+ jpegxl? (
+ >=media-libs/libjxl-0.3.0
+ <media-libs/libjxl-0.9
+ )
heif? ( >=media-libs/libheif-1.11:= )
lcms? ( >=media-libs/lcms-2.6:2 )
colord? (
diff --git a/media-gfx/gthumb/gthumb-3.12.4.ebuild b/media-gfx/gthumb/gthumb-3.12.4.ebuild
index ad298e9c5a78..84b1bafa5aeb 100644
--- a/media-gfx/gthumb/gthumb-3.12.4.ebuild
+++ b/media-gfx/gthumb/gthumb-3.12.4.ebuild
@@ -41,7 +41,10 @@ RDEPEND="
cdr? ( >=app-cdr/brasero-3.2.0 )
svg? ( >=gnome-base/librsvg-2.34:2 )
webp? ( >=media-libs/libwebp-0.2.0:= )
- jpegxl? ( >=media-libs/libjxl-0.3.0:= )
+ jpegxl? (
+ >=media-libs/libjxl-0.3.0:=
+ <media-libs/libjxl-0.9
+ )
heif? ( >=media-libs/libheif-1.11:= )
lcms? ( >=media-libs/lcms-2.6:2 )
colord? (
diff --git a/media-gfx/gthumb/gthumb-3.12.5.ebuild b/media-gfx/gthumb/gthumb-3.12.5.ebuild
new file mode 100644
index 000000000000..ad298e9c5a78
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-3.12.5.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gthumb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cdr colord exif keyring gstreamer heif jpegxl lcms raw slideshow svg tiff webkit webp"
+
+# libX11 dep is a workaround. See files/3.12.2-link-with-x11.patch
+RDEPEND="
+ x11-libs/libX11
+
+ >=dev-libs/glib-2.54.0:2
+ >=x11-libs/gtk+-3.16.0:3
+ exif? ( >=media-gfx/exiv2-0.21:= )
+ slideshow? (
+ >=media-libs/clutter-1.12.0:1.0
+ >=media-libs/clutter-gtk-1:1.0
+ )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-plugins/gst-plugins-gtk:1.0
+ )
+ raw? (
+ >=media-libs/libraw-0.14:=
+ )
+ webkit? (
+ >=net-libs/libsoup-2.42.0:2.4
+ >=dev-libs/json-glib-0.15.0
+ >=net-libs/webkit-gtk-1.10.0:4
+ )
+ keyring? ( >=app-crypt/libsecret-0.11 )
+ cdr? ( >=app-cdr/brasero-3.2.0 )
+ svg? ( >=gnome-base/librsvg-2.34:2 )
+ webp? ( >=media-libs/libwebp-0.2.0:= )
+ jpegxl? ( >=media-libs/libjxl-0.3.0:= )
+ heif? ( >=media-libs/libheif-1.11:= )
+ lcms? ( >=media-libs/lcms-2.6:2 )
+ colord? (
+ >=x11-misc/colord-1.3
+ >=media-libs/lcms-2.6:2
+ )
+
+ sys-libs/zlib
+ media-libs/libjpeg-turbo:=
+ tiff? ( media-libs/tiff:= )
+ media-libs/libpng:0=
+ >=gnome-base/gsettings-desktop-schemas-0.1.4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-libs/appstream-0.14.6
+ dev-util/glib-utils
+ dev-util/itstool
+ app-alternatives/yacc
+ app-alternatives/lex
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local emesonargs=(
+ -Drun-in-place=false
+ $(meson_use exif exiv2)
+ $(meson_use slideshow clutter)
+ $(meson_use gstreamer)
+ -Dlibchamplain=false # Upstream still doesn't seem to consider this ready
+ $(meson_use colord)
+ $(meson_use tiff libtiff)
+ $(meson_use webp libwebp)
+ $(meson_use jpegxl libjxl)
+ $(meson_use heif libheif)
+ $(meson_use raw libraw)
+ $(meson_use svg librsvg)
+ $(meson_use keyring libsecret)
+ $(meson_use webkit webservices)
+ $(meson_use cdr libbrasero)
+ )
+
+ # colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms";
+ # some of upstream HAVE_COLORD code depends on HAVE_LCMS2
+ if use lcms || use colord; then
+ emesonargs+=( -Dlcms2=true )
+ else
+ emesonargs+=( -Dlcms2=false )
+ fi
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index 0e5cf150794b..dd75685a7221 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -1,21 +1,10 @@
AUX renderdoc-1.18-analytics-off.patch 2552 BLAKE2B fbea7a5635acee3ae1f79850d0395ead2ef7e062c098b69458d56da0d41fdd1acbfbcc008317320767360450ac2d4b9eb0b026dad68599fe15cd7f1b0dd6e442 SHA512 1c3d73b0a5972f8fc7d6f9595ac032e3fc1709f2eced84f9f90ef35f543b908c9237f08e2933f10427e7facb609cf74d794aea8ecff72c72094ca53e3d1c1c7c
AUX renderdoc-1.18-conditional-pyside.patch 2178 BLAKE2B b79e3fc960b83248a6991c0a5071e08e86e58bc9fd96a64f3d5bcdc392ac9104260c2159848d7def25ce3e6ef77d5003d537a469846ad0b859f5c415b012ae4f SHA512 9962aeb29c70711a922e9da5081ea8e73eb4d2acc055fa95298b4f6ac3bf8ce45ac61fa756948bc6e430d73153e28cdeea25437f057f7c6fe744ab9f53311f8b
-AUX renderdoc-1.18-system-compress.patch 4699 BLAKE2B 4f37058deef1773a4a35b64415a8c8133b232374e419e490d81864ab0d1600b84a6f15a4760530078c489c97f7e12baff331cb845cdaced2fad4b2525987876d SHA512 08c38cbadb4cce24036dd22b185a78d4bca074c0d8caa44c1567aca414bc00a60a8adf73a2430930a620b624689be31f690fee92919d9245211f1189493ea091
AUX renderdoc-1.18-system-flags.patch 845 BLAKE2B 0d4aae31af353b2d199ae66ec999beefa04e2105e6368305bb89359806fa99f4b7048c3d6c30a2787a3125718d3cbd7c97d3381f61f4f98a2e08730b5a22db02 SHA512 bd2692f14729360983f5ca4fb8af87085ab5bd209d82f3cfd99e7753d0dd406905a6280051aa5d1476b863566b385cdc28fbe9120d0d6f5efd78411af15b68ef
-AUX renderdoc-1.22-r1-system-glslang.patch 9341 BLAKE2B df5750dc7a6bf026d3cdbe9791bc270393ef7229b0a314b97350bdeaa5bc26011fdfa671ee8594549c46ae268cbe4563ebbcb1b964da21400cd8852382d3233f SHA512 2dcbc06612533f8266c2b2214a552adc4bca37f4ee9b9c53b2d5245bc7fa75f7e8252d7a35cea04fc418bf55cfa9a239588a062c98f1bc79c4eb6d1a7cf78034
AUX renderdoc-1.27-env-home.patch 438 BLAKE2B a42c86648314382bba7b93ee544fe6d82b4f1ec122c57d7b989475bd442dd7003de8bfd7f467e88693deac6212846103038f48501ffef9eae7d0c38100669eac SHA512 c0b340582de7c23637afa7a95dcd2f3f4c6f28ad9c244c92235e29e428ba40a991cbcac83197a3b52c1c689f4d07ede2fc0c96d4b1b3c67dc94866137a7ce4b7
-AUX renderdoc-1.29-r2-system-compress.patch 4909 BLAKE2B be9705426995ea29ddd7cc79e2888a66c095b938c7d68c020ec27657c9ebe750a25611d0377c07b9833396e5baa1a3ab69beb7dc3bda4f8a43da5dfd2731fd51 SHA512 07cea44a37a58f4941a47ea5bcb2f2f5d2cb9c567f26ff68c4dfce8dbfe07c2b6e7f7de3a261bd0f3680ae406eea776d59adea5bcb5fb8fe8f6d4b7e082bc586
-AUX renderdoc-1.29-r2-system-glslang.patch 11483 BLAKE2B 383a96c0d4c48fc8f9b63e961c38204a6b73feba5976c457890ab9efb6f27ecfcdb6bc5a9f35c58a08b47eacdc626f8fe31ac5471e0e5aafadad74207ada1253 SHA512 847066b316e07ab4351f2d0cd2d2b5c9fe983afbcc40aed2b43a7f67da536fdeaa3ffd981c3dd96de7e4aa4dd86d9897cbd69066b7b837085c04d7f66622a439
AUX renderdoc-1.30-r1-system-compress.patch 4565 BLAKE2B 62ac93b27e7b2fd1962075241cab49acc3971f76b9046a53b0ccdb7707f849aca1c6b4306e07455bdb5e4c9df7f72bba5665a2b3927dfc782722486e2fc152c7 SHA512 7815ea6170583899ee6f48c1aec8a175082208c6b4d1f6c651f3274317c9b9575548f8bb900abc5137309df5448c4643b4fc4e74b367aa18c3dc7dacabba842a
-DIST renderdoc-1.27.tar.gz 47445907 BLAKE2B 58be926cb1282fe5bb2ba195cf71fabd9a5fb5562b5d51a600a98818c8f8bbbd576d8e9c331d3f107cb5db427cd35d242fd3f2f28385a47817fc805f26c47bb4 SHA512 1a6fb0d1942ec403ae1393d6121727aebe6b1eef42e795b03c0e0281bd9ca52fa30b28889a9fe80186a41a1dfbc79f38789b47296bc9b5ba185a19bddd47006f
-DIST renderdoc-1.27.tar.gz.asc 833 BLAKE2B fdfbd1ce367e9757e080e1263651444cd4001fe3d8580672a476923e2cf56b030b568c90566f258b1fd485c15c9d6c5a0b91cfb2c72c831677aa088acb9d4c15 SHA512 a74517747bf19a16d8db241a795e16d1213c745d3ff29236844433937202c91da1e580daac6ec7a54322b215163b0ebf492bef9b77eb603720503e4d3a4849df
-DIST renderdoc-1.29.tar.gz 50717466 BLAKE2B 492b32140c8ad1ab3e753158cfede64ea0b580a2df03094aeeff2d4eac659fbedc62971f65d3fe024e0282de39d5f122b512be2fc6a28ac7abf794b58f116322 SHA512 cbb6a2bd4a7d0c4347296f0e6f49d90b40ba11949e1bc5d777104f067c70999c5b124c44eb180a37363331832afb890f7a83fac521d306dd99cdab92b0d09106
-DIST renderdoc-1.29.tar.gz.asc 833 BLAKE2B b8fe64653153ed09b9e03eb255747d8476f6a6badea0bd834808d4e982750b627dc736b71ddacb96ac82e0136500cdb6c54dc4e7ab49529b2044b8e6512a1822 SHA512 ed7b12376e189df421ba69e6b1c14790045491195bdf1197c7c7a6fdc20d72046ae441d057a01e283a7e2ff85b4b341ec6bf45a28e8b04a9f48b441b42699cfd
DIST renderdoc-1.30.tar.gz 50938458 BLAKE2B 2e9364a8eabca64384e066709c98be8df0ed3c970c173074f9d38eea21d4dc31a50b862818879ccb9f32be8b839643c2d01ddda70d9da8c338c2fc305549eaa9 SHA512 33437f7420d6a79f2b02536ae63bc31537cfab83cdac2d44efdef377e93db7c0c15f2e46ecc67a6ea780f36b162f04d7a00ac3fe5d382fe761fa986664aceb60
DIST renderdoc-1.30.tar.gz.asc 833 BLAKE2B c829329806de5cfc672c2cc976596a5c126cd5f24bef189f6832de8f8f3721461e56688823d562e82eae89792c5fc4a500037cc97c2cce2b762b211a951c1d19 SHA512 f68a04aec4e304df0eba3dcba2876f99182fecff82b6b600d621e48c15bce42c07f20aebc811fd36aff5c04f550a51483af2b499051700a2c5bc936311a534de
DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86
-EBUILD renderdoc-1.27-r1.ebuild 5479 BLAKE2B a34c8c8f7c6a1d5bb6e287059a6fd2a5ec8299f5ef0d84da76d1478978a25211848fd296d8223283c5cf684f5d355e783e9d8053c5cb305bd92ac20f17deddac SHA512 73f36946b49b8b527081fc74ded00d8a70dc11dde6b818f8a0164cb03ebab9aee98f734f4a74f0febd0ceb6dec0e95bac14284f481cd205a28b1154b60e01f2a
-EBUILD renderdoc-1.29-r2.ebuild 5457 BLAKE2B 860dbb13a59b2cdc4c148b1be46998e820cb2fc4811446d755746843ce0252539f82ee9bc82681c54b1de3a9ae01a6dc82368deb3efd8c4cb46a50cc905187de SHA512 789212fd01036635b9cf4f82389016b710b01056c55d2e0154631e514bd1b603f8b2f5ef9fbc53d09a905021cc258fffd927c8ddf33d926d3612e72ceb9b365d
-EBUILD renderdoc-1.30-r1.ebuild 5194 BLAKE2B 21874cc362f0f90ccfa0082b3783b31b39213aa52fce770f75ccaaebf4fed49d25387beed7bce33b1207e70eb15badb51d343df0ad3101e270ce44058f26dd1c SHA512 80b426dd5bc10efe11008723187175dea6f81217e571e5c4bd2b831addf7c31eb06b9f8f4c657aa11068a1dd1d2e56a24189c957e2d6887ce3f7b35d4bf3653b
-EBUILD renderdoc-1.30.ebuild 5498 BLAKE2B 1d32afbc6a0f1e85a1cd9aba8cd2bd43ef926b3015605c259ea660832f2e530431aef2ad68069184b4bebfd3603e5aaa8f659c3352f44e1b6dd28d1d198c65d4 SHA512 3b9cc5b0d61f8a6d832b76b812e3d8242344b5d76fd8a0e566dac39ca04040bc89866d7ed150bc8bd992bd83c5f34ad5670416ab85ac25c610d2fd4fe2d751bc
+EBUILD renderdoc-1.30-r1.ebuild 5193 BLAKE2B 98eb4df6f285186c0a394ae4c9b49c92c3dc2e19fea33a0a4e9a29e7130a39a625980f96180f43b17766168fe1328c57c44bbbb22e48630b887ce7c4b3e09527 SHA512 7cf161cd0b49ac4d89b45618857248d945467f9b332c420a356f2f399c5f73d0e010c995fd9a64ebb708412aa47b5697b97430345bee2922bc29c40740f529ab
MISC metadata.xml 551 BLAKE2B 6b04ab731ce0f9c836b958914e25fcd4a4b76032fd97ba41f6bda742e99a4b7404de51acac99fe4736ba87e488300e94dc1ef7621a780d0a8e453d0fde0430f2 SHA512 a1c2b5260d0265efe2e1294cb88aa1c43618654c7d989cd8f4bd6e919082ea1d37fed4df8a601a702b5b120d5fb5f6658d3e155c5346dacb17249fed629c04d0
diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-system-compress.patch b/media-gfx/renderdoc/files/renderdoc-1.18-system-compress.patch
deleted file mode 100644
index 5b9a7472349b..000000000000
--- a/media-gfx/renderdoc/files/renderdoc-1.18-system-compress.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 8f16c974fc8ec0b286d803490baa6e00a83615cf Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matt@offtopica.uk>
-Date: Sun, 30 Jan 2022 18:07:51 +0000
-Subject: [PATCH 2/3] build: Use system compression libs
-
----
- CMakeLists.txt | 6 +++
- renderdoc/CMakeLists.txt | 48 +------------------
- renderdoc/core/replay_proxy.cpp | 2 +-
- .../driver/shaders/dxbc/dxbc_container.cpp | 2 +-
- renderdoc/serialise/lz4io.h | 2 +-
- 5 files changed, 10 insertions(+), 50 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cb0a2c7f6..0ee4fc629 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -419,6 +419,12 @@ elseif(UNIX)
- endif()
- endif()
-
-+find_package(PkgConfig REQUIRED)
-+find_package(miniz REQUIRED CONFIG)
-+
-+pkg_check_modules(lz4 REQUIRED IMPORTED_TARGET liblz4)
-+pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
-+
- # glslang package does not export a -config.cmake file.
- option(GLSLANG_TARGET_DIR "Absolute path to glslangTargets.cmake directory")
- include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
-diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
-index 927e95fb9..5908be6de 100644
---- a/renderdoc/CMakeLists.txt
-+++ b/renderdoc/CMakeLists.txt
-@@ -218,56 +218,10 @@ set(sources
- 3rdparty/pugixml/pugixml.cpp
- 3rdparty/pugixml/pugixml.hpp
- 3rdparty/pugixml/pugiconfig.hpp
-- 3rdparty/lz4/lz4.c
-- 3rdparty/lz4/lz4.h
- 3rdparty/md5/md5.c
- 3rdparty/md5/md5.h
-- 3rdparty/miniz/miniz.c
-- 3rdparty/miniz/miniz.h
- 3rdparty/superluminal/superluminal.cpp
- 3rdparty/superluminal/superluminal.h
-- 3rdparty/zstd/bitstream.h
-- 3rdparty/zstd/compiler.h
-- 3rdparty/zstd/cpu.h
-- 3rdparty/zstd/debug.c
-- 3rdparty/zstd/debug.h
-- 3rdparty/zstd/entropy_common.c
-- 3rdparty/zstd/error_private.c
-- 3rdparty/zstd/error_private.h
-- 3rdparty/zstd/fse.h
-- 3rdparty/zstd/fse_compress.c
-- 3rdparty/zstd/fse_decompress.c
-- 3rdparty/zstd/hist.c
-- 3rdparty/zstd/hist.h
-- 3rdparty/zstd/huf.h
-- 3rdparty/zstd/huf_compress.c
-- 3rdparty/zstd/huf_decompress.c
-- 3rdparty/zstd/mem.h
-- 3rdparty/zstd/pool.c
-- 3rdparty/zstd/pool.h
-- 3rdparty/zstd/threading.c
-- 3rdparty/zstd/threading.h
-- 3rdparty/zstd/xxhash.c
-- 3rdparty/zstd/xxhash.h
-- 3rdparty/zstd/zstd.h
-- 3rdparty/zstd/zstd_common.c
-- 3rdparty/zstd/zstd_compress.c
-- 3rdparty/zstd/zstd_compress_internal.h
-- 3rdparty/zstd/zstd_decompress.c
-- 3rdparty/zstd/zstd_double_fast.c
-- 3rdparty/zstd/zstd_double_fast.h
-- 3rdparty/zstd/zstd_errors.h
-- 3rdparty/zstd/zstd_fast.c
-- 3rdparty/zstd/zstd_fast.h
-- 3rdparty/zstd/zstd_internal.h
-- 3rdparty/zstd/zstd_lazy.c
-- 3rdparty/zstd/zstd_lazy.h
-- 3rdparty/zstd/zstd_ldm.c
-- 3rdparty/zstd/zstd_ldm.h
-- 3rdparty/zstd/zstd_opt.c
-- 3rdparty/zstd/zstd_opt.h
-- 3rdparty/zstd/zstdmt_compress.c
-- 3rdparty/zstd/zstdmt_compress.h
- 3rdparty/stb/stb_image.h
- 3rdparty/stb/stb_image_write.h
- 3rdparty/stb/stb_image_resize.h
-@@ -580,7 +534,7 @@ endif()
- add_library(renderdoc SHARED ${renderdoc_objects})
- target_compile_definitions(renderdoc ${RDOC_DEFINITIONS})
- target_include_directories(renderdoc ${RDOC_INCLUDES})
--target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang SPIRV)
-+target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang miniz::miniz PkgConfig::lz4 PkgConfig::zstd SPIRV)
-
- add_dependencies(renderdoc renderdoc_libentry)
-
-diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp
-index dea1e86cf..c9362e797 100644
---- a/renderdoc/core/replay_proxy.cpp
-+++ b/renderdoc/core/replay_proxy.cpp
-@@ -25,7 +25,7 @@
-
- #include "replay_proxy.h"
- #include <list>
--#include "lz4/lz4.h"
-+#include <lz4.h>
- #include "replay/dummy_driver.h"
- #include "serialise/lz4io.h"
-
-diff --git a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp
-index ede1fdeb7..0c8fd4dfe 100644
---- a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp
-+++ b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp
-@@ -29,7 +29,7 @@
- #include "common/common.h"
- #include "core/settings.h"
- #include "driver/shaders/dxil/dxil_bytecode.h"
--#include "lz4/lz4.h"
-+#include <lz4.h>
- #include "md5/md5.h"
- #include "serialise/serialiser.h"
- #include "strings/string_utils.h"
-diff --git a/renderdoc/serialise/lz4io.h b/renderdoc/serialise/lz4io.h
-index 199fbbbc1..80fdf94f2 100644
---- a/renderdoc/serialise/lz4io.h
-+++ b/renderdoc/serialise/lz4io.h
-@@ -24,7 +24,7 @@
-
- #pragma once
-
--#include "lz4/lz4.h"
-+#include <lz4.h>
- #include "streamio.h"
-
- class LZ4Compressor : public Compressor
---
-2.35.1
-
diff --git a/media-gfx/renderdoc/files/renderdoc-1.22-r1-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.22-r1-system-glslang.patch
deleted file mode 100644
index 7b5b88a53625..000000000000
--- a/media-gfx/renderdoc/files/renderdoc-1.22-r1-system-glslang.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 857c848b9..0423b3e3c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -448,6 +448,17 @@ elseif(UNIX)
- endif()
- endif()
-
-+# glslang package does not export a -config.cmake file.
-+option(GLSLANG_TARGET_DIR "Absolute path to glslangTargets.cmake directory")
-+include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
-+include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake")
-+include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
-+include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake")
-+include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake")
-+if(NOT TARGET glslang OR NOT TARGET SPIRV)
-+ message(FATAL_ERROR "glslang or SPIRV target not found")
-+endif()
-+
- add_subdirectory(renderdoc)
-
- # these variables are handled within the CMakeLists.txt in qrenderdoc,
-diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
-index a26438d76..9ee043959 100644
---- a/renderdoc/CMakeLists.txt
-+++ b/renderdoc/CMakeLists.txt
-@@ -601,7 +601,7 @@ endif()
- add_library(renderdoc SHARED ${renderdoc_objects})
- target_compile_definitions(renderdoc ${RDOC_DEFINITIONS})
- target_include_directories(renderdoc ${RDOC_INCLUDES})
--target_link_libraries(renderdoc ${RDOC_LIBRARIES})
-+target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang SPIRV)
-
- add_dependencies(renderdoc renderdoc_libentry)
-
-diff --git a/renderdoc/data/glsl_shaders.cpp b/renderdoc/data/glsl_shaders.cpp
-index dd79c1f89..5295fb05e 100644
---- a/renderdoc/data/glsl_shaders.cpp
-+++ b/renderdoc/data/glsl_shaders.cpp
-@@ -26,7 +26,7 @@
- #include "common/common.h"
- #include "common/formatting.h"
- #include "driver/shaders/spirv/glslang_compile.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Public/ShaderLang.h>
- #include "os/os_specific.h"
-
- #define GLSL_HEADERS(HEADER) \
-diff --git a/renderdoc/driver/gl/gl_shader_refl.cpp b/renderdoc/driver/gl/gl_shader_refl.cpp
-index dfd871f32..57b5aeca6 100644
---- a/renderdoc/driver/gl/gl_shader_refl.cpp
-+++ b/renderdoc/driver/gl/gl_shader_refl.cpp
-@@ -26,7 +26,7 @@
- #include <algorithm>
- #include <functional>
- #include "driver/shaders/spirv/glslang_compile.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Public/ShaderLang.h>
- #include "gl_driver.h"
-
- template <>
-diff --git a/renderdoc/driver/shaders/spirv/CMakeLists.txt b/renderdoc/driver/shaders/spirv/CMakeLists.txt
-index e5f2f4113..79525b5f6 100644
---- a/renderdoc/driver/shaders/spirv/CMakeLists.txt
-+++ b/renderdoc/driver/shaders/spirv/CMakeLists.txt
-@@ -1,91 +1,3 @@
--set(glslang_dir ${RDOC_SOURCE_DIR}/3rdparty/glslang)
--set(glslang_sources
-- ${glslang_dir}/OGLCompilersDLL/InitializeDll.cpp
-- ${glslang_dir}/OGLCompilersDLL/InitializeDll.h
-- ${glslang_dir}/SPIRV/GlslangToSpv.cpp
-- ${glslang_dir}/SPIRV/GlslangToSpv.h
-- ${glslang_dir}/SPIRV/GLSL.std.450.h
-- ${glslang_dir}/SPIRV/GLSL.ext.AMD.h
-- ${glslang_dir}/SPIRV/GLSL.ext.EXT.h
-- ${glslang_dir}/SPIRV/GLSL.ext.KHR.h
-- ${glslang_dir}/SPIRV/GLSL.ext.NV.h
-- ${glslang_dir}/SPIRV/hex_float.h
-- ${glslang_dir}/SPIRV/InReadableOrder.cpp
-- ${glslang_dir}/SPIRV/Logger.cpp
-- ${glslang_dir}/SPIRV/Logger.h
-- ${glslang_dir}/SPIRV/SpvBuilder.cpp
-- ${glslang_dir}/SPIRV/SpvBuilder.h
-- ${glslang_dir}/SPIRV/SpvTools.cpp
-- ${glslang_dir}/SPIRV/SpvTools.h
-- ${glslang_dir}/SPIRV/SpvPostProcess.cpp
-- ${glslang_dir}/SPIRV/spvIR.h
-- ${glslang_dir}/glslang/GenericCodeGen/CodeGen.cpp
-- ${glslang_dir}/glslang/GenericCodeGen/Link.cpp
-- ${glslang_dir}/glslang/Include/arrays.h
-- ${glslang_dir}/glslang/Include/BaseTypes.h
-- ${glslang_dir}/glslang/Include/Common.h
-- ${glslang_dir}/glslang/Include/ConstantUnion.h
-- ${glslang_dir}/glslang/Include/InfoSink.h
-- ${glslang_dir}/glslang/Include/InitializeGlobals.h
-- ${glslang_dir}/glslang/Include/intermediate.h
-- ${glslang_dir}/glslang/Include/PoolAlloc.h
-- ${glslang_dir}/glslang/Include/ResourceLimits.h
-- ${glslang_dir}/glslang/Include/revision.h
-- ${glslang_dir}/glslang/Include/ShHandle.h
-- ${glslang_dir}/glslang/Include/Types.h
-- ${glslang_dir}/glslang/MachineIndependent/Constant.cpp
-- ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp
-- ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp.h
-- ${glslang_dir}/glslang/MachineIndependent/gl_types.h
-- ${glslang_dir}/glslang/MachineIndependent/iomapper.cpp
-- ${glslang_dir}/glslang/MachineIndependent/iomapper.h
-- ${glslang_dir}/glslang/MachineIndependent/gl_types.h
-- ${glslang_dir}/glslang/MachineIndependent/InfoSink.cpp
-- ${glslang_dir}/glslang/MachineIndependent/Initialize.cpp
-- ${glslang_dir}/glslang/MachineIndependent/Initialize.h
-- ${glslang_dir}/glslang/MachineIndependent/Intermediate.cpp
-- ${glslang_dir}/glslang/MachineIndependent/intermOut.cpp
-- ${glslang_dir}/glslang/MachineIndependent/IntermTraverse.cpp
-- ${glslang_dir}/glslang/MachineIndependent/limits.cpp
-- ${glslang_dir}/glslang/MachineIndependent/linkValidate.cpp
-- ${glslang_dir}/glslang/MachineIndependent/LiveTraverser.h
-- ${glslang_dir}/glslang/MachineIndependent/localintermediate.h
-- ${glslang_dir}/glslang/MachineIndependent/parseConst.cpp
-- ${glslang_dir}/glslang/MachineIndependent/ParseContextBase.cpp
-- ${glslang_dir}/glslang/MachineIndependent/ParseHelper.cpp
-- ${glslang_dir}/glslang/MachineIndependent/ParseHelper.h
-- ${glslang_dir}/glslang/MachineIndependent/PoolAlloc.cpp
-- ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.cpp
-- ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.h
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpAtom.cpp
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.cpp
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.h
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/Pp.cpp
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpScanner.cpp
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.cpp
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.h
-- ${glslang_dir}/glslang/MachineIndependent/reflection.cpp
-- ${glslang_dir}/glslang/MachineIndependent/reflection.h
-- ${glslang_dir}/glslang/MachineIndependent/RemoveTree.cpp
-- ${glslang_dir}/glslang/MachineIndependent/RemoveTree.h
-- ${glslang_dir}/glslang/MachineIndependent/ScanContext.h
-- ${glslang_dir}/glslang/MachineIndependent/Scan.cpp
-- ${glslang_dir}/glslang/MachineIndependent/Scan.h
-- ${glslang_dir}/glslang/MachineIndependent/ShaderLang.cpp
-- ${glslang_dir}/glslang/MachineIndependent/SymbolTable.cpp
-- ${glslang_dir}/glslang/MachineIndependent/SymbolTable.h
-- ${glslang_dir}/glslang/MachineIndependent/Versions.cpp
-- ${glslang_dir}/glslang/MachineIndependent/Versions.h
-- ${glslang_dir}/glslang/MachineIndependent/attribute.cpp
-- ${glslang_dir}/glslang/MachineIndependent/attribute.h
-- ${glslang_dir}/glslang/OSDependent/osinclude.h
-- ${glslang_dir}/glslang/Public/ShaderLang.h)
--
--if(UNIX)
-- list(APPEND glslang_sources
-- ${glslang_dir}/glslang/OSDependent/Unix/ossource.cpp)
--endif()
--
- set(sources
- glslang_compile.cpp
- glslang_compile.h
-@@ -108,8 +20,7 @@ set(sources
- spirv_processor.h
- spirv_disassemble.cpp
- spirv_stringise.cpp
-- var_dispatch_helpers.h
-- ${glslang_sources})
-+ var_dispatch_helpers.h)
-
- add_definitions(-DAMD_EXTENSIONS)
- add_definitions(-DNV_EXTENSIONS)
-diff --git a/renderdoc/driver/shaders/spirv/glslang_compile.cpp b/renderdoc/driver/shaders/spirv/glslang_compile.cpp
-index e2f1f2df8..fc0adab99 100644
---- a/renderdoc/driver/shaders/spirv/glslang_compile.cpp
-+++ b/renderdoc/driver/shaders/spirv/glslang_compile.cpp
-@@ -29,8 +29,8 @@
- #undef min
- #undef max
-
--#include "glslang/glslang/Include/Types.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Include/Types.h>
-+#include <glslang/Public/ShaderLang.h>
-
- static bool glslang_inited = false;
- rdcarray<glslang::TShader *> *allocatedShaders = NULL;
-@@ -129,7 +129,16 @@ static TBuiltInResource DefaultResources = {
- /*.maxTaskWorkGroupSizeY_NV =*/1,
- /*.maxTaskWorkGroupSizeZ_NV =*/1,
- /*.maxMeshViewCountNV =*/4,
--
-+ /*.maxMeshOutputVerticesEXT = */ 256,
-+ /*.maxMeshOutputPrimitivesEXT = */ 256,
-+ /*.maxMeshWorkGroupSizeX_EXT = */ 128,
-+ /*.maxMeshWorkGroupSizeY_EXT = */ 128,
-+ /*.maxMeshWorkGroupSizeZ_EXT = */ 128,
-+ /*.maxTaskWorkGroupSizeX_EXT = */ 128,
-+ /*.maxTaskWorkGroupSizeY_EXT = */ 128,
-+ /*.maxTaskWorkGroupSizeZ_EXT = */ 128,
-+ /*.maxMeshViewCountEXT = */ 4,
-+ /*.maxDualSourceDrawBuffersEXT =*/1,
- /*.limits*/
- {
- /*.limits.nonInductiveForLoops =*/1,
-diff --git a/renderdoc/driver/shaders/spirv/spirv_compile.cpp b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-index 8fbf2f16a..49bd322f4 100644
---- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-+++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-@@ -31,8 +31,8 @@
- #undef min
- #undef max
-
--#include "glslang/SPIRV/GlslangToSpv.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/SPIRV/GlslangToSpv.h>
-+#include <glslang/Public/ShaderLang.h>
-
- rdcstr rdcspv::Compile(const rdcspv::CompilationSettings &settings, const rdcarray<rdcstr> &sources,
- rdcarray<uint32_t> &spirv)
diff --git a/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-compress.patch b/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-compress.patch
deleted file mode 100644
index 8f793562bcc7..000000000000
--- a/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-compress.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 8f16c974fc8ec0b286d803490baa6e00a83615cf Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matt@offtopica.uk>
-Date: Sun, 30 Jan 2022 18:07:51 +0000
-Subject: [PATCH 2/3] build: Use system compression libs
-
----
- CMakeLists.txt | 6 +++
- renderdoc/CMakeLists.txt | 48 +------------------
- renderdoc/core/replay_proxy.cpp | 2 +-
- .../driver/shaders/dxbc/dxbc_container.cpp | 2 +-
- renderdoc/serialise/lz4io.h | 2 +-
- 5 files changed, 10 insertions(+), 50 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cb0a2c7f6..0ee4fc629 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -419,6 +419,12 @@ elseif(UNIX)
- endif()
- endif()
-
-+find_package(PkgConfig REQUIRED)
-+find_package(miniz REQUIRED CONFIG)
-+
-+pkg_check_modules(lz4 REQUIRED IMPORTED_TARGET liblz4)
-+pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
-+
- # glslang package does not export a -config.cmake file.
- option(GLSLANG_TARGET_DIR "Absolute path to glslangTargets.cmake directory")
- include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
-diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
-index 927e95fb9..5908be6de 100644
---- a/renderdoc/CMakeLists.txt
-+++ b/renderdoc/CMakeLists.txt
-@@ -218,56 +218,10 @@ set(sources
- 3rdparty/pugixml/pugixml.cpp
- 3rdparty/pugixml/pugixml.hpp
- 3rdparty/pugixml/pugiconfig.hpp
-- 3rdparty/lz4/lz4.c
-- 3rdparty/lz4/lz4.h
- 3rdparty/md5/md5.c
- 3rdparty/md5/md5.h
-- 3rdparty/miniz/miniz.c
-- 3rdparty/miniz/miniz.h
- 3rdparty/superluminal/superluminal.cpp
- 3rdparty/superluminal/superluminal.h
-- 3rdparty/zstd/bitstream.h
-- 3rdparty/zstd/compiler.h
-- 3rdparty/zstd/cpu.h
-- 3rdparty/zstd/debug.c
-- 3rdparty/zstd/debug.h
-- 3rdparty/zstd/entropy_common.c
-- 3rdparty/zstd/error_private.c
-- 3rdparty/zstd/error_private.h
-- 3rdparty/zstd/fse.h
-- 3rdparty/zstd/fse_compress.c
-- 3rdparty/zstd/fse_decompress.c
-- 3rdparty/zstd/hist.c
-- 3rdparty/zstd/hist.h
-- 3rdparty/zstd/huf.h
-- 3rdparty/zstd/huf_compress.c
-- 3rdparty/zstd/huf_decompress.c
-- 3rdparty/zstd/mem.h
-- 3rdparty/zstd/pool.c
-- 3rdparty/zstd/pool.h
-- 3rdparty/zstd/threading.c
-- 3rdparty/zstd/threading.h
-- 3rdparty/zstd/xxhash.c
-- 3rdparty/zstd/xxhash.h
-- 3rdparty/zstd/zstd.h
-- 3rdparty/zstd/zstd_common.c
-- 3rdparty/zstd/zstd_compress.c
-- 3rdparty/zstd/zstd_compress_internal.h
-- 3rdparty/zstd/zstd_decompress.c
-- 3rdparty/zstd/zstd_double_fast.c
-- 3rdparty/zstd/zstd_double_fast.h
-- 3rdparty/zstd/zstd_errors.h
-- 3rdparty/zstd/zstd_fast.c
-- 3rdparty/zstd/zstd_fast.h
-- 3rdparty/zstd/zstd_internal.h
-- 3rdparty/zstd/zstd_lazy.c
-- 3rdparty/zstd/zstd_lazy.h
-- 3rdparty/zstd/zstd_ldm.c
-- 3rdparty/zstd/zstd_ldm.h
-- 3rdparty/zstd/zstd_opt.c
-- 3rdparty/zstd/zstd_opt.h
-- 3rdparty/zstd/zstdmt_compress.c
-- 3rdparty/zstd/zstdmt_compress.h
- 3rdparty/stb/stb_image.h
- 3rdparty/stb/stb_image_write.h
- 3rdparty/stb/stb_image_resize.h
-@@ -580,9 +534,9 @@ endif()
- add_library(renderdoc SHARED ${renderdoc_objects})
- target_compile_definitions(renderdoc ${RDOC_DEFINITIONS})
- target_include_directories(renderdoc ${RDOC_INCLUDES})
--target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang glslang-default-resource-limits SPIRV)
-+target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang glslang-default-resource-limits miniz::miniz PkgConfig::lz4 PkgConfig::zstd SPIRV)
- # Newer versions of glslang require C++17 for std::variant
- set_target_properties(renderdoc PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON)
-
- add_dependencies(renderdoc renderdoc_libentry)
-
-diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp
-index dea1e86cf..c9362e797 100644
---- a/renderdoc/core/replay_proxy.cpp
-+++ b/renderdoc/core/replay_proxy.cpp
-@@ -25,7 +25,7 @@
-
- #include "replay_proxy.h"
- #include <list>
--#include "lz4/lz4.h"
-+#include <lz4.h>
- #include "replay/dummy_driver.h"
- #include "serialise/lz4io.h"
-
-diff --git a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp
-index ede1fdeb7..0c8fd4dfe 100644
---- a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp
-+++ b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp
-@@ -29,7 +29,7 @@
- #include "common/common.h"
- #include "core/settings.h"
- #include "driver/shaders/dxil/dxil_bytecode.h"
--#include "lz4/lz4.h"
-+#include <lz4.h>
- #include "md5/md5.h"
- #include "serialise/serialiser.h"
- #include "strings/string_utils.h"
-diff --git a/renderdoc/serialise/lz4io.h b/renderdoc/serialise/lz4io.h
-index 199fbbbc1..80fdf94f2 100644
---- a/renderdoc/serialise/lz4io.h
-+++ b/renderdoc/serialise/lz4io.h
-@@ -24,7 +24,7 @@
-
- #pragma once
-
--#include "lz4/lz4.h"
-+#include <lz4.h>
- #include "streamio.h"
-
- class LZ4Compressor : public Compressor
---
-2.35.1
-
diff --git a/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-glslang.patch
deleted file mode 100644
index 287917feb549..000000000000
--- a/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-glslang.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-From d889c250f9e500c84f34533398e82aa9e5d5a0ae Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matthew@gentoo.org>
-Date: Thu, 2 Nov 2023 18:43:42 +0000
-Subject: [PATCH] system glslang
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -383,7 +383,7 @@
- endif()
-
- if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
- if(ENABLE_GGP)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gline-tables-only -fno-omit-frame-pointer")
-@@ -469,6 +469,17 @@ elseif(UNIX)
- endif()
- endif()
-
-+# glslang package does not export a -config.cmake file.
-+option(GLSLANG_TARGET_DIR "Absolute path to glslangTargets.cmake directory")
-+include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
-+include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake")
-+include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
-+include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake")
-+include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake")
-+if(NOT TARGET glslang OR NOT TARGET SPIRV)
-+ message(FATAL_ERROR "glslang or SPIRV target not found")
-+endif()
-+
- add_subdirectory(renderdoc)
-
- # these variables are handled within the CMakeLists.txt in qrenderdoc,
---- a/renderdoc/CMakeLists.txt
-+++ b/renderdoc/CMakeLists.txt
-@@ -604,7 +604,9 @@ endif()
- add_library(renderdoc SHARED ${renderdoc_objects})
- target_compile_definitions(renderdoc ${RDOC_DEFINITIONS})
- target_include_directories(renderdoc ${RDOC_INCLUDES})
--target_link_libraries(renderdoc ${RDOC_LIBRARIES})
-+target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang glslang-default-resource-limits SPIRV)
-+# Newer versions of glslang require C++17 for std::variant
-+set_target_properties(renderdoc PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON)
-
- add_dependencies(renderdoc renderdoc_libentry)
-
---- a/renderdoc/data/glsl_shaders.cpp
-+++ b/renderdoc/data/glsl_shaders.cpp
-@@ -26,8 +26,8 @@
- #include "common/common.h"
- #include "common/formatting.h"
- #include "driver/shaders/spirv/glslang_compile.h"
--#include "glslang/glslang/Public/ResourceLimits.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Public/ResourceLimits.h>
-+#include <glslang/Public/ShaderLang.h>
- #include "os/os_specific.h"
-
- #define GLSL_HEADERS(HEADER) \
---- a/renderdoc/driver/gl/gl_shader_refl.cpp
-+++ b/renderdoc/driver/gl/gl_shader_refl.cpp
-@@ -26,8 +26,8 @@
- #include <algorithm>
- #include <functional>
- #include "driver/shaders/spirv/glslang_compile.h"
--#include "glslang/glslang/Public/ResourceLimits.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Public/ResourceLimits.h>
-+#include <glslang/Public/ShaderLang.h>
- #include "gl_driver.h"
-
- template <>
---- a/renderdoc/driver/shaders/spirv/CMakeLists.txt
-+++ b/renderdoc/driver/shaders/spirv/CMakeLists.txt
-@@ -1,98 +1,3 @@
--set(glslang_dir ${RDOC_SOURCE_DIR}/3rdparty/glslang)
--set(glslang_sources
-- ${glslang_dir}/OGLCompilersDLL/InitializeDll.cpp
-- ${glslang_dir}/OGLCompilersDLL/InitializeDll.h
-- ${glslang_dir}/SPIRV/GlslangToSpv.cpp
-- ${glslang_dir}/SPIRV/GlslangToSpv.h
-- ${glslang_dir}/SPIRV/GLSL.std.450.h
-- ${glslang_dir}/SPIRV/GLSL.ext.ARM.h
-- ${glslang_dir}/SPIRV/GLSL.ext.AMD.h
-- ${glslang_dir}/SPIRV/GLSL.ext.EXT.h
-- ${glslang_dir}/SPIRV/GLSL.ext.KHR.h
-- ${glslang_dir}/SPIRV/GLSL.ext.NV.h
-- ${glslang_dir}/SPIRV/NonSemanticDebugPrintf.h
-- ${glslang_dir}/SPIRV/NonSemanticShaderDebugInfo100.h
-- ${glslang_dir}/SPIRV/hex_float.h
-- ${glslang_dir}/SPIRV/InReadableOrder.cpp
-- ${glslang_dir}/SPIRV/Logger.cpp
-- ${glslang_dir}/SPIRV/Logger.h
-- ${glslang_dir}/SPIRV/SpvBuilder.cpp
-- ${glslang_dir}/SPIRV/SpvBuilder.h
-- ${glslang_dir}/SPIRV/SpvTools.cpp
-- ${glslang_dir}/SPIRV/SpvTools.h
-- ${glslang_dir}/SPIRV/SpvPostProcess.cpp
-- ${glslang_dir}/SPIRV/spvIR.h
-- ${glslang_dir}/glslang/GenericCodeGen/CodeGen.cpp
-- ${glslang_dir}/glslang/GenericCodeGen/Link.cpp
-- ${glslang_dir}/glslang/Include/arrays.h
-- ${glslang_dir}/glslang/Include/BaseTypes.h
-- ${glslang_dir}/glslang/Include/Common.h
-- ${glslang_dir}/glslang/Include/ConstantUnion.h
-- ${glslang_dir}/glslang/Include/InfoSink.h
-- ${glslang_dir}/glslang/Include/InitializeGlobals.h
-- ${glslang_dir}/glslang/Include/intermediate.h
-- ${glslang_dir}/glslang/Include/PoolAlloc.h
-- ${glslang_dir}/glslang/Include/ResourceLimits.h
-- ${glslang_dir}/glslang/Include/SpirvIntrinsics.h
-- ${glslang_dir}/glslang/Include/revision.h
-- ${glslang_dir}/glslang/Include/ShHandle.h
-- ${glslang_dir}/glslang/Include/Types.h
-- ${glslang_dir}/glslang/MachineIndependent/Constant.cpp
-- ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp
-- ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp.h
-- ${glslang_dir}/glslang/MachineIndependent/gl_types.h
-- ${glslang_dir}/glslang/MachineIndependent/iomapper.cpp
-- ${glslang_dir}/glslang/MachineIndependent/iomapper.h
-- ${glslang_dir}/glslang/MachineIndependent/gl_types.h
-- ${glslang_dir}/glslang/MachineIndependent/InfoSink.cpp
-- ${glslang_dir}/glslang/MachineIndependent/Initialize.cpp
-- ${glslang_dir}/glslang/MachineIndependent/Initialize.h
-- ${glslang_dir}/glslang/MachineIndependent/Intermediate.cpp
-- ${glslang_dir}/glslang/MachineIndependent/intermOut.cpp
-- ${glslang_dir}/glslang/MachineIndependent/IntermTraverse.cpp
-- ${glslang_dir}/glslang/MachineIndependent/limits.cpp
-- ${glslang_dir}/glslang/MachineIndependent/linkValidate.cpp
-- ${glslang_dir}/glslang/MachineIndependent/LiveTraverser.h
-- ${glslang_dir}/glslang/MachineIndependent/localintermediate.h
-- ${glslang_dir}/glslang/MachineIndependent/parseConst.cpp
-- ${glslang_dir}/glslang/MachineIndependent/ParseContextBase.cpp
-- ${glslang_dir}/glslang/MachineIndependent/ParseHelper.cpp
-- ${glslang_dir}/glslang/MachineIndependent/ParseHelper.h
-- ${glslang_dir}/glslang/MachineIndependent/PoolAlloc.cpp
-- ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.cpp
-- ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.h
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpAtom.cpp
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.cpp
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.h
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/Pp.cpp
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpScanner.cpp
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.cpp
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.h
-- ${glslang_dir}/glslang/MachineIndependent/reflection.cpp
-- ${glslang_dir}/glslang/MachineIndependent/reflection.h
-- ${glslang_dir}/glslang/MachineIndependent/RemoveTree.cpp
-- ${glslang_dir}/glslang/MachineIndependent/RemoveTree.h
-- ${glslang_dir}/glslang/MachineIndependent/ScanContext.h
-- ${glslang_dir}/glslang/MachineIndependent/Scan.cpp
-- ${glslang_dir}/glslang/MachineIndependent/Scan.h
-- ${glslang_dir}/glslang/MachineIndependent/ShaderLang.cpp
-- ${glslang_dir}/glslang/MachineIndependent/SpirvIntrinsics.cpp
-- ${glslang_dir}/glslang/MachineIndependent/SymbolTable.cpp
-- ${glslang_dir}/glslang/MachineIndependent/SymbolTable.h
-- ${glslang_dir}/glslang/MachineIndependent/Versions.cpp
-- ${glslang_dir}/glslang/MachineIndependent/Versions.h
-- ${glslang_dir}/glslang/MachineIndependent/attribute.cpp
-- ${glslang_dir}/glslang/MachineIndependent/attribute.h
-- ${glslang_dir}/glslang/OSDependent/osinclude.h
-- ${glslang_dir}/glslang/ResourceLimits/ResourceLimits.cpp
-- ${glslang_dir}/glslang/Public/ShaderLang.h
-- ${glslang_dir}/glslang/Public/ResourceLimits.h)
--
--if(UNIX)
-- list(APPEND glslang_sources
-- ${glslang_dir}/glslang/OSDependent/Unix/ossource.cpp)
--endif()
--
- set(sources
- glslang_compile.cpp
- glslang_compile.h
-@@ -115,38 +20,20 @@ set(sources
- spirv_processor.h
- spirv_disassemble.cpp
- spirv_stringise.cpp
-- var_dispatch_helpers.h
-- ${glslang_sources})
-+ var_dispatch_helpers.h)
-
- add_definitions(-DAMD_EXTENSIONS)
- add_definitions(-DNV_EXTENSIONS)
-
--set_property(SOURCE ${glslang_sources}
-- PROPERTY COMPILE_FLAGS "-Wno-ignored-qualifiers -Wno-strict-aliasing -Wno-unreachable-code-break")
--
--# GCC 7.0 and above needs -Wno-implicit-fallthrough
--if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.9)
-- set_property(SOURCE ${glslang_sources}
-- APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-implicit-fallthrough")
--endif()
--
- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-- set_property(SOURCE ${glslang_sources}
-- APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unknown-warning-option -Wno-shadow -Wno-shorten-64-to-32")
--
- set_property(SOURCE
- spirv_debug.cpp
- spirv_debug_glsl450.cpp
- spirv_debug_setup.cpp
- spirv_processor.cpp
- APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-shadow -Wno-shorten-64-to-32")
--
-- if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.9)
-- set_property(SOURCE ${glslang_dir}/glslang/MachineIndependent/iomapper.cpp
-- APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-deprecated-copy")
-- endif()
- endif()
-
- add_library(rdoc_spirv OBJECT ${sources})
- target_compile_definitions(rdoc_spirv ${RDOC_DEFINITIONS})
--target_include_directories(rdoc_spirv ${RDOC_INCLUDES} ${glslang_dir})
-+target_include_directories(rdoc_spirv ${RDOC_INCLUDES})
---- a/renderdoc/driver/shaders/spirv/glslang_compile.cpp
-+++ b/renderdoc/driver/shaders/spirv/glslang_compile.cpp
-@@ -29,9 +29,9 @@
- #undef min
- #undef max
-
--#include "glslang/glslang/Include/Types.h"
--#include "glslang/glslang/Public/ResourceLimits.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Public/ResourceLimits.h>
-+#include <glslang/Include/Types.h>
-+#include <glslang/Public/ShaderLang.h>
-
- static bool glslang_inited = false;
- rdcarray<glslang::TShader *> *allocatedShaders = NULL;
---- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-+++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-@@ -31,9 +31,9 @@
- #undef min
- #undef max
-
--#include "glslang/SPIRV/GlslangToSpv.h"
--#include "glslang/glslang/Public/ResourceLimits.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Public/ResourceLimits.h>
-+#include <glslang/SPIRV/GlslangToSpv.h>
-+#include <glslang/Public/ShaderLang.h>
-
- rdcstr rdcspv::Compile(const rdcspv::CompilationSettings &settings, const rdcarray<rdcstr> &sources,
- rdcarray<uint32_t> &spirv)
---- a/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt
-+++ b/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt
-@@ -1,11 +1,3 @@
--# Build as C++14 for the python bindings template-fu
--if (CMAKE_VERSION VERSION_LESS "3.1")
-- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
--else ()
-- set (CMAKE_CXX_STANDARD 14)
-- set (CMAKE_CXX_STANDARD_REQUIRED ON)
--endif ()
--
- # include paths for qrenderdoc, the internal renderdoc API, and Python
- set(MODULE_INCLUDES
- PRIVATE ${CMAKE_SOURCE_DIR}/qrenderdoc
-@@ -82,3 +74,5 @@
- # Make sure we build after the wrappers are generated
- add_dependencies(_renderdoc swig-bindings)
- add_dependencies(_qrenderdoc swig-bindings)
-+
-+set_target_properties(_renderdoc _qrenderdoc PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
---
-2.42.0
-
diff --git a/media-gfx/renderdoc/renderdoc-1.27-r1.ebuild b/media-gfx/renderdoc/renderdoc-1.27-r1.ebuild
deleted file mode 100644
index e037efac7fef..000000000000
--- a/media-gfx/renderdoc/renderdoc-1.27-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# The swig fork is required for compatibility with both provided and
-# 3rd-party Python scripts. Required patch was sent to upstream in
-# 2014: https://github.com/swig/swig/pull/251
-MY_SWIG_VER=7
-MY_SWIG=swig-${PN}-${MY_SWIG_VER}
-
-AUTOTOOLS_AUTO_DEPEND="no"
-DOCS_BUILDER="sphinx"
-DOCS_DIR="docs"
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
-
-DESCRIPTION="A stand-alone graphics debugging tool"
-HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
-SRC_URI="
- https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
- verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc )
-"
-
-# renderdoc: MIT
-# + cmdline: BSD (not compatible with upstream lib)
-# + farm fresh icons: CC-BY-3.0
-# + half: MIT (not compatible with system dev-libs/half)
-# + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
-# + md5: public-domain
-# + plthook: BSD-2
-# + pugixml: MIT
-# + radeon gpu analyzer: MIT
-# + source code pro: OFL-1.1
-# + stb: public-domain
-# + tinyfiledialogs: ZLIB
-# + docs? ( sphinx.paramlinks: MIT )
-# swig: GPL-3+ BSD BSD-2
-LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="pyside2 qt5"
-REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- app-arch/lz4:=
- app-arch/zstd:=
- dev-libs/miniz:=
- >=dev-util/glslang-1.3.231:= <dev-util/glslang-1.3.268
- x11-libs/libX11
- x11-libs/libxcb:=
- x11-libs/xcb-util-keysyms
- virtual/opengl
- pyside2? (
- $(python_gen_cond_dep '
- dev-python/pyside2[${PYTHON_USEDEP}]
- ')
- )
- qt5? (
- ${PYTHON_DEPS}
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- )
-"
-DEPEND="${RDEPEND}"
-# qtcore provides qmake, which is required to build the qrenderdoc gui.
-BDEPEND="
- x11-base/xorg-proto
- virtual/pkgconfig
- qt5? (
- ${AUTOTOOLS_DEPEND}
- ${PYTHON_DEPS}
- dev-libs/libpcre
- dev-qt/qtcore:5
- app-alternatives/yacc
- )
- verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson )
-"
-
-PATCHES=(
- # The analytics seem very reasonable, and even without this patch
- # they are NOT sent before the user accepts. But default the
- # selection to off, just in case.
- "${FILESDIR}"/${PN}-1.18-analytics-off.patch
-
- # Only search for PySide2 if pyside2 USE flag is set.
- # Bug #833627
- "${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
-
- # Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
- # built.
- "${FILESDIR}"/${PN}-1.18-system-flags.patch
-
- # Needed to prevent sandbox violations during build.
- "${FILESDIR}"/${PN}-1.27-env-home.patch
-
- "${FILESDIR}"/${PN}-1.22-r1-system-glslang.patch
- "${FILESDIR}"/${PN}-1.18-system-compress.patch
-)
-
-DOCS=( util/LINUX_DIST_README )
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/baldurkarlsson.gpg
-
-pkg_setup() {
- use qt5 && python-single-r1_pkg_setup
-}
-
-src_unpack() {
- if use verify-sig; then
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
- fi
-
- # Do not unpack the swig sources here. CMake will do that if
- # required.
- unpack ${P}.tar.gz
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # Ensure that we use the system glslang headers instead of the
- # vendored copy.
- rm -r renderdoc/3rdparty/glslang || die 'rm vendored glslang failed'
-
- # Remove the calls to install the documentation files. Instead,
- # install them with einstalldocs.
- sed -i '/share\/doc\/renderdoc/d' \
- "${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
- || die 'sed remove doc install failed'
-
- # Assumes that the build directory is "${S}"/build, which it is not.
- sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
- "${S}"/docs/conf.py \
- || die 'sed patch doc sys.path failed'
-
- # Bug #836235
- sed -i '/#include <stdarg/i #include <time.h>' \
- "${S}"/renderdoc/os/os_specific.h \
- || die 'sed include time.h failed'
-}
-
-src_configure() {
- local mycmakeargs=(
- # Build system does not know that this is a tagged release, as
- # we just have the tarball and not the git repository.
- -DBUILD_VERSION_STABLE=ON
-
- -DENABLE_EGL=ON
- -DENABLE_GL=ON
- -DENABLE_GLES=ON
- -DENABLE_PYRENDERDOC=$(usex qt5)
- -DENABLE_QRENDERDOC=$(usex qt5)
- -DENABLE_VULKAN=ON
-
- # Upstream says that this option is unsupported and should not
- # be used yet.
- -DENABLE_WAYLAND=OFF
-
- -DENABLE_XCB=ON
- -DENABLE_XLIB=ON
-
- # Path to glslang*.cmake.
- -DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
-
- # renderdoc_capture.json is installed here
- -DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
- )
-
- use qt5 && mycmakeargs+=(
- -DPython3_EXECUTABLE="${PYTHON}"
- -DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
-
- # Needed after qtchooser removal, bug #836474.
- -DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
-
- -DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
- )
-
- use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} )
-
- # Lots of type mismatch issues.
- filter-lto
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- docs_compile
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- optfeature "android remote contexts" dev-util/android-tools
- optfeature "vulkan contexts" media-libs/vulkan-loader
-}
diff --git a/media-gfx/renderdoc/renderdoc-1.29-r2.ebuild b/media-gfx/renderdoc/renderdoc-1.29-r2.ebuild
deleted file mode 100644
index 871af2fca8b3..000000000000
--- a/media-gfx/renderdoc/renderdoc-1.29-r2.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# The swig fork is required for compatibility with both provided and
-# 3rd-party Python scripts. Required patch was sent to upstream in
-# 2014: https://github.com/swig/swig/pull/251
-MY_SWIG_VER=7
-MY_SWIG=swig-${PN}-${MY_SWIG_VER}
-
-AUTOTOOLS_AUTO_DEPEND="no"
-DOCS_BUILDER="sphinx"
-DOCS_DIR="docs"
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
-
-DESCRIPTION="A stand-alone graphics debugging tool"
-HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
-SRC_URI="
- https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
- verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc )
-"
-
-# renderdoc: MIT
-# + cmdline: BSD (not compatible with upstream lib)
-# + farm fresh icons: CC-BY-3.0
-# + half: MIT (not compatible with system dev-libs/half)
-# + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
-# + md5: public-domain
-# + plthook: BSD-2
-# + pugixml: MIT
-# + radeon gpu analyzer: MIT
-# + source code pro: OFL-1.1
-# + stb: public-domain
-# + tinyfiledialogs: ZLIB
-# + docs? ( sphinx.paramlinks: MIT )
-# swig: GPL-3+ BSD BSD-2
-LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="pyside2 qt5"
-REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- app-arch/lz4:=
- app-arch/zstd:=
- dev-libs/miniz:=
- >=dev-util/glslang-1.3.231:=
- x11-libs/libX11
- x11-libs/libxcb:=
- x11-libs/xcb-util-keysyms
- virtual/opengl
- pyside2? (
- $(python_gen_cond_dep '
- dev-python/pyside2[${PYTHON_USEDEP}]
- ')
- )
- qt5? (
- ${PYTHON_DEPS}
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- )
-"
-DEPEND="${RDEPEND}"
-# qtcore provides qmake, which is required to build the qrenderdoc gui.
-BDEPEND="
- x11-base/xorg-proto
- virtual/pkgconfig
- qt5? (
- ${AUTOTOOLS_DEPEND}
- ${PYTHON_DEPS}
- dev-libs/libpcre
- dev-qt/qtcore:5
- app-alternatives/yacc
- )
- verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson )
-"
-
-PATCHES=(
- # The analytics seem very reasonable, and even without this patch
- # they are NOT sent before the user accepts. But default the
- # selection to off, just in case.
- "${FILESDIR}"/${PN}-1.18-analytics-off.patch
-
- # Only search for PySide2 if pyside2 USE flag is set.
- # Bug #833627
- "${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
-
- # Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
- # built.
- "${FILESDIR}"/${PN}-1.18-system-flags.patch
-
- # Needed to prevent sandbox violations during build.
- "${FILESDIR}"/${PN}-1.27-env-home.patch
-
- "${FILESDIR}"/${PN}-1.29-r2-system-glslang.patch
- "${FILESDIR}"/${PN}-1.29-r2-system-compress.patch
-)
-
-DOCS=( util/LINUX_DIST_README )
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/baldurkarlsson.gpg
-
-pkg_setup() {
- use qt5 && python-single-r1_pkg_setup
-}
-
-src_unpack() {
- if use verify-sig; then
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
- fi
-
- # Do not unpack the swig sources here. CMake will do that if
- # required.
- unpack ${P}.tar.gz
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # Ensure that we use the system glslang headers instead of the
- # vendored copy.
- rm -r renderdoc/3rdparty/glslang || die 'rm vendored glslang failed'
-
- # Remove the calls to install the documentation files. Instead,
- # install them with einstalldocs.
- sed -i '/share\/doc\/renderdoc/d' \
- "${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
- || die 'sed remove doc install failed'
-
- # Assumes that the build directory is "${S}"/build, which it is not.
- sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
- "${S}"/docs/conf.py \
- || die 'sed patch doc sys.path failed'
-
- # Bug #836235
- sed -i '/#include <stdarg/i #include <time.h>' \
- "${S}"/renderdoc/os/os_specific.h \
- || die 'sed include time.h failed'
-}
-
-src_configure() {
- local mycmakeargs=(
- # Build system does not know that this is a tagged release, as
- # we just have the tarball and not the git repository.
- -DBUILD_VERSION_STABLE=ON
-
- -DENABLE_EGL=ON
- -DENABLE_GL=ON
- -DENABLE_GLES=ON
- -DENABLE_PYRENDERDOC=$(usex qt5)
- -DENABLE_QRENDERDOC=$(usex qt5)
- -DENABLE_VULKAN=ON
-
- # Upstream says that this option is unsupported and should not
- # be used yet.
- -DENABLE_WAYLAND=OFF
-
- -DENABLE_XCB=ON
- -DENABLE_XLIB=ON
-
- # Path to glslang*.cmake.
- -DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
-
- # renderdoc_capture.json is installed here
- -DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
- )
-
- use qt5 && mycmakeargs+=(
- -DPython3_EXECUTABLE="${PYTHON}"
- -DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
-
- # Needed after qtchooser removal, bug #836474.
- -DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
-
- -DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
- )
-
- use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} )
-
- # Lots of type mismatch issues.
- filter-lto
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- docs_compile
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- optfeature "android remote contexts" dev-util/android-tools
- optfeature "vulkan contexts" media-libs/vulkan-loader
-}
diff --git a/media-gfx/renderdoc/renderdoc-1.30-r1.ebuild b/media-gfx/renderdoc/renderdoc-1.30-r1.ebuild
index 4fcb8c509c33..2ee9da15af0d 100644
--- a/media-gfx/renderdoc/renderdoc-1.30-r1.ebuild
+++ b/media-gfx/renderdoc/renderdoc-1.30-r1.ebuild
@@ -40,7 +40,7 @@ SRC_URI="
# swig: GPL-3+ BSD BSD-2
LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="pyside2 qt5"
REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-gfx/renderdoc/renderdoc-1.30.ebuild b/media-gfx/renderdoc/renderdoc-1.30.ebuild
deleted file mode 100644
index 4456c5b0b386..000000000000
--- a/media-gfx/renderdoc/renderdoc-1.30.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# The swig fork is required for compatibility with both provided and
-# 3rd-party Python scripts. Required patch was sent to upstream in
-# 2014: https://github.com/swig/swig/pull/251
-MY_SWIG_VER=7
-MY_SWIG=swig-${PN}-${MY_SWIG_VER}
-
-AUTOTOOLS_AUTO_DEPEND="no"
-DOCS_BUILDER="sphinx"
-DOCS_DIR="docs"
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
-
-DESCRIPTION="A stand-alone graphics debugging tool"
-HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
-SRC_URI="
- https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
- verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc )
-"
-
-# renderdoc: MIT
-# + cmdline: BSD (not compatible with upstream lib)
-# + farm fresh icons: CC-BY-3.0
-# + half: MIT (not compatible with system dev-libs/half)
-# + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
-# + md5: public-domain
-# + plthook: BSD-2
-# + pugixml: MIT
-# + radeon gpu analyzer: MIT
-# + source code pro: OFL-1.1
-# + stb: public-domain
-# + tinyfiledialogs: ZLIB
-# + docs? ( sphinx.paramlinks: MIT )
-# swig: GPL-3+ BSD BSD-2
-LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="pyside2 qt5"
-REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- app-arch/lz4:=
- app-arch/zstd:=
- dev-libs/miniz:=
- >=dev-util/glslang-1.3.231:=
- x11-libs/libX11
- x11-libs/libxcb:=
- x11-libs/xcb-util-keysyms
- virtual/opengl
- pyside2? (
- $(python_gen_cond_dep '
- dev-python/pyside2[${PYTHON_USEDEP}]
- ')
- )
- qt5? (
- ${PYTHON_DEPS}
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- )
-"
-DEPEND="${RDEPEND}"
-# qtcore provides qmake, which is required to build the qrenderdoc gui.
-BDEPEND="
- x11-base/xorg-proto
- virtual/pkgconfig
- qt5? (
- ${AUTOTOOLS_DEPEND}
- ${PYTHON_DEPS}
- dev-libs/libpcre
- dev-qt/qtcore:5
- app-alternatives/yacc
- )
- verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson )
-"
-
-PATCHES=(
- # The analytics seem very reasonable, and even without this patch
- # they are NOT sent before the user accepts. But default the
- # selection to off, just in case.
- "${FILESDIR}"/${PN}-1.18-analytics-off.patch
-
- # Only search for PySide2 if pyside2 USE flag is set.
- # Bug #833627
- "${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
-
- # Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
- # built.
- "${FILESDIR}"/${PN}-1.18-system-flags.patch
-
- # Needed to prevent sandbox violations during build.
- "${FILESDIR}"/${PN}-1.27-env-home.patch
-
- "${FILESDIR}"/${PN}-1.29-r2-system-glslang.patch
- "${FILESDIR}"/${PN}-1.29-r2-system-compress.patch
-)
-
-DOCS=( util/LINUX_DIST_README )
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/baldurkarlsson.gpg
-
-pkg_setup() {
- use qt5 && python-single-r1_pkg_setup
-}
-
-src_unpack() {
- if use verify-sig; then
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
- fi
-
- # Do not unpack the swig sources here. CMake will do that if
- # required.
- unpack ${P}.tar.gz
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # Ensure that we use the system glslang headers instead of the
- # vendored copy.
- rm -r renderdoc/3rdparty/glslang || die 'rm vendored glslang failed'
-
- # Remove the calls to install the documentation files. Instead,
- # install them with einstalldocs.
- sed -i '/share\/doc\/renderdoc/d' \
- "${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
- || die 'sed remove doc install failed'
-
- # Assumes that the build directory is "${S}"/build, which it is not.
- sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
- "${S}"/docs/conf.py \
- || die 'sed patch doc sys.path failed'
-
- # Bug #836235
- sed -i '/#include <stdarg/i #include <time.h>' \
- "${S}"/renderdoc/os/os_specific.h \
- || die 'sed include time.h failed'
-}
-
-src_configure() {
- local mycmakeargs=(
- # Build system does not know that this is a tagged release, as
- # we just have the tarball and not the git repository.
- -DBUILD_VERSION_STABLE=ON
-
- -DENABLE_EGL=ON
- -DENABLE_GL=ON
- -DENABLE_GLES=ON
- -DENABLE_PYRENDERDOC=$(usex qt5)
- -DENABLE_QRENDERDOC=$(usex qt5)
- -DENABLE_VULKAN=ON
-
- # Upstream says that this option is unsupported and should not
- # be used yet.
- -DENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND=OFF
-
- -DENABLE_XCB=ON
- -DENABLE_XLIB=ON
-
- # Path to glslang*.cmake.
- -DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
-
- # renderdoc_capture.json is installed here
- -DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
- )
-
- use qt5 && mycmakeargs+=(
- -DPython3_EXECUTABLE="${PYTHON}"
- -DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
-
- # Needed after qtchooser removal, bug #836474.
- -DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
-
- -DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
- )
-
- use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} )
-
- # Lots of type mismatch issues.
- filter-lto
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- docs_compile
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- optfeature "android remote contexts" dev-util/android-tools
- optfeature "vulkan contexts" media-libs/vulkan-loader
-}
--
cgit v1.2.3