From 70eee146b5ad0842e4dad6fec7cce4f6c5f39e34 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Feb 06 2020 10:11:00 +0000
Subject: Update to renderdoc 1.6


New upstream release. Needs a patch to fix compilation on gcc 10.

---

diff --git a/.gitignore b/.gitignore
index 0a4c539..9fe647b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /swig-modified-6.tar.gz
 /renderdoc-1.5.tar.gz
 /swig-modified-7.tar.gz
+/renderdoc-1.6.tar.gz
diff --git a/gcc-libsdc-10.patch b/gcc-libsdc-10.patch
new file mode 100644
index 0000000..f465b94
--- /dev/null
+++ b/gcc-libsdc-10.patch
@@ -0,0 +1,77 @@
+From 29403836c60fd8d61325e9972d3a56d8b0ff0178 Mon Sep 17 00:00:00 2001
+From: Jeremy Ong <jeremycong@gmail.com>
+Date: Thu, 16 Jan 2020 12:40:20 -0700
+Subject: [PATCH] Fix numerous compiler warnings and errors
+
+Depending on OS and compiler, certain types may not be included
+transitively by headers that were included previously. This commit
+produces a clean build on the latest trunk versions of GCC, Clang,
+and QT.
+---
+ renderdoc/common/dds_readwrite.h            | 1 +
+ renderdoc/core/core.h                       | 1 +
+ renderdoc/os/os_specific.h                  | 1 +
+ renderdoc/os/posix/linux/linux_stringio.cpp | 1 +
+ renderdoc/strings/utf8printf.cpp            | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/renderdoc/common/dds_readwrite.h b/renderdoc/common/dds_readwrite.h
+index a718889a1..0723057fd 100644
+--- a/renderdoc/common/dds_readwrite.h
++++ b/renderdoc/common/dds_readwrite.h
+@@ -24,6 +24,7 @@
+ 
+ #pragma once
+ 
++#include <stdio.h>
+ #include "api/replay/data_types.h"
+ 
+ struct dds_data
+diff --git a/renderdoc/core/core.h b/renderdoc/core/core.h
+index 0f7df0726..4440714df 100644
+--- a/renderdoc/core/core.h
++++ b/renderdoc/core/core.h
+@@ -26,6 +26,7 @@
+ #pragma once
+ 
+ #include <stdint.h>
++#include <stdio.h>
+ #include <map>
+ #include "api/app/renderdoc_app.h"
+ #include "api/replay/apidefs.h"
+diff --git a/renderdoc/os/os_specific.h b/renderdoc/os/os_specific.h
+index 5191bcaea..b5f796d59 100644
+--- a/renderdoc/os/os_specific.h
++++ b/renderdoc/os/os_specific.h
+@@ -34,6 +34,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <stdint.h>
++#include <stdio.h>
+ #include <functional>
+ #include "api/replay/rdcarray.h"
+ #include "api/replay/rdcpair.h"
+diff --git a/renderdoc/os/posix/linux/linux_stringio.cpp b/renderdoc/os/posix/linux/linux_stringio.cpp
+index 27b25476c..d0def39f0 100644
+--- a/renderdoc/os/posix/linux/linux_stringio.cpp
++++ b/renderdoc/os/posix/linux/linux_stringio.cpp
+@@ -22,6 +22,7 @@
+  * THE SOFTWARE.
+  ******************************************************************************/
+ 
++#include <ctype.h>
+ #include <dlfcn.h>
+ #include <errno.h>
+ #include <iconv.h>
+diff --git a/renderdoc/strings/utf8printf.cpp b/renderdoc/strings/utf8printf.cpp
+index d09fd2d64..254841d22 100644
+--- a/renderdoc/strings/utf8printf.cpp
++++ b/renderdoc/strings/utf8printf.cpp
+@@ -22,6 +22,7 @@
+  * THE SOFTWARE.
+  ******************************************************************************/
+ 
++#include <wchar.h>
+ #include "common/common.h"
+ #include "os/os_specific.h"
+ 
diff --git a/renderdoc.spec b/renderdoc.spec
index 35628d1..0c407ef 100644
--- a/renderdoc.spec
+++ b/renderdoc.spec
@@ -1,7 +1,7 @@
 %global vswig   modified-7
 Name:           renderdoc
-Version:        1.5
-Release:        2%{?dist}
+Version:        1.6
+Release:        1%{?dist}
 Summary:        A stand-alone graphics debugging tool
 
 License:        MIT
@@ -10,6 +10,7 @@ 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:         gcc-libsdc-10.patch
 # plthook library, used by renderdoc is only supported on x86
 ExclusiveArch: %{ix86} x86_64
 
@@ -20,6 +21,7 @@ BuildRequires:  pcre-devel
 
 # for the renderdoc itself
 BuildRequires:  cmake
+BuildRequires:  make
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig(vulkan)
 BuildRequires:  bison
@@ -49,8 +51,7 @@ required to develop applications that want to integrate with
 renderdoc.
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
+%autosetup -p1 -n %{name}-%{version}
 
 %build
 mkdir -p build
@@ -99,6 +100,12 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 
 %changelog
+* Wed Feb  5 2020 Christian Kellner <ckellner@redhat.com> - 1.6-1
+- New upstream release (1.6)
+  Resolves: rhbz#1792068
+- Include patch to fix compilation on gcc10
+  https://github.com/baldurk/renderdoc/commit/29403836c60fd8d61325e9972d3a56d8b0ff0178
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index c142c43..daf228f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (renderdoc-1.5.tar.gz) = 771d406a7a946a8ff34f1466feaf33ec0271f48d4ba06b37c59e011ffaaede3b8f608c8de4145b3a40259d643f33041f721f5aadaffefbe5ae5116399485049d
+SHA512 (renderdoc-1.6.tar.gz) = 455c29dbd81bff468a3a0878d123b516c587dfc342ad308af9a6f25822c63bcd6ce2db7ed05b216c50409e6871220d52d2bd42e8806c19aabeeb80ec9a0bf471
 SHA512 (swig-modified-7.tar.gz) = 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86