diff options
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/Manifest.gz | bin | 38319 -> 38324 bytes | |||
| -rw-r--r-- | media-gfx/graphviz/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/graphviz/files/graphviz-4.0.0-clang-printf-alike.patch | 221 | ||||
| -rw-r--r-- | media-gfx/graphviz/graphviz-4.0.0-r1.ebuild | 221 | ||||
| -rw-r--r-- | media-gfx/renderdoc/Manifest | 1 | ||||
| -rw-r--r-- | media-gfx/renderdoc/files/renderdoc-1.18-system-glslang.patch | 210 |
6 files changed, 0 insertions, 656 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex e5eb0429c424..50a912a5d1a7 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest index a233625d9fee..d57512bc1bfc 100644 --- a/media-gfx/graphviz/Manifest +++ b/media-gfx/graphviz/Manifest @@ -1,8 +1,5 @@ -AUX graphviz-4.0.0-clang-printf-alike.patch 7199 BLAKE2B cb1e67561d1955ae466da8226835716421d55e61200747cbef592cb8ae02ad7b88f7721492f9ea9491519c9ce694cf0e8daef63b8f7e4eb0ae7dffd3a106df7a SHA512 c044e302402848716da87ace0542daf5e9a9d1245f24ca145c041157825fcbd6e046bf521f563f7d25b16068cb2a76b08f1234a76679983f3685d65656e82733 DIST graphviz-2.50.0.tar.xz 23031008 BLAKE2B a1789368a77384366bf813466d4a733765ffc0a04660cfcc002c643264780425b449087306b143cfddd70d2feabb67e82b6c04217684aba175824c3e83062085 SHA512 2b035559da20bad35e046bfa1b2c8ce1b395ff9b812f33bcf612d7f7c65ff9a226c9b209553b4283825330683fb925516563943de7922c2f6434baaf3c3b5ee2 -DIST graphviz-4.0.0.tar.xz 21494432 BLAKE2B b188feb5c6bad2537f7d404c330c314de38f6f274d72ce84040524d6be209642686161939a210f41e446dc37619266864353f7e1829d172c97e559632ba17971 SHA512 34e3e720152cb6a8f0d266f37ae1f66d432b89f44309f172d7abfcf8eba611a16e41250faa3eac64bf94e5e721a242ad5093ef8905238b61d6ad869b7853b9d2 DIST graphviz-5.0.0.tar.xz 21495572 BLAKE2B b28cbc5a20b202441ed7e98ebbb85b878f9362d1f95816ca89f7aedd62302c77974efc3b63e2ab8b577da59946ca63c7607706da2e79afcae9089f8c2743cd4a SHA512 51576c0d0405aa2005e908b57c3bac5e30069e6efb355b467a35a46559b002b34eaec77c35b6d41c635d6d874351da7261a11cf0f857cea72ff7259d5f6c860d EBUILD graphviz-2.50.0.ebuild 7752 BLAKE2B 8969610d147f4f40e65202bb8409ea6925e457fbf5456e5b37b96ec73826314ced8ed9a17ba6440c8c5806b69b0efc0914425272febfa11be6041354e30bb1fe SHA512 0a634668da138100dd1c76ea0f1b3865c8c8e43fa1249eeaa8de88a1b5acc80d69ffcffbb31f5652126dee957f40169ac585a1899d0bad96a6004b173dc89161 -EBUILD graphviz-4.0.0-r1.ebuild 6240 BLAKE2B 9fd392799e39ed0d329e548b27e0c78fc143efb40349d4481db67ff5a4be58bbb210281ecce17e8728a935b5c8e6514d773da253878815a3fe4900d37167f856 SHA512 4fac5de3a5baebc3046c75e7318fceb0077d2bf252adf578c61f93ae32fab2a9dc891c2652bfb9d80312011cc72afab4c6d05a016f2ea1e88cc545a5210a30d6 EBUILD graphviz-5.0.0.ebuild 6140 BLAKE2B eda5a266f41226dcd0d596898e4c8a011786ee14dabb9dd9a48d7e7493e944b0a3c11719774ff4b4e830f4e5f31efe7dad9955a8fa9c8abe181a434ed436bcce SHA512 32e15bddd89f087faf5d1cce5db901d313759564f99a414e2f8b1c4b4922b8a199dae20e85454e0bda4e267522962aaf59b8e22d94503248af2244273b0712cc MISC metadata.xml 2274 BLAKE2B c0a78179ac104e2dbe542716a7bf3afa690d02d859ddd0c1103f8b9adda558d80fffa03038c3f8f2b6075dfa32454cbd0799610c084520808ae9253f237e3142 SHA512 0e9f3bd47884fe33dcbfd0f79021fe04d1d7cf3ac455aa54655c1ee4de0e63178b657bc8c3a665a47e33889f6b1a0de35918d8e0c2ce3479aa6f94b477efa158 diff --git a/media-gfx/graphviz/files/graphviz-4.0.0-clang-printf-alike.patch b/media-gfx/graphviz/files/graphviz-4.0.0-clang-printf-alike.patch deleted file mode 100644 index ef213bccd8ab..000000000000 --- a/media-gfx/graphviz/files/graphviz-4.0.0-clang-printf-alike.patch +++ /dev/null @@ -1,221 +0,0 @@ -diff --git a/CHANGELOG.md b/CHANGELOG.md -index f38cc8ff5..4f1a127a2 100644 ---- a/CHANGELOG.md -+++ b/CHANGELOG.md -@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - - ## [Unreleased (4.0.1)] - -+### Fixed -+ -+- **Breaking**: The 4.0.0 change replacing the `Agiodisc_t` struct member -+ `putstr` by `printf` has been reverted -+ - ## [4.0.0] – 2022-05-29 - - ### Changed -diff --git a/cmd/gvpr/gvprmain.c b/cmd/gvpr/gvprmain.c -index 188cfdf94..92872f8cd 100644 ---- a/cmd/gvpr/gvprmain.c -+++ b/cmd/gvpr/gvprmain.c -@@ -47,14 +47,17 @@ static int iofread(void *chan, char *buf, int bufsize) - return (int)fread(buf, 1, (size_t)bufsize, chan); - } - -+static int ioputstr(void *chan, const char *str) -+{ -+ return fputs(str, chan); -+} -+ - static int ioflush(void *chan) - { - return fflush(chan); - } - --typedef int (*printfn)(void *chan, const char *format, ...); -- --static Agiodisc_t gprIoDisc = { iofread, (printfn)fprintf, ioflush }; -+static Agiodisc_t gprIoDisc = { iofread, ioputstr, ioflush }; - - static Agdisc_t gprDisc = { &AgMemDisc, &AgIdDisc, &gprIoDisc }; - -diff --git a/lib/cgraph/cgraph.3 b/lib/cgraph/cgraph.3 -index ed7392c06..67e35c2e9 100644 ---- a/lib/cgraph/cgraph.3 -+++ b/lib/cgraph/cgraph.3 -@@ -487,14 +487,14 @@ The I/O discipline provides an abstraction for the reading and writing of graphs - .P0 - struct Agiodisc_s { - int (*fread)(void *chan, char *buf, int bufsize); -- int (*printf)(void *chan, const char *format, ...); -+ int (*putstr)(void *chan, char *str); - int (*flush)(void *chan); /* sync */ - } ; - .P1 - Normally, the \fBFILE\fP structure and its related functions are used for I/O. At times, though, - an application may need to use a totally different type of character source. The associated - state or stream information is provided by the \fIchan\fP argument to \fBagread\fP or \fBagwrite\fP. --The discipline function \fIfread\fP and \fIprintf\fP provide the corresponding functions for -+The discipline function \fIfread\fP and \fIputstr\fP provide the corresponding functions for - read and writing. - - .SH "MEMORY DISCIPLINE" -diff --git a/lib/cgraph/cgraph.h b/lib/cgraph/cgraph.h -index 7b005c442..cbec3bbe6 100644 ---- a/lib/cgraph/cgraph.h -+++ b/lib/cgraph/cgraph.h -@@ -169,7 +169,7 @@ struct Agiddisc_s { /* object ID allocator */ - - struct Agiodisc_s { - int (*afread) (void *chan, char *buf, int bufsize); -- int (*printf)(void *chan, const char *format, ...); -+ int (*putstr) (void *chan, const char *str); - int (*flush) (void *chan); /* sync */ - /* error messages? */ - }; -diff --git a/lib/cgraph/io.c b/lib/cgraph/io.c -index d8b136804..66c605ae6 100644 ---- a/lib/cgraph/io.c -+++ b/lib/cgraph/io.c -@@ -24,15 +24,17 @@ static int iofread(void *chan, char *buf, int bufsize) - } - - /* default IO methods */ -+static int ioputstr(void *chan, const char *str) -+{ -+ return fputs(str, chan); -+} - - static int ioflush(void *chan) - { - return fflush(chan); - } - --typedef int (*printfn)(void *chan, const char *format, ...); -- --Agiodisc_t AgIoDisc = { iofread, (printfn)fprintf, ioflush }; -+Agiodisc_t AgIoDisc = { iofread, ioputstr, ioflush }; - - typedef struct { - const char *data; -@@ -78,7 +80,7 @@ static Agraph_t *agmemread0(Agraph_t *arg_g, const char *cp) - rdr_t rdr; - Agdisc_t disc; - -- memIoDisc.printf = AgIoDisc.printf; -+ memIoDisc.putstr = AgIoDisc.putstr; - memIoDisc.flush = AgIoDisc.flush; - rdr.data = cp; - rdr.len = strlen(cp); -diff --git a/lib/cgraph/write.c b/lib/cgraph/write.c -index e14f7d835..9e72d2c5c 100644 ---- a/lib/cgraph/write.c -+++ b/lib/cgraph/write.c -@@ -26,7 +26,7 @@ typedef void iochan_t; - - static int ioput(Agraph_t * g, iochan_t * ofile, char *str) - { -- return AGDISC(g, io)->printf(ofile, "%s", str); -+ return AGDISC(g, io)->putstr(ofile, str); - - } - -diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c -index a7fe27bf5..3704f51d9 100644 ---- a/lib/gvpr/compile.c -+++ b/lib/gvpr/compile.c -@@ -66,14 +66,17 @@ static int iofread(void *chan, char *buf, int bufsize) - return (int)read(sffileno(chan), buf, bufsize); - } - -+static int ioputstr(void *chan, const char *str) -+{ -+ return sfputr(chan, str, -1); -+} -+ - static int ioflush(void *chan) - { - return sfsync(chan); - } - --typedef int (*printfn)(void *chan, const char *format, ...); -- --static Agiodisc_t gprIoDisc = { iofread, (printfn)sfprintf, ioflush }; -+static Agiodisc_t gprIoDisc = { iofread, ioputstr, ioflush }; - - #ifdef GVDLL - static Agdisc_t gprDisc = { 0, 0, &gprIoDisc }; -diff --git a/plugin/core/gvrender_core_dot.c b/plugin/core/gvrender_core_dot.c -index c45563460..63eb5e535 100644 ---- a/plugin/core/gvrender_core_dot.c -+++ b/plugin/core/gvrender_core_dot.c -@@ -511,7 +511,7 @@ static void xdot_end_graph(graph_t* g) - textflags[EMIT_GLABEL] = 0; - } - --typedef int (*printfn)(void *chan, const char *format, ...); -+typedef int (*putstrfn) (void *chan, const char *str); - typedef int (*flushfn) (void *chan); - static void dot_end_graph(GVJ_t *job) - { -@@ -521,7 +521,7 @@ static void dot_end_graph(GVJ_t *job) - - if (io.afread == NULL) { - io.afread = AgIoDisc.afread; -- io.printf = (printfn)gvprintf; -+ io.putstr = (putstrfn)gvputs; - io.flush = (flushfn)gvflush; - } - -diff --git a/plugin/core/gvrender_core_json.c b/plugin/core/gvrender_core_json.c -index bab5d64af..88715a93a 100644 ---- a/plugin/core/gvrender_core_json.c -+++ b/plugin/core/gvrender_core_json.c -@@ -693,7 +693,7 @@ static void write_graph(Agraph_t * g, GVJ_t * job, int top, state_t* sp) - gvputs(job, "}"); - } - --typedef int (*printfn)(void *chan, const char *format, ...); -+typedef int (*putstrfn) (void *chan, const char *str); - typedef int (*flushfn) (void *chan); - - static void json_end_graph(GVJ_t *job) -@@ -704,7 +704,7 @@ static void json_end_graph(GVJ_t *job) - - if (io.afread == NULL) { - io.afread = AgIoDisc.afread; -- io.printf = (printfn)gvprintf; -+ io.putstr = (putstrfn)gvputs; - io.flush = (flushfn)gvflush; - } - -diff --git a/tclpkg/tcldot/tcldot.c b/tclpkg/tcldot/tcldot.c -index 335d8e469..b747124cf 100644 ---- a/tclpkg/tcldot/tcldot.c -+++ b/tclpkg/tcldot/tcldot.c -@@ -163,7 +163,7 @@ int Tcldot_Init(Tcl_Interp * interp) - /* build disciplines dynamically so we can selectively replace functions */ - - ictx->myioDisc.afread = NULL; /* set in dotread() or dotstring() according to need */ -- ictx->myioDisc.printf = AgIoDisc.printf; /* no change */ -+ ictx->myioDisc.putstr = AgIoDisc.putstr; /* no change */ - ictx->myioDisc.flush = AgIoDisc.flush; /* no change */ - - ictx->mydisc.mem = &AgMemDisc; /* no change */ -diff --git a/lib/common/output.c b/lib/common/output.c -index c91dfe41e..648409c5a 100644 ---- a/lib/common/output.c -+++ b/lib/common/output.c -@@ -80,11 +80,11 @@ void write_plain(GVJ_t *job, graph_t *g, - bezier bz; - pointf pt; - char *lbl; - char* fillcolor; - -- print = g->clos->disc.io->printf; -+ print = g->clos->disc.io->putstr; - // setup_graph(job, g); - setYInvert(g); - pt = GD_bb(g).UR; - print(f, "graph %.5g %.5g %.5g\n", job->zoom, PS2INCH(pt.x), PS2INCH(pt.y)); - for (n = agfstnode(g); n; n = agnxtnode(g, n)) { diff --git a/media-gfx/graphviz/graphviz-4.0.0-r1.ebuild b/media-gfx/graphviz/graphviz-4.0.0-r1.ebuild deleted file mode 100644 index 53c156b50c4b..000000000000 --- a/media-gfx/graphviz/graphviz-4.0.0-r1.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) -inherit python-single-r1 - -DESCRIPTION="Open Source Graph Visualization Software" -HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/" -# unfortunately upstream uses an "artifact" store for the pre-generated -# tarball now, which makes predictable URLs impossible. -SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz" - -LICENSE="CPL-1.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" -IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X" - -REQUIRED_USE=" - !cairo? ( !X !gtk2 !postscript !lasi ) - pdf? ( cairo ) - python? ( ${PYTHON_REQUIRED_USE} )" - -# Requires ksh, tests against installed package, missing files and directory -RESTRICT="test" - -RDEPEND=" - >=dev-libs/expat-2 - >=dev-libs/glib-2.11.1:2 - dev-libs/libltdl:0 - >=media-libs/fontconfig-2.3.95 - >=media-libs/freetype-2.1.10 - >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] - media-libs/libjpeg-turbo:= - >=media-libs/libpng-1.2:0= - sys-libs/zlib - virtual/libiconv - cairo? ( - >=x11-libs/cairo-1.1.10[svg] - >=x11-libs/pango-1.12 - ) - devil? ( media-libs/devil[png,jpeg] ) - gtk2? ( - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - gts? ( sci-libs/gts ) - guile? ( dev-scheme/guile ) - lasi? ( media-libs/lasi ) - pdf? ( app-text/poppler ) - perl? ( dev-lang/perl:= ) - postscript? ( app-text/ghostscript-gpl ) - python? ( ${PYTHON_DEPS} ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - ) - ruby? ( dev-lang/ruby:* ) - svg? ( gnome-base/librsvg ) - tcl? ( >=dev-lang/tcl-8.3:0= ) - webp? ( media-libs/libwebp:= ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" -BDEPEND=" - sys-devel/flex - sys-devel/libtool - virtual/pkgconfig - doc? ( - app-text/ghostscript-gpl - sys-apps/groff - ) - guile? ( - dev-lang/swig - dev-scheme/guile - ) - nls? ( >=sys-devel/gettext-0.14.5 ) - perl? ( dev-lang/swig ) - python? ( dev-lang/swig ) - ruby? ( dev-lang/swig ) - tcl? ( dev-lang/swig )" - -# Dependency description / Maintainer-Info: - -# Rendering is done via the following plugins (/plugins): -# - core, dot_layout, neato_layout, gd , dot -# the ones which are always compiled in, depend on zlib, gd -# - gtk -# Directly depends on gtk-2. -# needs 'pangocairo' enabled in graphviz configuration -# gtk-2 depends on pango, cairo and libX11 directly. -# - gdk-pixbuf -# Directly depends on gtk-2 and gdk-pixbuf. -# needs 'pangocairo' enabled in graphviz configuration -# - ming -# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's -# incomplete. -# - cairo/pango: -# Needs pango for text layout, uses cairo methods to draw stuff -# - xlib: -# needs cairo+pango, -# can make use of gnomeui and inotify support (??? unsure), -# needs libXaw for UI -# UI also links directly against libX11, libXmu, and libXt -# and uses libXpm if available so we make sure it always is - -# There can be swig-generated bindings for the following languages (/tclpkg/gv): -# - c-sharp (disabled) -# - scheme (enabled via guile) ... no longer broken on ~x86 -# - go (disabled) -# - io (disabled) -# - lua (enabled via lua) -# - ocaml (enabled via ocaml) -# - perl (enabled via perl) *1 -# - php (enabled via php) *2 -# - python (enabled via python) *1 -# - ruby (enabled via ruby) *1 -# - tcl (enabled via tcl) -# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location -# *2 = Those bindings don't build because the paths for the headers/libs aren't -# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5) - -# There are several other tools in /tclpkg: -# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl -# tkspline, tkstubs ; enabled with: --with-tk - -# And the commands (/cmd): -# - dot, gvedit, gvpr, smyrna, tools/* :) -# sci-libs/gts can be used for some of these -# - gvedit (via 'qt5'): -# based on ./configure it needs qt-core and qt-gui only -# - smyrna : experimental opengl front-end (via 'smyrna') -# currently disabled -- it segfaults a lot -# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut -# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png' -# with flags enabled at configure time - -PATCHES=( - # backport, remove on bump (bug #853175) - "${FILESDIR}"/${P}-clang-printf-alike.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local myconf=( - # Speeds up the libltdl configure - --cache-file="${S}"/config.cache - --enable-ltdl - $(use_enable doc man-pdfs) - $(use_with cairo pangocairo) - $(use_with examples demos '$(docdir)/examples') - $(use_with devil) - $(use_with gtk2 gdk) - $(use_with gtk2 gdk-pixbuf) - $(use_with gtk2) - $(use_with gts) - $(use_with qt5 qt) - $(use_with lasi) - $(use_with pdf poppler) - $(use_with postscript ghostscript) - $(use_with svg rsvg) - $(use_with webp) - $(use_with X x) - --with-digcola - --with-fontconfig - --with-freetype2 - --with-ipsepcola - --with-libgd - --with-sfdp - --without-ming - # new/experimental features, to be tested, disable for now - --without-ipsepcola - --without-smyrna - --without-visio - # Bindings: - $(use_enable guile) - $(use_enable perl) - $(use_enable python python3) - $(use_enable ruby) - $(use_enable tcl) - --disable-go - --disable-io - --disable-lua - --disable-java - --disable-ocaml - --disable-php - --disable-python - --disable-r - --disable-sharp - # libtool file collision, bug #276609 - --without-included-ltdl - --disable-ltdl-install - ) - econf "${myconf[@]}" -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die - - use python && python_optimize \ - "${D}"$(python_get_sitedir) \ - "${ED}"/usr/$(get_libdir)/graphviz/python3 -} - -pkg_postinst() { - # We need to register all plugins before they become usable - dot -c || die -} - -pkg_postrm() { - # Remove cruft, bug #547344 - rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die -} diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest index 46eb465be775..9f93fec7517e 100644 --- a/media-gfx/renderdoc/Manifest +++ b/media-gfx/renderdoc/Manifest @@ -3,7 +3,6 @@ AUX renderdoc-1.18-conditional-pyside.patch 2178 BLAKE2B b79e3fc960b83248a6991c0 AUX renderdoc-1.18-env-home.patch 832 BLAKE2B f994893dceded797646b51f7e1a54cbd91c3175278f264c58bc13e67e22b5c2b085251a7b3e91923641e0566888d564145b3f67297fa623cba3a91034ac57208 SHA512 9a176468da8f5c5572349252a59def973ea178e15b7d5e5780cbd776c4ab08a8bf7939d0765f47386b60c582993d14ce5500fc788ce4d5395c6ef90c3f55801c 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.18-system-glslang.patch 9100 BLAKE2B a033377083705bbbccaa56657eccf632bcc5093bc86f319d3d30e94eed41bf849fe8e983dd9085b1628ecaed9ab0b358a487b40c8672239d4b32ee83e24ab1df SHA512 a0eea5b3c24092f30b2ec5c9fde327b4683839a34a5f11a64fb85b54d645f50b8e87f8fc59cb87450566caa3ad87aadc6baa7c8843256726cb8bd71fb0444dd0 AUX renderdoc-1.20-system-glslang.patch 8281 BLAKE2B 3bd15c373de0f37831c2d8a03d9c5c4f14684aea2e1d2e350e6300cce7c2182427014f2607199bbe913d460f113faa352dc882ec40a56403f91d87ce0afe4df4 SHA512 7503a5241aa79c241d300f4a758338d0ae511ee2ce9582b5f3720939f9ee71c149614244a0facc620ba2f2da46ceb7dcf7298440c5cd4b528be96245cafc01fa DIST renderdoc-1.20.tar.gz 46744415 BLAKE2B 574933653fa37e8a8a4dac4ec1e4156a9761fe3bf086ecf2a5125b51c368dc885f9c27f47fb9f7ddd4318e627431583be1371b92fbd5a5a8ed9f04ed90cc3498 SHA512 5c395cdd68fcacd7d728f4793301a7c11d11bbc09bc1f168d91b18964756f01bd702c0ffda53f3156ee48c06cc2e8c3b2f7ad8da49146e151d8ff6cb7290ed2e DIST renderdoc-1.20.tar.gz.asc 833 BLAKE2B 233875056eff2858054566900a3198e857a6970454e4671f57703c5a8a8e1daff3c5d069cba5293791787e7da7db0a40aab17f26df044ed09ca9113c453f8bf6 SHA512 1ccfe4cb190c1c578abbf5e3f0264a00cb6054333f6829e726c2659c352b3ece585a1f3d55e4602908c737a349020c4fd2edc906cf225519ae049338876e0632 diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.18-system-glslang.patch deleted file mode 100644 index 12f6913002a0..000000000000 --- a/media-gfx/renderdoc/files/renderdoc-1.18-system-glslang.patch +++ /dev/null @@ -1,210 +0,0 @@ -From 76052a739491c194e2d4aa3bace501083fb6c2a9 Mon Sep 17 00:00:00 2001 -From: Matthew Smith <matt@offtopica.uk> -Date: Sun, 30 Jan 2022 17:19:47 +0000 -Subject: [PATCH 1/3] build: Use system glslang - -Requires -DGLSLANG_TARGET_DIR option. ---- - CMakeLists.txt | 11 +++ - renderdoc/CMakeLists.txt | 2 +- - renderdoc/data/glsl_shaders.cpp | 2 +- - renderdoc/driver/shaders/spirv/CMakeLists.txt | 91 +------------------ - .../driver/shaders/spirv/glslang_compile.cpp | 5 +- - .../driver/shaders/spirv/spirv_compile.cpp | 4 +- - 6 files changed, 19 insertions(+), 96 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 127cee3fd..cb0a2c7f6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -419,6 +419,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 9174afb2a..927e95fb9 100644 ---- a/renderdoc/CMakeLists.txt -+++ b/renderdoc/CMakeLists.txt -@@ -580,7 +580,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 d11cd0b88..d33f18099 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/shaders/spirv/CMakeLists.txt b/renderdoc/driver/shaders/spirv/CMakeLists.txt -index 68229cd36..088645fbe 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 ee1b02c73..ec0db8345 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,6 +129,7 @@ static TBuiltInResource DefaultResources = { - /*.maxTaskWorkGroupSizeY_NV =*/1, - /*.maxTaskWorkGroupSizeZ_NV =*/1, - /*.maxMeshViewCountNV =*/4, -+ /*.maxDualSourceDrawBuffersEXT =*/1, - - /*.limits*/ - { -diff --git a/renderdoc/driver/shaders/spirv/spirv_compile.cpp b/renderdoc/driver/shaders/spirv/spirv_compile.cpp -index a2cc2bec4..a494cc69d 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) --- -2.35.1 - |