Refresh patches
This commit is contained in:
parent
848d4acc2b
commit
ee8987800e
7 changed files with 16 additions and 16 deletions
|
@ -9,10 +9,10 @@ Subject: Hide internal symbols
|
|||
3 files changed, 18 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt
|
||||
index a9aaa34..ebf762b 100644
|
||||
index 42558be..e54f95c 100644
|
||||
--- a/deps/obs-scripting/CMakeLists.txt
|
||||
+++ b/deps/obs-scripting/CMakeLists.txt
|
||||
@@ -200,6 +200,18 @@ add_library(obs-scripting SHARED
|
||||
@@ -196,6 +196,18 @@ add_library(obs-scripting SHARED
|
||||
${SWIG_LUA_RUNTIME}
|
||||
)
|
||||
|
||||
|
@ -32,10 +32,10 @@ index a9aaa34..ebf762b 100644
|
|||
libobs
|
||||
${LUAJIT_LIBRARIES}
|
||||
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
|
||||
index 3702875..6e9a7d1 100644
|
||||
index 3d3733f..633d879 100644
|
||||
--- a/libobs/CMakeLists.txt
|
||||
+++ b/libobs/CMakeLists.txt
|
||||
@@ -500,6 +500,11 @@ target_compile_options(libobs
|
||||
@@ -503,6 +503,11 @@ target_compile_options(libobs
|
||||
PUBLIC
|
||||
${ARCH_SIMD_FLAGS})
|
||||
|
||||
|
|
|
@ -7,10 +7,10 @@ Subject: Use path in /usr/lib
|
|||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c
|
||||
index 73ed76a..fbcb3df 100644
|
||||
index 83f04b6..41a58e8 100644
|
||||
--- a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c
|
||||
+++ b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c
|
||||
@@ -270,7 +270,11 @@ static void build_command_line(struct ffmpeg_muxer *stream, struct dstr *cmd,
|
||||
@@ -249,7 +249,11 @@ static void build_command_line(struct ffmpeg_muxer *stream, struct dstr *cmd,
|
||||
num_tracks++;
|
||||
}
|
||||
|
||||
|
|
|
@ -7,10 +7,10 @@ Subject: Link with libm and libdl to fix underlinking
|
|||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
|
||||
index 6e9a7d1..22c5f9b 100644
|
||||
index 633d879..a367759 100644
|
||||
--- a/libobs/CMakeLists.txt
|
||||
+++ b/libobs/CMakeLists.txt
|
||||
@@ -247,6 +247,11 @@ elseif(UNIX)
|
||||
@@ -250,6 +250,11 @@ elseif(UNIX)
|
||||
${PULSEAUDIO_LIBRARY})
|
||||
endif()
|
||||
|
||||
|
|
|
@ -7,10 +7,10 @@ Subject: Link with xcb and X libraries to fix underlinking
|
|||
1 file changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
|
||||
index 22c5f9b..b010101 100644
|
||||
index a367759..8dc3ce0 100644
|
||||
--- a/libobs/CMakeLists.txt
|
||||
+++ b/libobs/CMakeLists.txt
|
||||
@@ -13,9 +13,8 @@ endif()
|
||||
@@ -17,9 +17,8 @@ endif()
|
||||
|
||||
if(UNIX)
|
||||
if (NOT APPLE)
|
||||
|
@ -21,7 +21,7 @@ index 22c5f9b..b010101 100644
|
|||
if (XCB_XINPUT_FOUND)
|
||||
set(USE_XINPUT "1")
|
||||
else()
|
||||
@@ -222,14 +221,18 @@ elseif(UNIX)
|
||||
@@ -225,14 +224,18 @@ elseif(UNIX)
|
||||
endif()
|
||||
|
||||
include_directories(
|
||||
|
|
4
debian/patches/0006-Add-SONAME.patch
vendored
4
debian/patches/0006-Add-SONAME.patch
vendored
|
@ -7,10 +7,10 @@ Subject: Add SONAME
|
|||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt
|
||||
index ebf762b..c53bc1e 100644
|
||||
index e54f95c..25dbe7b 100644
|
||||
--- a/deps/obs-scripting/CMakeLists.txt
|
||||
+++ b/deps/obs-scripting/CMakeLists.txt
|
||||
@@ -212,6 +212,11 @@ if(UNIX)
|
||||
@@ -208,6 +208,11 @@ if(UNIX)
|
||||
PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
|
||||
endif()
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ Subject: Do not build with SSE2 enabled on i386
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5bdfe21..5ff4ee9 100644
|
||||
index 8b36df8..d6e5e73 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -122,7 +122,7 @@ else ()
|
||||
|
|
|
@ -8,10 +8,10 @@ Subject: Use the simd everywhere headers from libsimde-dev
|
|||
2 files changed, 1 insertion(+), 8 deletions(-)
|
||||
|
||||
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
|
||||
index b010101..e583753 100644
|
||||
index 8dc3ce0..614b41a 100644
|
||||
--- a/libobs/CMakeLists.txt
|
||||
+++ b/libobs/CMakeLists.txt
|
||||
@@ -186,13 +186,6 @@ elseif(UNIX)
|
||||
@@ -189,13 +189,6 @@ elseif(UNIX)
|
||||
|
||||
if(NEEDS_SIMDE)
|
||||
set(libobs_PLATFORM_HEADERS
|
||||
|
|
Loading…
Reference in a new issue