Dylan Aïssi pushed to branch master at X Strike Force / vulkan / gfxreconstruct
Commits:
b814bda2 by Dylan Aïssi at 2021-10-21T17:52:20+02:00
Add an upstream patch to fix compiling with GCC 11
- - - - -
f6d5de7f by Dylan Aïssi at 2021-10-21T17:58:15+02:00
Uplaod to unstable
Signed-off-by: Dylan Aïssi <dylan.ai...@collabora.com>
- - - - -
4 changed files:
- debian/changelog
- + debian/patches/02_Fix_build_with_GCC11.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+gfxreconstruct (0.9.9+dfsg-2) unstable; urgency=medium
+
+ * Add an upstream patch to fix compiling with GCC 11.
+
+ -- Dylan Aïssi <dai...@debian.org> Thu, 21 Oct 2021 17:57:53 +0200
+
gfxreconstruct (0.9.9+dfsg-1) unstable; urgency=medium
* Initial release (Closes: #989464)
=====================================
debian/patches/02_Fix_build_with_GCC11.patch
=====================================
@@ -0,0 +1,57 @@
+From 1e1853aea10c43232c64d8cd572ff1d4b98a7688 Mon Sep 17 00:00:00 2001
+From: Michael Skorokhodov <mykhailo.skorokho...@globallogic.com>
+Date: Wed, 11 Aug 2021 12:44:35 +0300
+Subject: [PATCH] Fix compiling with gcc11
+
+---
+ framework/encode/trace_manager.cpp | 8 +++++---
+ framework/encode/vulkan_handle_wrapper_util.h | 3 ++-
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/framework/encode/trace_manager.cpp
b/framework/encode/trace_manager.cpp
+index 2542b96b..687084ca 100644
+--- a/framework/encode/trace_manager.cpp
++++ b/framework/encode/trace_manager.cpp
+@@ -37,6 +37,8 @@
+ #include "util/page_guard_manager.h"
+ #include "util/platform.h"
+
++#include <algorithm>
++#include <iterator>
+ #include <cassert>
+ #include <unordered_set>
+
+@@ -920,9 +922,9 @@ void
TraceManager::WriteSetDeviceMemoryPropertiesCommand(format::HandleId
+ // populate thread_data's scratch_buffer_ then write to file.
+ auto& scratch_buffer = thread_data->GetScratchBuffer();
+ scratch_buffer.clear();
+- scratch_buffer.insert(scratch_buffer.end(),
+-
reinterpret_cast<uint8_t*>(&memory_properties_cmd),
+-
reinterpret_cast<uint8_t*>(&memory_properties_cmd) +
sizeof(memory_properties_cmd));
++ std::copy(reinterpret_cast<uint8_t*>(&memory_properties_cmd),
++ reinterpret_cast<uint8_t*>(&memory_properties_cmd) +
sizeof(memory_properties_cmd),
++ std::back_inserter(scratch_buffer));
+
+ format::DeviceMemoryType type;
+ for (uint32_t i = 0; i < memory_properties.memoryTypeCount; ++i)
+diff --git a/framework/encode/vulkan_handle_wrapper_util.h
b/framework/encode/vulkan_handle_wrapper_util.h
+index f94ca3f3..e3e04b35 100644
+--- a/framework/encode/vulkan_handle_wrapper_util.h
++++ b/framework/encode/vulkan_handle_wrapper_util.h
+@@ -30,6 +30,7 @@
+ #include "util/defines.h"
+
+ #include <algorithm>
++#include <iterator>
+ #include <cassert>
+ #include <vector>
+
+@@ -77,7 +78,7 @@ class HandleUnwrapMemory
+ {
+ next_buffer = &buffers_[next_index];
+ next_buffer->clear();
+- next_buffer->insert(next_buffer->end(), data, data + len);
++ std::copy(data, data + len, std::back_inserter(*next_buffer));
+ }
+ else
+ {
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
01_Use_system_Vulkan.patch
+02_Fix_build_with_GCC11.patch
=====================================
debian/rules
=====================================
@@ -2,10 +2,6 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-# Temporary workaround to build with GCC 11
-# https://github.com/LunarG/gfxreconstruct/issues/544
-export DEB_CXXFLAGS_MAINT_APPEND = "-Wno-error=stringop-overflow="
-
%:
dh $@
View it on GitLab:
https://salsa.debian.org/xorg-team/vulkan/gfxreconstruct/-/compare/786b3574b3ce0ea828662828d24ae98990431607...f6d5de7ff2890fda11ef2ae9cf8d7136195d22b2
--
View it on GitLab:
https://salsa.debian.org/xorg-team/vulkan/gfxreconstruct/-/compare/786b3574b3ce0ea828662828d24ae98990431607...f6d5de7ff2890fda11ef2ae9cf8d7136195d22b2
You're receiving this email because of your account on salsa.debian.org.
