blob: eb77927f6ea9f4a2c022c29f19197c7efb541155 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
https://github.com/zaps166/QMPlay2/pull/541
fix include memory with USE_VULKAN=OFF
Those header files are using std::shared_ptr from memory header even
when USE_VULKAN is OFF, so we must include them unconditionally.
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
--- a/src/qmplay2/LibASS.hpp
+++ b/src/qmplay2/LibASS.hpp
@@ -23,6 +23,7 @@
#include <QByteArray>
#include <QList>
+#include <memory>
#include <set>
class Settings;
@@ -35,7 +36,6 @@ struct ass_renderer;
struct ass_image;
#ifdef USE_VULKAN
-#include <memory>
namespace QmVk {
class BufferPool;
}
--- a/src/qmplay2/QMPlay2OSD.hpp
+++ b/src/qmplay2/QMPlay2OSD.hpp
@@ -25,14 +25,13 @@
#include <QRect>
#include <functional>
+#include <memory>
#include <vector>
#include <mutex>
#ifdef USE_VULKAN
# include <QVector4D>
-# include <memory>
-
namespace QmVk {
class Buffer;
|
