Accepting request 1295600 from X11:XOrg

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1295600
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/renderdoc?expand=0&rev=26

0001-PCRE2.patch

@@ -0,0 +1,233 @@
+From 9e0d3ac10d6630c7ba71fd482c8dbaeaa1ebaf9c Mon Sep 17 00:00:00 2001
+From: Julien Schueller <schueller@phimeca.com>
+Date: Tue, 4 Jan 2022 13:50:02 +0100
+Subject: [PATCH] PCRE2
+
+Closes #2120
+
+(cherry picked from commit 15515f390c5e3316a7faf0cf85d661a297d45a50)
+---
+ Source/Swig/misc.c          | 41 ++++++++++++++++++++++++-------------
+ Source/Swig/naming.c        | 22 ++++++++++++--------
+ Tools/cmake/FindPCRE2.cmake | 21 +++++++++++++++++++
+ configure.ac                | 19 +++++++++--------
+ 4 files changed, 72 insertions(+), 31 deletions(-)
+ create mode 100644 Tools/cmake/FindPCRE2.cmake
+
+diff --git a/swig-renderdoc-modified-7/Source/Swig/misc.c b/swig-renderdoc-modified-7/Source/Swig/misc.c
+index 91f05c0a2288..c63f0a6c0da1 100644
+--- a/swig-renderdoc-modified-7/Source/Swig/misc.c
++++ b/swig-renderdoc-modified-7/Source/Swig/misc.c
+@@ -1269,7 +1269,8 @@ void Swig_offset_string(String *s, int number) {
+ 
+ 
+ #ifdef HAVE_PCRE
+-#include <pcre.h>
++#define PCRE2_CODE_UNIT_WIDTH 8
++#include <pcre2.h>
+ 
+ static int split_regex_pattern_subst(String *s, String **pattern, String **subst, const char **input)
+ {
+@@ -1331,7 +1332,7 @@ static void copy_with_maybe_case_conversion(String *dst, const char *src, int le
+   }
+ }
+ 
+-String *replace_captures(int num_captures, const char *input, String *subst, int captures[], String *pattern, String *s)
++String *replace_captures(int num_captures, const char *input, String *subst, size_t captures[], String *pattern, String *s)
+ {
+   int convertCase = 0, convertNextOnly = 0;
+   String *result = NewStringEmpty();
+@@ -1353,7 +1354,7 @@ String *replace_captures(int num_captures, const char *input, String *subst, int
+     } else if (isdigit((unsigned char)*p)) {
+       int group = *p++ - '0';
+       if (group < num_captures) {
+-	int l = captures[group*2], r = captures[group*2 + 1];
++	int l = (int)captures[group*2], r = (int)captures[group*2 + 1];
+ 	if (l != -1) {
+ 	  copy_with_maybe_case_conversion(result, input + l, r - l, &convertCase, convertNextOnly);
+ 	}
+@@ -1405,26 +1406,31 @@ String *Swig_string_regex(String *s) {
+   const int pcre_options = 0;
+ 
+   String *res = 0;
+-  pcre *compiled_pat = 0;
+-  const char *pcre_error, *input;
+-  int pcre_errorpos;
++  pcre2_code *compiled_pat = 0;
++  const char *input;
++  PCRE2_UCHAR pcre_error[256];
++  int pcre_errornum;
++  size_t pcre_errorpos;
+   String *pattern = 0, *subst = 0;
+-  int captures[30];
+-
++  size_t *captures = 0;
++  pcre2_match_data *match_data = 0;
+   if (split_regex_pattern_subst(s, &pattern, &subst, &input)) {
+     int rc;
+ 
+-    compiled_pat = pcre_compile(
+-          Char(pattern), pcre_options, &pcre_error, &pcre_errorpos, NULL);
++    compiled_pat = pcre2_compile(
++          (PCRE2_SPTR8)Char(pattern), PCRE2_ZERO_TERMINATED, pcre_options, &pcre_errornum, &pcre_errorpos, NULL);
+     if (!compiled_pat) {
++      pcre2_get_error_message (pcre_errornum, pcre_error, sizeof pcre_error);
+       Swig_error("SWIG", Getline(s), "PCRE compilation failed: '%s' in '%s':%i.\n",
+           pcre_error, Char(pattern), pcre_errorpos);
+       exit(1);
+     }
+-    rc = pcre_exec(compiled_pat, NULL, input, (int)strlen(input), 0, 0, captures, 30);
++    match_data = pcre2_match_data_create_from_pattern (compiled_pat, NULL);
++    rc = pcre2_match(compiled_pat, (PCRE2_SPTR8)input, PCRE2_ZERO_TERMINATED, 0, 0, match_data, NULL);
++    captures = pcre2_get_ovector_pointer (match_data);
+     if (rc >= 0) {
+       res = replace_captures(rc, input, subst, captures, pattern, s);
+-    } else if (rc != PCRE_ERROR_NOMATCH) {
++    } else if (rc != PCRE2_ERROR_NOMATCH) {
+       Swig_error("SWIG", Getline(s), "PCRE execution failed: error %d while matching \"%s\" using \"%s\".\n",
+ 	rc, Char(pattern), input);
+       exit(1);
+@@ -1433,12 +1439,19 @@ String *Swig_string_regex(String *s) {
+ 
+   DohDelete(pattern);
+   DohDelete(subst);
+-  pcre_free(compiled_pat);
++  pcre2_code_free(compiled_pat);
++  pcre2_match_data_free(match_data);
+   return res ? res : NewStringEmpty();
+ }
+ 
+ String *Swig_pcre_version(void) {
+-  return NewStringf("PCRE Version: %s", pcre_version());
++  int len = pcre2_config(PCRE2_CONFIG_VERSION, NULL);
++  char *buf = malloc(len);
++  String *result;
++  pcre2_config(PCRE2_CONFIG_VERSION, buf);
++  result = NewStringf("PCRE Version: %s", buf);
++  free(buf);
++  return result;
+ }
+ 
+ #else
+diff --git a/swig-renderdoc-modified-7/Source/Swig/naming.c b/swig-renderdoc-modified-7/Source/Swig/naming.c
+index ce1dbe8062c5..7b5c93e29662 100644
+--- a/swig-renderdoc-modified-7/Source/Swig/naming.c
++++ b/swig-renderdoc-modified-7/Source/Swig/naming.c
+@@ -1092,26 +1092,32 @@ static DOH *get_lattr(Node *n, List *lattr) {
+ }
+ 
+ #ifdef HAVE_PCRE
+-#include <pcre.h>
++#define PCRE2_CODE_UNIT_WIDTH 8
++#include <pcre2.h>
+ 
+ static int name_regexmatch_value(Node *n, String *pattern, String *s) {
+-  pcre *compiled_pat;
+-  const char *err;
+-  int errpos;
++  pcre2_code *compiled_pat;
++  PCRE2_UCHAR err[256];
++  int errornum;
++  size_t errpos;
+   int rc;
+ 
+-  compiled_pat = pcre_compile(Char(pattern), 0, &err, &errpos, NULL);
++  compiled_pat = pcre2_compile((PCRE2_SPTR8)Char(pattern), PCRE2_ZERO_TERMINATED, 0, &errornum, &errpos, NULL);
+   if (!compiled_pat) {
++    pcre2_get_error_message (errornum, err, sizeof err);
+     Swig_error("SWIG", Getline(n),
+                "Invalid regex \"%s\": compilation failed at %d: %s\n",
+                Char(pattern), errpos, err);
+     exit(1);
+   }
+ 
+-  rc = pcre_exec(compiled_pat, NULL, Char(s), Len(s), 0, 0, NULL, 0);
+-  pcre_free(compiled_pat);
++  pcre2_match_data *match_data = 0;
++  match_data = pcre2_match_data_create_from_pattern (compiled_pat, NULL);
++  rc = pcre2_match(compiled_pat, (PCRE2_SPTR8)Char(s), PCRE2_ZERO_TERMINATED, 0, 0, match_data, 0);
++  pcre2_code_free(compiled_pat);
++  pcre2_match_data_free(match_data);
+ 
+-  if (rc == PCRE_ERROR_NOMATCH)
++  if (rc == PCRE2_ERROR_NOMATCH)
+     return 0;
+ 
+   if (rc < 0 ) {
+diff --git a/swig-renderdoc-modified-7/Tools/cmake/FindPCRE2.cmake b/swig-renderdoc-modified-7/Tools/cmake/FindPCRE2.cmake
+new file mode 100644
+index 000000000000..08c21634745d
+--- /dev/null
++++ b/swig-renderdoc-modified-7/Tools/cmake/FindPCRE2.cmake
+@@ -0,0 +1,21 @@
++# - Find PCRE2
++# Perl Compatible Regular Expressions
++# https://www.pcre.org/
++
++# The following variables are set:
++# PCRE2_FOUND - System has the PCRE library
++# PCRE2_LIBRARIES - The PCRE library file
++# PCRE2_INCLUDE_DIRS - The folder with the PCRE headers
++
++find_library(PCRE2_LIBRARY NAMES pcre2 pcre2-8)
++find_path(PCRE2_INCLUDE_DIR pcre2.h)
++
++set (PCRE2_LIBRARIES ${PCRE2_LIBRARY})
++set (PCRE2_INCLUDE_DIRS ${PCRE2_INCLUDE_DIR})
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(PCRE2 DEFAULT_MSG PCRE2_LIBRARIES PCRE2_INCLUDE_DIRS)
++
++mark_as_advanced (
++  PCRE2_LIBRARY
++  PCRE2_INCLUDE_DIR)
+diff --git a/swig-renderdoc-modified-7/configure.ac b/swig-renderdoc-modified-7/configure.ac
+index 4e8abde5fd7e..3e6e05c683b1 100644
+--- a/swig-renderdoc-modified-7/configure.ac
++++ b/swig-renderdoc-modified-7/configure.ac
+@@ -67,24 +67,24 @@ dnl To make configuring easier, check for a locally built PCRE using the Tools/p
+ if test x"${with_pcre}" = xyes ; then
+   AC_MSG_CHECKING([whether to use local PCRE])
+   local_pcre_config=no
+-  if test -z $PCRE_CONFIG; then
+-    if test -f `pwd`/pcre/pcre-swig-install/bin/pcre-config; then
+-      PCRE_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre-config
+-      local_pcre_config=$PCRE_CONFIG
++  if test -z $PCRE2_CONFIG; then
++    if test -f `pwd`/pcre/pcre-swig-install/bin/pcre2-config; then
++      PCRE2_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre2-config
++      local_pcre_config=$PCRE2_CONFIG
+     fi
+   fi
+   AC_MSG_RESULT([$local_pcre_config])
+ fi
+ AS_IF([test "x$with_pcre" != xno],
+-  [AX_PATH_GENERIC([pcre],
++  [AX_PATH_GENERIC([pcre2],
+     [], dnl Minimal version of PCRE we need -- accept any
+     [], dnl custom sed script for version parsing is not needed
+     [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
+-     LIBS="$LIBS $PCRE_LIBS"
+-     CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
++     LIBS="$LIBS $PCRE2_LIBS"
++     CPPFLAGS="$CPPFLAGS $PCRE2_CFLAGS"
+     ],
+     [AC_MSG_FAILURE([
+-        Cannot find pcre-config script from PCRE (Perl Compatible Regular Expressions)
++        Cannot find pcre2-config script from PCRE (Perl Compatible Regular Expressions)
+         library package. This dependency is needed for configure to complete,
+         Either:
+         - Install the PCRE developer package on your system (preferred approach).
+@@ -95,7 +95,8 @@ AS_IF([test "x$with_pcre" != xno],
+           (quite easy and does not require privileges to install PCRE on your system)
+         - Use configure --without-pcre to disable regular expressions support in SWIG
+           (not recommended).])
+-    ])
++    ],
++    [],[],[--libs8])
+   ])
+ 
+ 
+-- 
+2.49.0
+

renderdoc-1.32.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:394a33d30d17326e9895e3d92131555ed2b3bf9f9e302e601a4e60bbcb93140a
-size 51324019

renderdoc-1.33.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b767a1a1824cfe0009a266c0383fc0d7702487743dd2ccd748a8e61aaf936ff9
-size 51427526

renderdoc-1.34.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4aacec129a6ff01c55eee6e8d3af7f4a57f82c6561dee7d9d0a6ebd3fcc6445d
-size 51576662

renderdoc-1.39.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ceed91c783265dc372a1394b26cf79596f970fd05138bb9913e74f9996a7243
+size 53322040

renderdoc.changes

@@ -1,4 +1,143 @@
 -------------------------------------------------------------------
+Fri Jul 11 10:03:28 UTC 2025 - Sean Baggaley <me@drinkybird.net>
+
+- Update to version 1.39
+  * UI: Adjust shader debugger colours when using the dark theme.
+  * D3D12: Match variable names to disassembly for resource access SSA names.
+  * D3D12: Ensure SSA variables are displayed until the end of their use.
+  * D3D12: Add support for variable length strings in PIX strings, as well as V2 PIX strings.
+  * D3D12: Improve DXIL disassembly for global pointers.
+  * Vulkan: Improve SPIR-V disassembly when basic block order is unconventional.
+  * Vulkan: Add support for extensions:
+    - VK_KHR_robustness2
+    - VK_EXT_dynamic_rendering_unused_attachments
+
+-------------------------------------------------------------------
+Fri Jun 20 07:50:47 UTC 2025 - Sean Baggaley <me@drinkybird.net>
+
+- Update to version 1.38
+  * UI: RGB casts of values in the Shader Debugger watch window
+    or Buffer Viewer now treat values as linear, not sRGB.
+  * UI: Constant buffer variables can now be shown with an RGB swatch
+    using the [[rgb]] annotation.
+  * UI: The texture goto-pixel window no longer closes when the mouse
+    leaves the window, it closes when the window loses focus.
+  * UI: Shader search paths now have a 'recursive' toggle which defaults
+    to on. When unchecked, this path will never be searched recursively
+    for files to locate missing separate debug information. This can be
+    useful for slow shared drives or very large folders with many files,
+    where exact filename matches are expected as standard.
+  * AMD: Update version of GPUPerfAPI to 4.0.
+  * Android: Add specific error message for broken devices.
+  * D3D12: When reflection information is stripped from an SM5 shader
+    and separate debug info is available in a pdb, try to regenerate
+    best-effort reflection with the debug data available.
+  * D3D12: Improve custom DXIL disassembly for resource/cbuffer
+    array access.
+  * D3D12: Improve matching of separate debug information and add some
+    new heuristics to match PIX's undocumented search behaviour.
+  * Vulkan & D3D12: Improve error messages when mesh shader output comes
+    back as invalid, in case of application errors.
+  * Vulkan: Remove change of pipeline cache UUID to allow applications
+    to preserve pipeline cache between running with and without RenderDoc.
+  * Vulkan: Implement support for extensions:
+    - VK_KHR_maintenance5
+    - VK_EXT_image_compression_control
+    - VK_EXT_image_compression_control_swapchain
+
+-------------------------------------------------------------------
+Wed Mar 26 09:21:40 UTC 2025 - Fabian Vogt <fvogt@suse.com>
+
+- Add patch to backport PCRE2 to the swig fork:
+  * 0001-PCRE2.patch
+
+-------------------------------------------------------------------
+Fri Mar 14 12:37:45 UTC 2025 - Patrik Jakobsson <patrik.jakobsson@suse.com>
+
+- Update to version 1.37
+  * UI: Python extension registration has more error checking
+    and is more robust to syntax errors during
+    register/unregister functions.
+  * UI: Try to preserve selected pipeline stage when switching
+    between mesh and normal draws.
+  * D3D12: Bitfield declarations are reflected from DXIL
+    metadata for structure types.
+  * D3D12: Add handling of undocumented chunk in DXBC containers
+    that can include source code files.
+  * D3D12: Improve detection of code scopes during DXIL shader
+    debugging.
+  * D3D12: Improve handling of debug info mapping source
+    variables to information in DXIL.
+  * D3D12: Do limited parse of DXBC container to determine state
+    object entry points.
+  * D3D12: Improve display of root buffer structured buffers.
+  * Vulkan: Improved capture memory overhead for cases of many
+    images aliased in one location with only a small number
+    used.
+  * Vulkan: Optimise repeated name-setting of objects to not
+    record every name.
+  * Vulkan: Improve speed of processing printf messages for
+    large shaders.
+  * Vulkan: Ignore certain WSI-only extensions for replay
+    compatibility as they are unused.
+  * Vulkan: Preserve selected stage where possible when
+    switching between mesh-shader and normal draws.
+  * Vulkan: Implement capture and replay support for a number of
+    extensions (not including shader debugging):
+  * VK_KHR_shader_quad_control
+  * VK_KHR_shader_maximal_reconvergence
+  * VK_KHR_shader_expect_assume
+  * VK_KHR_shader_float_controls2
+  * VK_KHR_shader_subgroup_rotate
+  * VK_KHR_ray_tracing_position_fetch
+  * VK_KHR_ray_tracing_maintenance1
+ 
+
+-------------------------------------------------------------------
+Mon Feb  3 13:46:11 UTC 2025 - Patrik Jakobsson <patrik.jakobsson@suse.com>
+
+- Set BuildArch to noarch for the devel package
+- Update to version 1.36
+  * DXIL debugging
+  * Raytracing capture
+  * All: Allow pointers to basic types (e.g. float *foo) in
+    buffer formatter instead of requiring a struct as the
+    pointee type.
+  * All: Allow buffer formats to specify an alignment tighter
+    than natural alignment (e.g. 4 byte alignment on a struct
+    with 64-bit integers).
+  * All: Improve some performance during capture for DLL loads
+    that happen at very high frequency.
+  * Images: Add support for tiled and mip-mapped EXR images and
+    improved interpretation of channels.
+  * Images: Improve loading times of EXR files via multithreaded
+    decoding and texel reading optimisations.
+  * D3D12: Display thread group size for MS/AS disassembly.
+  * D3D12: Match undocumented PIX behaviour to recursively
+    search for matching shader debug files within search
+    locations. Selection behaviour when there are multiple
+    matches is not currently defined.
+  * D3D12: Improve reporting of driver version for WARP devices.
+  * D3D12: Improve some aspects of RenderDoc's DXIL disassembly
+    for better readability and displaying more useful
+    information.
+  * D3D12: Improve overhead when idle during capture by removing
+    unnecessary CPU-GPU syncs.
+  * D3D12: Added a custom interface for naming descriptors in a
+    descriptor heap.
+  * Vulkan: Add support for debugging shaders using
+    EXT_shader_object.
+  * Vulkan: Implement support for
+    VK_KHR_dynamic_rendering_local_read.
+  * Vulkan: Add support for debugging mesh shaders, with the
+    same stipulations and restrictions as compute shaders that
+    only one thread is simulated artificially in isolation
+    without any other threads in the group to communciate with.
+  * Vulkan: Physical devices are clamped to the highest
+    supported version (currently 1.3) manually now as the vulkan
+    loader no longer does this or removes the layer
+    automatically.
+-------------------------------------------------------------------
 Wed Aug  7 13:07:35 UTC 2024 - Patrik Jakobsson <patrik.jakobsson@suse.com>
 
 - Update to version 1.34

renderdoc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package renderdoc
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           renderdoc
-Version:        1.34
+Version:        1.39
 Release:        0
 Summary:        A frame-capture based graphics debugger
 License:        MIT
@@ -27,6 +27,9 @@ Source0:        https://github.com/baldurk/renderdoc/archive/v%{version}/renderd
 Source1:        https://github.com/baldurk/swig/archive/renderdoc-modified-7.zip
 Patch0:         0001-Fix-install-rpaths.patch
 Patch1:         0002-Add-debugger-as-desktop-menu-category.patch
+# Applies to the extracted renderdoc-modified-7.zip.
+# Created with git format-patch --src-prefix=a/swig-renderdoc-modified-7/ --dst-prefix=b/swig-renderdoc-modified-7/
+Patch2:         0001-PCRE2.patch
 BuildRequires:  Mesa-libGL-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -41,8 +44,9 @@ BuildRequires:  libqt5-qtsvg-devel
 BuildRequires:  libqt5-qtx11extras-devel
 BuildRequires:  libxcb-devel
 BuildRequires:  memory-constraints
-BuildRequires:  pcre-devel
+BuildRequires:  pcre2-devel
 BuildRequires:  python3-devel
+BuildRequires:  unzip
 BuildRequires:  vulkan-devel
 BuildRequires:  xcb-util-keysyms-devel
 
@@ -53,13 +57,14 @@ available for Vulkan, D3D11, D3D12, OpenGL, and OpenGL ES development.
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name} = %{version}
+BuildArch:      noarch
 
 %description devel
 RenderDoc is a frame-capture based graphics debugger, currently
 available for Vulkan, D3D11, D3D12, OpenGL, and OpenGL ES development.
 
 %prep
-%autosetup -p1 -n renderdoc-%{version}
+%autosetup -p1 -n renderdoc-%{version} -a 1
 
 %build
 %limit_build -m 1750
@@ -70,7 +75,7 @@ mkdir %{_builddir}/%{name}-%{version}/build && cd %{_builddir}/%{name}-%{version
         -DLIB_SUFFIX=64 \
 %endif
   -DQMAKE_QT5_COMMAND=qmake-qt5 \
-  -DRENDERDOC_SWIG_PACKAGE=%{_sourcedir}/renderdoc-modified-7.zip \
+  -DRENDERDOC_SWIG_PACKAGE=%{_builddir}/%{name}-%{version}/swig-renderdoc-modified-7 \
   -DENABLE_GL=YES \
   -DENABLE_VULKAN=YES \
   -DENABLE_XCB=YES \