diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
| commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
| tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /media-video/obs-studio/files | |
| parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) | |
gentoo resync : 14.05.2020
Diffstat (limited to 'media-video/obs-studio/files')
| -rw-r--r-- | media-video/obs-studio/files/obs-studio-25.0.8-gcc-10-build.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/media-video/obs-studio/files/obs-studio-25.0.8-gcc-10-build.patch b/media-video/obs-studio/files/obs-studio-25.0.8-gcc-10-build.patch new file mode 100644 index 000000000000..352ea2c937c7 --- /dev/null +++ b/media-video/obs-studio/files/obs-studio-25.0.8-gcc-10-build.patch @@ -0,0 +1,30 @@ +From c7f84f8fc4e90ef779a204ac268f5ee1a962e324 Mon Sep 17 00:00:00 2001 +From: Jimi Huotari <chiitoo@gentoo.org> +Date: Sun, 9 Feb 2020 05:23:55 +0200 +Subject: [PATCH] deps/glad: Fix build with GCC-10 + +GCC-10 defaults to '-fno-common' [1], which triggers issues with +defining global variables multiple times. To fix the build, use +'extern' to turn the first definition of 'gladGetProcAddressPtr' +into a declaration. + +1. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678 + +Closes https://github.com/obsproject/obs-studio/issues/2828 +--- + deps/glad/src/glad_glx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/deps/glad/src/glad_glx.c b/deps/glad/src/glad_glx.c +index 7c55b9fc01..58086f1039 100644 +--- a/deps/glad/src/glad_glx.c ++++ b/deps/glad/src/glad_glx.c +@@ -35,7 +35,7 @@ static void* libGL; + + #ifndef __APPLE__ + typedef void* (APIENTRYP PFNGLXGETPROCADDRESSPROC_PRIVATE)(const char*); +-PFNGLXGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr; ++extern PFNGLXGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr; + #endif + + static |