@@ -1,4 +1,11 @@

 -------------------------------------------------------------------

+Mon Oct 19 16:02:28 UTC 2020 - Jimmy Berry <jimmy@boombatower.com>

+

+- Remove c7f84f8fc4e90ef779a204ac268f5ee1a962e324.patch.

+- Add fix-luajit-include-path.patch from palica@liguros.net to

+  resolve Lua script building.

+

+-------------------------------------------------------------------

 Wed Oct 07 02:43:06 UTC 2020 - jimmy@boombatower.com

 - Update to version 26.0.2:

​

@@ -6,6 +6,7 @@

 License:        GPL-2.0

 URL:            https://obsproject.com/

 Source:         %{name}-%{version}.tar.xz

+Patch0:         fix-luajit-include-path.patch

 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 BuildRequires:  update-desktop-files

 BuildRequires:  cmake >= 2.8.12

​

@@ -1,30 +0,0 @@

-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

​

@@ -0,0 +1,11 @@

+--- obs-studio-26.0.2/cmake/Modules/FindLuajit.cmake   2020-10-06 17:49:58.000000000 +0200

++++ obs-studio-26.0.2-luafix/cmake/Modules/FindLuajit.cmake    2020-10-18 18:55:51.636447909 +0200

+@@ -48,6 +48,8 @@

+       include/luajit-2.1

+       luajit2.1

+       include/luajit2.1

++      moonjit-2.2

++      include/moonjit-2.2

+       )

+ 

+ find_library(LUAJIT_LIB

​