From 7127e533a971357e7278245b54b04420808d6aa9 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Oct 30 2019 16:33:45 +0000 Subject: Update to renderdoc 1.5 New upstream release, which has a part of the python 3.8 patches. Also move the vulkan layer config file from /etc/ to /usr/share/. --- diff --git a/.gitignore b/.gitignore index d108223..0a4c539 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /renderdoc-1.1.tar.gz /renderdoc-1.4.tar.gz /swig-modified-6.tar.gz +/renderdoc-1.5.tar.gz +/swig-modified-7.tar.gz diff --git a/cmake-py38.patch b/cmake-py38.patch index fc1adb9..b810133 100644 --- a/cmake-py38.patch +++ b/cmake-py38.patch @@ -1,20 +1,18 @@ -From 56769d3e2cc12670b73a1ddd9dfaab959340c2e2 Mon Sep 17 00:00:00 2001 +From e6a3ea09ea206766fa1794492220605546b5c0af Mon Sep 17 00:00:00 2001 From: Christian Kellner -Date: Thu, 11 Jul 2019 21:27:02 +0200 -Subject: [PATCH] CMake: py3.8 support, ability to patch swig +Date: Tue, 29 Oct 2019 13:48:48 +0100 +Subject: [PATCH] CMake: py3.8 support -Add 3.8 to list of python versions and ability to patch the custom -swig, also needed for 3.8 +Add 3.8 to list of python versions. --- - CMakeLists.txt | 2 +- - qrenderdoc/CMakeLists.txt | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13818e5b8..00feda2ad 100644 +index 082a6f5a3..44bff9080 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -308,7 +308,7 @@ add_subdirectory(renderdoc) +@@ -357,7 +357,7 @@ add_subdirectory(renderdoc) # are handled in common if(ENABLE_QRENDERDOC OR ENABLE_PYRENDERDOC) # Make sure Python 3 is found @@ -23,26 +21,6 @@ index 13818e5b8..00feda2ad 100644 find_package(PythonInterp 3 REQUIRED) find_package(PythonLibs 3 REQUIRED) # we also need python3-config for swig -diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt -index 9fd65b2d3..1ef284349 100644 ---- a/qrenderdoc/CMakeLists.txt -+++ b/qrenderdoc/CMakeLists.txt -@@ -7,6 +7,7 @@ endif() - - set(QMAKE_QT5_COMMAND ${QT_QMAKE_EXECUTABLE} CACHE STRING "Command to run to invoke Qt5's qmake. Normally this is qmake, possibly with qtchooser, but might be qmake-qt5") - set(RENDERDOC_SWIG_PACKAGE https://github.com/baldurk/swig/archive/renderdoc-modified-6.zip CACHE STRING "The location where RenderDoc's swig fork source can be found. By default points to the URL on github but can be pointed to a local file.") -+set(RENDERDOC_SWIG_PATCH "" CACHE STRING "The location for the patch to apply to swig.") - - set(QMAKE_CONFIG "debug") - set(QMAKE_LDFLAGS "") -@@ -99,6 +100,7 @@ ExternalProject_Add(custom_swig - # using an URL to a zip directly so we don't clone the history etc - URL ${RENDERDOC_SWIG_PACKAGE} - BUILD_IN_SOURCE 1 -+ PATCH_COMMAND patch -p1 -i ${RENDERDOC_SWIG_PATCH} > /dev/null - CONFIGURE_COMMAND ./autogen.sh > /dev/null 2>&1 - COMMAND CC=${SWIG_CONFIGURE_CC} CXX=${SWIG_CONFIGURE_CXX} CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --with-pcre=yes --prefix=${CMAKE_BINARY_DIR} > /dev/null - BUILD_COMMAND ${GENERATOR_MAKE} > /dev/null 2>&1 -- -2.21.0 +2.23.0 diff --git a/renderdoc.spec b/renderdoc.spec index c671040..afc7c1f 100644 --- a/renderdoc.spec +++ b/renderdoc.spec @@ -1,7 +1,12 @@ -%global vswig modified-6 +%global vswig modified-7 Name: renderdoc +<<<<<<< HEAD Version: 1.4 Release: 4%{?dist} +======= +Version: 1.5 +Release: 1%{?dist} +>>>>>>> Update to renderdoc 1.5 Summary: A stand-alone graphics debugging tool License: MIT @@ -10,7 +15,6 @@ Source0: https://github.com/baldurk/renderdoc/archive/v%{version}/%{name} Source1: https://github.com/baldurk/swig/archive/renderdoc-%{vswig}/swig-%{vswig}.tar.gz Patch0: cmake-py38.patch -Patch1: swig-py38.patch # plthook library, used by renderdoc is only supported on x86 ExclusiveArch: %{ix86} x86_64 @@ -59,7 +63,6 @@ cd build %cmake .. \ -DQMAKE_QT5_COMMAND=qmake-qt5 \ -DRENDERDOC_SWIG_PACKAGE=%{SOURCE1} \ - -DRENDERDOC_SWIG_PATCH=%{PATCH1} \ -DENABLE_GL=ON \ -DENABLE_VULKAN=ON \ -DENABLE_RENDERDOCCMD=ON \ @@ -70,6 +73,7 @@ cd build -DBUILD_VERSION_DIST_CONTACT="https://bugzilla.redhat.com" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUBFOLDER=renderdoc \ + -DVULKAN_LAYER_FOLDER=/usr/share/vulkan/implicit_layer.d \ -DCMAKE_BUILD_TYPE=Release %make_build @@ -92,15 +96,22 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/mimetypes/application-x-renderdoc-capture.* %{_datadir}/mime/packages/renderdoc-capture.xml %{_datadir}/pixmaps/%{name}-icon-*.xpm - %doc %{_docdir}/%{name}/ -%{_sysconfdir}/vulkan/implicit_layer.d/%{name}_capture.json +%{_datadir}/vulkan/implicit_layer.d/%{name}_capture.json %files devel %{_includedir}/%{name}.h %changelog +* Mon Oct 28 2019 Christian Kellner - 1.5-1 +- renderdoc 1.5 (new upstream release) + Resolves: rhbz#1760976 +- Drop swig patch (got upstreamed) +- Adjust CMake patch (drop the swig part) +- Move capture layer config from /etc to /usr/share + Resolves: rhbz#1762274 + * Mon Aug 19 2019 Miro Hrončok - 1.4-4 - Rebuilt for Python 3.8 diff --git a/sources b/sources index cf5b427..c142c43 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (renderdoc-1.4.tar.gz) = 7d57dc135151e22fd615fab5ada0efdd6af5fe86304f57b26794a594524b9238e9a882fa020a450a48a2d2e1c6f7e5c930bbd0b1bea5a5c9ca41a6c28b8a7f0b -SHA512 (swig-modified-6.tar.gz) = 2cbf32d010cf642c8c4888b0c84c230145680d67daf10b08446fcf853132acfdd6fe3a2c67505a4569da0732359db7452a45476222934f4631bcfff248dcea67 +SHA512 (renderdoc-1.5.tar.gz) = 771d406a7a946a8ff34f1466feaf33ec0271f48d4ba06b37c59e011ffaaede3b8f608c8de4145b3a40259d643f33041f721f5aadaffefbe5ae5116399485049d +SHA512 (swig-modified-7.tar.gz) = 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86 diff --git a/swig-i386.patch b/swig-i386.patch deleted file mode 100644 index 1ebb7f5..0000000 --- a/swig-i386.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 4a5393b41e4d4f068e2af397980a5c7455be6b01 -Author: Rémi Verschelde -Date: Fri Mar 9 12:14:11 2018 +0100 - - CMake: Set SWIG word size based on architecture - - Fixes #906. - -diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt -index 0cd823aa9..a3dab7f81 100644 ---- a/qrenderdoc/CMakeLists.txt -+++ b/qrenderdoc/CMakeLists.txt -@@ -16,7 +16,11 @@ if(STATIC_QRENDERDOC) - endif() - - if(NOT APPLE) -- set(SWIG_FLAGS "-DSWIGWORDSIZE64") -+ if(CMAKE_SIZEOF_VOID_P EQUAL 8) # 64-bit -+ set(SWIG_FLAGS "-DSWIGWORDSIZE64") -+ else() # 32-bit -+ set(SWIG_FLAGS "-DSWIGWORDSIZE32") -+ endif() - endif() - - if(QRENDERDOC_NO_CXX11_REGEX) diff --git a/swig-py38.patch b/swig-py38.patch deleted file mode 100644 index 0595599..0000000 --- a/swig-py38.patch +++ /dev/null @@ -1,28 +0,0 @@ -From dbe955dd0300d55a32fd73a4eef730b3e30ed5c4 Mon Sep 17 00:00:00 2001 -From: Christian Kellner -Date: Thu, 11 Jul 2019 20:32:03 +0200 -Subject: [PATCH] swig: avoid use of _PyObject_GC_UNTRACK - -It is deprecated[1]. Use PyObject_GC_UnTrack instead. - -[1] https://docs.python.org/3/c-api/gcsupport.html#c._PyObject_GC_UNTRACK ---- - Lib/python/builtin.swg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Lib/python/builtin.swg b/Lib/python/builtin.swg -index 9597653b7..6af45a9d1 100644 ---- a/Lib/python/builtin.swg -+++ b/Lib/python/builtin.swg -@@ -120,7 +120,7 @@ SwigPyBuiltin_FunpackSetterClosure (PyObject *obj, PyObject *val, void *closure) - - SWIGINTERN void - SwigPyStaticVar_dealloc(PyDescrObject *descr) { -- _PyObject_GC_UNTRACK(descr); -+ PyObject_GC_UnTrack(descr); - Py_XDECREF(PyDescr_TYPE(descr)); - Py_XDECREF(PyDescr_NAME(descr)); - PyObject_GC_Del(descr); --- -2.21.0 -