lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Refresh patches

Browse source
This commit is contained in:
Sebastian Ramacher 2020-10-01 22:29:31 +02:00
parent 68816c3248
commit 1960f53b18
9 changed files with 27 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debian/patches/0002-Hide-internal-symbols.patch vendored
View file

@ -9,7 +9,7 @@ Subject: Hide internal symbols
3 files changed, 18 insertions(+), 1 deletion(-) 3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt
index 7dd316f..6a88b12 100644 index a9aaa34..ebf762b 100644
--- a/deps/obs-scripting/CMakeLists.txt --- a/deps/obs-scripting/CMakeLists.txt
+++ b/deps/obs-scripting/CMakeLists.txt +++ b/deps/obs-scripting/CMakeLists.txt
@@ -200,6 +200,18 @@ add_library(obs-scripting SHARED @@ -200,6 +200,18 @@ add_library(obs-scripting SHARED
@ -32,10 +32,10 @@ index 7dd316f..6a88b12 100644
libobs libobs
${LUAJIT_LIBRARIES} ${LUAJIT_LIBRARIES}
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
index 0b592d7..b59ba58 100644 index 3702875..6e9a7d1 100644
--- a/libobs/CMakeLists.txt --- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt
@@ -491,6 +491,11 @@ target_compile_options(libobs @@ -500,6 +500,11 @@ target_compile_options(libobs
PUBLIC PUBLIC
${ARCH_SIMD_FLAGS}) ${ARCH_SIMD_FLAGS})

4
debian/patches/0003-Use-path-in-usr-lib.patch vendored
View file

@ -7,10 +7,10 @@ Subject: Use path in /usr/lib
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c
index f2d3f9b..da557b7 100644 index 73ed76a..fbcb3df 100644
--- a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c --- a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c
+++ b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c
@@ -232,7 +232,11 @@ static void build_command_line(struct ffmpeg_muxer *stream, struct dstr *cmd, @@ -270,7 +270,11 @@ static void build_command_line(struct ffmpeg_muxer *stream, struct dstr *cmd,
num_tracks++; num_tracks++;
} }

4
debian/patches/0004-Link-with-libm-and-libdl-to-fix-underlinking.patch vendored
View file

@ -7,10 +7,10 @@ Subject: Link with libm and libdl to fix underlinking
1 file changed, 5 insertions(+) 1 file changed, 5 insertions(+)
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
index b59ba58..a562a88 100644 index 6e9a7d1..22c5f9b 100644
--- a/libobs/CMakeLists.txt --- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt
@@ -244,6 +244,11 @@ elseif(UNIX) @@ -247,6 +247,11 @@ elseif(UNIX)
${PULSEAUDIO_LIBRARY}) ${PULSEAUDIO_LIBRARY})
endif() endif()

22
debian/patches/0005-Link-with-xcb-and-X-libraries-to-fix-underlinking.patch vendored
View file

@ -3,37 +3,39 @@ Date: Wed, 19 Apr 2017 23:02:17 +0200
Subject: Link with xcb and X libraries to fix underlinking Subject: Link with xcb and X libraries to fix underlinking
--- ---
libobs/CMakeLists.txt | 13 +++++++++---- libobs/CMakeLists.txt | 13 ++++++++-----
1 file changed, 9 insertions(+), 4 deletions(-) 1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
index a562a88..8f12482 100644 index 22c5f9b..b010101 100644
--- a/libobs/CMakeLists.txt --- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt
@@ -13,8 +13,8 @@ endif() @@ -13,9 +13,8 @@ endif()
if(UNIX) if(UNIX)
if (NOT APPLE) if (NOT APPLE)
+ find_package(XCB COMPONENTS XCB REQUIRED OPTIONAL_COMPONENTS XINPUT)
find_package(X11 REQUIRED)
- find_package(X11_XCB REQUIRED) - find_package(X11_XCB REQUIRED)
- find_package(XCB OPTIONAL_COMPONENTS XINPUT) - find_package(XCB OPTIONAL_COMPONENTS XINPUT)
+ find_package(XCB COMPONENTS XCB REQUIRED OPTIONAL_COMPONENTS XINPUT)
+ find_package(X11 REQUIRED)
if (XCB_XINPUT_FOUND) if (XCB_XINPUT_FOUND)
set(USE_XINPUT "1") set(USE_XINPUT "1")
else() else()
@@ -221,12 +221,17 @@ elseif(UNIX) @@ -222,14 +221,18 @@ elseif(UNIX)
endif() endif()
include_directories( include_directories(
- ${X11_XCB_INCLUDE_DIRS}) - ${X11_X11_INCLUDE_PATH}
+ ${XCB_INCLUDE_DIRS} + ${XCB_INCLUDE_DIRS}
+ ${X11_XCB_INCLUDE_DIRS} + ${X11_X11_INCLUDE_DIRS}
+ ${X11_X11_INCLUDE_DIRS}) ${X11_XCB_INCLUDE_DIRS})
+
add_definitions( add_definitions(
+ ${XCB_DEFINITIONS} + ${XCB_DEFINITIONS}
${X11_XCB_DEFINITIONS}) ${X11_XCB_DEFINITIONS})
set(libobs_PLATFORM_DEPS set(libobs_PLATFORM_DEPS
${libobs_PLATFORM_DEPS} ${libobs_PLATFORM_DEPS}
- ${X11_X11_LIB}
- ${X11_XCB_LIBRARIES}) - ${X11_XCB_LIBRARIES})
+ ${XCB_LIBRARIES} + ${XCB_LIBRARIES}
+ ${X11_XCB_LIBRARIES} + ${X11_XCB_LIBRARIES}

2
debian/patches/0006-Add-SONAME.patch vendored
View file

@ -7,7 +7,7 @@ Subject: Add SONAME
1 file changed, 5 insertions(+) 1 file changed, 5 insertions(+)
diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt
index 6a88b12..a86262e 100644 index ebf762b..c53bc1e 100644
--- a/deps/obs-scripting/CMakeLists.txt --- a/deps/obs-scripting/CMakeLists.txt
+++ b/deps/obs-scripting/CMakeLists.txt +++ b/deps/obs-scripting/CMakeLists.txt
@@ -212,6 +212,11 @@ if(UNIX) @@ -212,6 +212,11 @@ if(UNIX)

8
debian/patches/0007-Do-not-build-with-SSE2-enabled-on-i386.patch vendored
View file

@ -7,15 +7,15 @@ Subject: Do not build with SSE2 enabled on i386
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index b56c2bb..1dabd39 100644 index 5bdfe21..5ff4ee9 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -118,7 +118,7 @@ else () @@ -122,7 +122,7 @@ else ()
string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR) string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR)
endif () endif ()
-if(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86|x64|x86_64|amd64)") -if(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86|x64|x86_64|amd64|e2k)")
+if(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)") +if(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|x64|x86_64|amd64|e2k)")
set(NEEDS_SIMDE "0") set(NEEDS_SIMDE "0")
if(NOT MSVC) if(NOT MSVC)
set(ARCH_SIMD_FLAGS "-mmmx" "-msse" "-msse2") set(ARCH_SIMD_FLAGS "-mmmx" "-msse" "-msse2")

4
debian/patches/0008-use-libsimde-dev.patch → debian/patches/0008-Use-the-simd-everywhere-headers-from-libsimde-dev.patch vendored
View file

@ -8,7 +8,7 @@ Subject: Use the simd everywhere headers from libsimde-dev
2 files changed, 1 insertion(+), 8 deletions(-) 2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
index 8f12482..d42702f 100644 index b010101..e583753 100644
--- a/libobs/CMakeLists.txt --- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt
@@ -186,13 +186,6 @@ elseif(UNIX) @@ -186,13 +186,6 @@ elseif(UNIX)
@ -26,7 +26,7 @@ index 8f12482..d42702f 100644
else() else()
set(libobs_PLATFORM_HEADERS set(libobs_PLATFORM_HEADERS
diff --git a/libobs/util/sse-intrin.h b/libobs/util/sse-intrin.h diff --git a/libobs/util/sse-intrin.h b/libobs/util/sse-intrin.h
index 8136c92..bde2029 100644 index 49ccade..8c723a1 100644
--- a/libobs/util/sse-intrin.h --- a/libobs/util/sse-intrin.h
+++ b/libobs/util/sse-intrin.h +++ b/libobs/util/sse-intrin.h
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@

29
debian/patches/0009-deps-glad-Fix-build-with-GCC-10.patch vendored
View file

@ -1,29 +0,0 @@
From: Jimi Huotari <chiitoo@gentoo.org>
Date: Sun, 9 Feb 2020 05:23:55 +0200
Subject: 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 7c55b9f..58086f1 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

3
debian/patches/series vendored
View file

@ -5,5 +5,4 @@
0005-Link-with-xcb-and-X-libraries-to-fix-underlinking.patch 0005-Link-with-xcb-and-X-libraries-to-fix-underlinking.patch
0006-Add-SONAME.patch 0006-Add-SONAME.patch
0007-Do-not-build-with-SSE2-enabled-on-i386.patch 0007-Do-not-build-with-SSE2-enabled-on-i386.patch
0008-use-libsimde-dev.patch 0008-Use-the-simd-everywhere-headers-from-libsimde-dev.patch
0009-deps-glad-Fix-build-with-GCC-10.patch