From b4d5860b78fe77954af8fe42ba391a089a009911 Mon Sep 17 00:00:00 2001 From: kb1000 Date: Feb 11 2024 00:15:58 +0000 Subject: Update to 1.30 (fedora#2254392) --- diff --git a/.gitignore b/.gitignore index 9dd3084..fce3f93 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /renderdoc-1.10.tar.gz /renderdoc-1.16.tar.gz /renderdoc-1.17.tar.gz +/renderdoc-1.30.tar.gz diff --git a/renderdoc-swig-pcre2-1.patch b/renderdoc-swig-pcre2-1.patch new file mode 100644 index 0000000..a6e431f --- /dev/null +++ b/renderdoc-swig-pcre2-1.patch @@ -0,0 +1,279 @@ +From e3f23c3086e8806fce1e1825519393036ed366cc Mon Sep 17 00:00:00 2001 +From: Julien Schueller +Date: Tue, 4 Jan 2022 13:50:02 +0100 +Subject: [PATCH 1/2] PCRE2 + +Closes #2120 +--- + Doc/Manual/Preface.html | 6 +++--- + Source/Swig/misc.c | 41 ++++++++++++++++++++++++------------- + Source/Swig/naming.c | 22 ++++++++++++-------- + Tools/cmake/FindPCRE2.cmake | 21 +++++++++++++++++++ + Tools/mkwindows.sh | 2 +- + Tools/pcre-build.sh | 4 ++-- + configure.ac | 19 +++++++++-------- + 7 files changed, 78 insertions(+), 37 deletions(-) + create mode 100644 Tools/cmake/FindPCRE2.cmake + +diff --git a/Doc/Manual/Preface.html b/Doc/Manual/Preface.html +index 3b654a6d2..6e0366bf9 100644 +--- a/Doc/Manual/Preface.html ++++ b/Doc/Manual/Preface.html +@@ -280,9 +280,9 @@ You must use GNU make to build a +

+ PCRE + needs to be installed on your system to build SWIG, in particular +-pcre-config must be available. If you have PCRE headers and libraries but not +-pcre-config itself or, alternatively, wish to override the compiler or linker +-flags returned by pcre-config, you may set PCRE_LIBS and PCRE_CFLAGS variables ++pcre2-config must be available. If you have PCRE headers and libraries but not ++pcre2-config itself or, alternatively, wish to override the compiler or linker ++flags returned by pcre-config, you may set PCRE2_LIBS and PCRE2_CFLAGS variables + to be used instead. And if you don't have PCRE at all, the configure script + will provide instructions for obtaining it. +

+diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c +index 91f05c0a2..c63f0a6c0 100644 +--- a/Source/Swig/misc.c ++++ b/Source/Swig/misc.c +@@ -1269,7 +1269,8 @@ void Swig_offset_string(String *s, int number) { + + + #ifdef HAVE_PCRE +-#include ++#define PCRE2_CODE_UNIT_WIDTH 8 ++#include + + 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/Source/Swig/naming.c b/Source/Swig/naming.c +index ce1dbe806..7b5c93e29 100644 +--- a/Source/Swig/naming.c ++++ b/Source/Swig/naming.c +@@ -1092,26 +1092,32 @@ static DOH *get_lattr(Node *n, List *lattr) { + } + + #ifdef HAVE_PCRE +-#include ++#define PCRE2_CODE_UNIT_WIDTH 8 ++#include + + 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/Tools/cmake/FindPCRE2.cmake b/Tools/cmake/FindPCRE2.cmake +new file mode 100644 +index 000000000..08c216347 +--- /dev/null ++++ b/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/Tools/mkwindows.sh b/Tools/mkwindows.sh +index 0651bbd60..735edeaf0 100755 +--- a/Tools/mkwindows.sh ++++ b/Tools/mkwindows.sh +@@ -77,7 +77,7 @@ export CXXFLAGS="$compileflags" + swigbasename=swig-$version + swigwinbasename=swigwin-$version + tarball=$swigbasename.tar.gz +-pcre_tarball=`ls pcre-*.tar.*` ++pcre_tarball=`ls pcre2-*.tar.*` + + if ! test -f "$pcre_tarball"; then + echo "Could not find PCRE tarball. Please download a PCRE source tarball from http://www.pcre.org" +diff --git a/Tools/pcre-build.sh b/Tools/pcre-build.sh +index 92f645da2..ffa7a69f8 100755 +--- a/Tools/pcre-build.sh ++++ b/Tools/pcre-build.sh +@@ -37,8 +37,8 @@ fi + + echo "Looking for PCRE tarball..." + rm -rf pcre +-pcre_tarball=`ls pcre-*.tar*` +-test -n "$pcre_tarball" || bail "Could not find tarball matching pattern: pcre-*.tar*" ++pcre_tarball=`ls pcre2-*.tar*` ++test -n "$pcre_tarball" || bail "Could not find tarball matching pattern: pcre2-*.tar*" + test -f "$pcre_tarball" || bail "Could not find a single PCRE tarball. Found: $pcre_tarball" + + echo "Extracting tarball: $pcre_tarball" +diff --git a/configure.ac b/configure.ac +index 4e8abde5f..3e6e05c68 100644 +--- a/configure.ac ++++ b/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.43.0 + diff --git a/renderdoc-swig-pcre2-2.patch b/renderdoc-swig-pcre2-2.patch new file mode 100644 index 0000000..836ef64 --- /dev/null +++ b/renderdoc-swig-pcre2-2.patch @@ -0,0 +1,185 @@ +From 2b7babaacaaa5e576f037e99cc6332760cd0358b Mon Sep 17 00:00:00 2001 +From: William S Fulton +Date: Thu, 20 Jan 2022 22:24:53 +0000 +Subject: [PATCH 2/2] Few more PCRE to PCRE2 changes + +--- + Doc/Manual/Preface.html | 8 ++++---- + Source/Modules/main.cxx | 2 +- + Source/Swig/misc.c | 2 +- + Tools/mkwindows.sh | 2 +- + Tools/pcre-build.sh | 26 +++++++++++++------------- + configure.ac | 18 +++++++++--------- + 6 files changed, 29 insertions(+), 29 deletions(-) + +diff --git a/Doc/Manual/Preface.html b/Doc/Manual/Preface.html +index 6e0366bf9..559e31e44 100644 +--- a/Doc/Manual/Preface.html ++++ b/Doc/Manual/Preface.html +@@ -278,12 +278,12 @@ You must use GNU make to build a +

+ +

+-PCRE ++PCRE2 + needs to be installed on your system to build SWIG, in particular +-pcre2-config must be available. If you have PCRE headers and libraries but not ++pcre2-config must be available. If you have PCRE2 headers and libraries but not + pcre2-config itself or, alternatively, wish to override the compiler or linker +-flags returned by pcre-config, you may set PCRE2_LIBS and PCRE2_CFLAGS variables +-to be used instead. And if you don't have PCRE at all, the configure script ++flags returned by pcre2-config, you may set PCRE2_LIBS and PCRE2_CFLAGS variables ++to be used instead. And if you don't have PCRE2 at all, the configure script + will provide instructions for obtaining it. +

+ +diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx +index 12b83b2e4..8bc467c76 100644 +--- a/Source/Modules/main.cxx ++++ b/Source/Modules/main.cxx +@@ -135,7 +135,7 @@ static const char *usage4 = (const char *) "\ + -oh - Set name of C++ output header file for directors to \n\ + -outcurrentdir - Set default output dir to current dir instead of input file's path\n\ + -outdir - Set language specific files output directory to \n\ +- -pcreversion - Display PCRE version information\n\ ++ -pcreversion - Display PCRE2 version information\n\ + -small - Compile in virtual elimination & compact mode\n\ + -swiglib - Report location of SWIG library and exit\n\ + -templatereduce - Reduce all the typedefs in templates\n\ +diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c +index c63f0a6c0..543762991 100644 +--- a/Source/Swig/misc.c ++++ b/Source/Swig/misc.c +@@ -1449,7 +1449,7 @@ String *Swig_pcre_version(void) { + char *buf = malloc(len); + String *result; + pcre2_config(PCRE2_CONFIG_VERSION, buf); +- result = NewStringf("PCRE Version: %s", buf); ++ result = NewStringf("PCRE2 Version: %s", buf); + free(buf); + return result; + } +diff --git a/Tools/mkwindows.sh b/Tools/mkwindows.sh +index 735edeaf0..c2b6b7cbf 100755 +--- a/Tools/mkwindows.sh ++++ b/Tools/mkwindows.sh +@@ -80,7 +80,7 @@ tarball=$swigbasename.tar.gz + pcre_tarball=`ls pcre2-*.tar.*` + + if ! test -f "$pcre_tarball"; then +- echo "Could not find PCRE tarball. Please download a PCRE source tarball from http://www.pcre.org" ++ echo "Could not find PCRE2 tarball. Please download a PCRE2 source tarball from http://www.pcre.org" + echo "and place in the same directory as the SWIG tarball." + exit 1 + fi +diff --git a/Tools/pcre-build.sh b/Tools/pcre-build.sh +index ffa7a69f8..e986d682f 100755 +--- a/Tools/pcre-build.sh ++++ b/Tools/pcre-build.sh +@@ -4,17 +4,17 @@ pcre_subdir=pcre/pcre-swig-install + pcre_install_dir=`pwd`/$pcre_subdir + + usage() { +- echo "Helper script to build PCRE as a static library from a tarball just for use during the" +- echo "SWIG build. It does not install PCRE for global use on your system." ++ echo "Helper script to build PCRE2 as a static library from a tarball just for use during the" ++ echo "SWIG build. It does not install PCRE2 for global use on your system." + echo "Usage: pcre-build.sh [--help] [args]" +- echo " args - optional additional arguments passed on to the PCRE configure script (leave out" ++ echo " args - optional additional arguments passed on to the PCRE2 configure script (leave out" + echo " unless you are an expert at configure)" + echo " --help - Display this help information." + echo "Instructions:" +- echo " - Download the latest PCRE source tarball from http://www.pcre.org and place in the" ++ echo " - Download the latest PCRE2 source tarball from http://www.pcre.org and place in the" + echo " directory that you will configure and build SWIG." + echo " - Run this script in the same directory that you intend to configure and build SWIG in." +- echo " This will configure and build PCRE as a static library." ++ echo " This will configure and build PCRE2 as a static library." + echo " - Afterwards run the SWIG configure script which will then find and use the PCRE static" + echo " libraries in the $pcre_subdir subdirectory." + exit 0 +@@ -35,21 +35,21 @@ if test -f "pcre-build.sh" ; then + usage + fi + +-echo "Looking for PCRE tarball..." ++echo "Looking for PCRE2 tarball..." + rm -rf pcre + pcre_tarball=`ls pcre2-*.tar*` + test -n "$pcre_tarball" || bail "Could not find tarball matching pattern: pcre2-*.tar*" +-test -f "$pcre_tarball" || bail "Could not find a single PCRE tarball. Found: $pcre_tarball" ++test -f "$pcre_tarball" || bail "Could not find a single PCRE2 tarball. Found: $pcre_tarball" + + echo "Extracting tarball: $pcre_tarball" + tar -xf $pcre_tarball || bail "Could not untar $pcre_tarball" + pcre_dir=`echo $pcre_tarball | sed -e "s/\.tar.*//"` + echo "Configuring PCRE in directory: pcre" + mv $pcre_dir pcre || bail "Could not create pcre directory" +-cd pcre && ./configure --prefix=$pcre_install_dir --disable-shared $* || bail "PCRE configure failed" +-echo "Building PCRE..." +-${MAKE:-make} -s || bail "Could not build PCRE" +-echo "Installing PCRE locally to $pcre_install_dir..." +-${MAKE:-make} -s install || bail "Could not install PCRE" ++cd pcre && ./configure --prefix=$pcre_install_dir --disable-shared $* || bail "PCRE2 configure failed" ++echo "Building PCRE2..." ++${MAKE:-make} -s || bail "Could not build PCRE2" ++echo "Installing PCRE2 locally to $pcre_install_dir..." ++${MAKE:-make} -s install || bail "Could not install PCRE2" + echo "" +-echo "The SWIG configure script can now be run, whereupon PCRE will automatically be detected and used from $pcre_install_dir/bin/pcre-config." ++echo "The SWIG configure script can now be run, whereupon PCRE2 will automatically be detected and used from $pcre_install_dir/bin/pcre-config." +diff --git a/configure.ac b/configure.ac +index 3e6e05c68..8df088ed5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,16 +56,16 @@ m4_ifdef([AC_PROG_SED],, [AC_DEFUN([AC_PROG_SED], [AC_PATH_PROG([SED], sed)])]) + + AC_ARG_WITH([pcre], + [AS_HELP_STRING([--without-pcre], +- [Disable support for regular expressions using PCRE])], ++ [Disable support for regular expressions using PCRE2])], + [], + [with_pcre=yes]) + +-AC_MSG_CHECKING([whether to enable PCRE support]) ++AC_MSG_CHECKING([whether to enable PCRE2 support]) + AC_MSG_RESULT([$with_pcre]) + + dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script + if test x"${with_pcre}" = xyes ; then +- AC_MSG_CHECKING([whether to use local PCRE]) ++ AC_MSG_CHECKING([whether to use local PCRE2]) + local_pcre_config=no + if test -z $PCRE2_CONFIG; then + if test -f `pwd`/pcre/pcre-swig-install/bin/pcre2-config; then +@@ -79,20 +79,20 @@ AS_IF([test "x$with_pcre" != xno], + [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]) ++ [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE2 library]) + LIBS="$LIBS $PCRE2_LIBS" + CPPFLAGS="$CPPFLAGS $PCRE2_CFLAGS" + ], + [AC_MSG_FAILURE([ +- Cannot find pcre2-config script from PCRE (Perl Compatible Regular Expressions) ++ Cannot find pcre2-config script from PCRE2 (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). +- - Download the PCRE source tarball, build and install on your system ++ - Install the PCRE2 developer package on your system (preferred approach). ++ - Download the PCRE2 source tarball, build and install on your system + as you would for any package built from source distribution. +- - Use the Tools/pcre-build.sh script to build PCRE just for SWIG to statically ++ - Use the Tools/pcre-build.sh script to build PCRE2 just for SWIG to statically + link against. Run 'Tools/pcre-build.sh --help' for instructions. +- (quite easy and does not require privileges to install PCRE on your system) ++ (quite easy and does not require privileges to install PCRE2 on your system) + - Use configure --without-pcre to disable regular expressions support in SWIG + (not recommended).]) + ], +-- +2.43.0 + diff --git a/renderdoc.spec b/renderdoc.spec index 5a3ae62..959876b 100644 --- a/renderdoc.spec +++ b/renderdoc.spec @@ -1,23 +1,27 @@ %global vswig modified-7 Name: renderdoc -Version: 1.17 -Release: 4%{?dist} +Version: 1.30 +Release: 3%{?dist} Summary: A stand-alone graphics debugging tool License: MIT URL: https://renderdoc.org Source0: https://github.com/baldurk/renderdoc/archive/v%{version}/%{name}-%{version}.tar.gz Source1: https://github.com/baldurk/swig/archive/renderdoc-%{vswig}/swig-%{vswig}.tar.gz +Patch0: renderdoc-swig-pcre2-1.patch +Patch1: renderdoc-swig-pcre2-2.patch # renderdoc is officially only supported on x86_64. -ExclusiveArch: x86_64 +# however, it also builds on aarch64 +ExclusiveArch: x86_64 aarch64 # for the local swig BuildRequires: autoconf BuildRequires: automake -BuildRequires: pcre-devel +BuildRequires: pcre2-devel # for the renderdoc itself +BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: make BuildRequires: desktop-file-utils @@ -51,7 +55,9 @@ required to develop applications that want to integrate with renderdoc. %prep -%autosetup -p1 -n %{name}-%{version} +%setup -q -b 1 +%patch -p1 -d %{_builddir}/swig-renderdoc-%{vswig} 0 +%patch -p1 -d %{_builddir}/swig-renderdoc-%{vswig} 1 %build # renderdoc does not allow in-source builds. out-of-source builds @@ -64,7 +70,7 @@ renderdoc. %define _lto_cflags %{nil} %cmake -DQMAKE_QT5_COMMAND=qmake-qt5 \ - -DRENDERDOC_SWIG_PACKAGE=%{SOURCE1} \ + -DRENDERDOC_SWIG_PACKAGE=%{_builddir}/swig-renderdoc-%{vswig} \ -DENABLE_GL=ON \ -DENABLE_VULKAN=ON \ -DENABLE_WAYLAND=ON \ @@ -94,6 +100,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_bindir}/qrenderdoc %{_bindir}/renderdoccmd %{_datadir}/applications/%{name}.desktop +%dir %{_libdir}/renderdoc %{_libdir}/renderdoc/lib%{name}.so %{_datadir}/thumbnailers/%{name}.thumbnailer %{_datadir}/icons/hicolor/*/mimetypes/application-x-renderdoc-capture.* @@ -107,6 +114,15 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %changelog +* Mon Jan 22 2024 kb1000 - 1.30-3 +- Build for aarch64 + +* Thu Dec 21 2023 kb1000 - 1.30-2 +- Move the custom SWIG to PCRE2 + +* Wed Dec 13 2023 kb1000 - 1.30-1~kb1000 +- Update to version 1.30 + * Sat Jul 23 2022 Fedora Release Engineering - 1.17-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 85b9304..664ccb7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (renderdoc-1.17.tar.gz) = 0f608f9bd5dfca58fd7d39529dcb49ef4df3af508cc1a90b9d327809cf47908731d0175f6b7510db6380f7e4041806d4d727005ff53ef4860f88db938ebc4c2d +SHA512 (renderdoc-1.30.tar.gz) = 33437f7420d6a79f2b02536ae63bc31537cfab83cdac2d44efdef377e93db7c0c15f2e46ecc67a6ea780f36b162f04d7a00ac3fe5d382fe761fa986664aceb60 SHA512 (swig-modified-7.tar.gz) = 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86