Changes of Revision 79

obs-studio.changes Changed
x
 
1
@@ -1,4 +1,10 @@
2
 -------------------------------------------------------------------
3
+Wed Jul  8 01:42:05 UTC 2020 - Jimmy Berry <jimmy@boombatower.com>
4
+
5
+- Add c7f84f8fc4e90ef779a204ac268f5ee1a962e324.patch to resolve
6
+  gcc10 build failure.
7
+
8
+-------------------------------------------------------------------
9
 Mon Apr 27 18:55:30 UTC 2020 - jimmy@boombatower.com
10
 
11
 - Update to version 25.0.8:
12
obs-studio.spec Changed
17
 
1
@@ -47,6 +47,7 @@
2
 BuildRequires:  swig
3
 BuildRequires:  vlc-devel
4
 ExclusiveArch:  i586 x86_64
5
+Patch0:         c7f84f8fc4e90ef779a204ac268f5ee1a962e324.patch
6
 
7
 %description
8
 Open Broadcaster Software is free and open source software for video recording and live streaming.
9
@@ -61,6 +62,7 @@
10
 
11
 %prep
12
 %setup -q
13
+%patch0 -p1
14
 
15
 %build
16
 mkdir -p build && cd build
17
c7f84f8fc4e90ef779a204ac268f5ee1a962e324.patch Added
32
 
1
@@ -0,0 +1,30 @@
2
+From c7f84f8fc4e90ef779a204ac268f5ee1a962e324 Mon Sep 17 00:00:00 2001
3
+From: Jimi Huotari <chiitoo@gentoo.org>
4
+Date: Sun, 9 Feb 2020 05:23:55 +0200
5
+Subject: [PATCH] deps/glad: Fix build with GCC-10
6
+
7
+GCC-10 defaults to '-fno-common' [1], which triggers issues with
8
+defining global variables multiple times.  To fix the build, use
9
+'extern' to turn the first definition of 'gladGetProcAddressPtr'
10
+into a declaration.
11
+
12
+1. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678
13
+
14
+Closes https://github.com/obsproject/obs-studio/issues/2828
15
+---
16
+ deps/glad/src/glad_glx.c | 2 +-
17
+ 1 file changed, 1 insertion(+), 1 deletion(-)
18
+
19
+diff --git a/deps/glad/src/glad_glx.c b/deps/glad/src/glad_glx.c
20
+index 7c55b9fc01..58086f1039 100644
21
+--- a/deps/glad/src/glad_glx.c
22
++++ b/deps/glad/src/glad_glx.c
23
+@@ -35,7 +35,7 @@ static void* libGL;
24
+ 
25
+ #ifndef __APPLE__
26
+ typedef void* (APIENTRYP PFNGLXGETPROCADDRESSPROC_PRIVATE)(const char*);
27
+-PFNGLXGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr;
28
++extern PFNGLXGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr;
29
+ #endif
30
+ 
31
+ static
32