Refresh patches

This commit is contained in:
Sebastian Ramacher 2019-09-22 23:29:12 +02:00
parent 7acb55b3b0
commit 977d60245f
6 changed files with 19 additions and 15 deletions

View file

@ -5,12 +5,14 @@ Subject: Use common license
use common license at /usr/share/common-licenses instead of the shipped use common license at /usr/share/common-licenses instead of the shipped
copy copy
--- ---
UI/window-license-agreement.cpp | 4 +--- UI/window-basic-about.cpp | 7 +------
1 file changed, 1 insertion(+), 3 deletions(-) 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/UI/window-basic-about.cpp b/UI/window-basic-about.cpp
index 73d9bdb..b3e135a 100644
--- a/UI/window-basic-about.cpp --- a/UI/window-basic-about.cpp
+++ b/UI/window-basic-about.cpp +++ b/UI/window-basic-about.cpp
@@ -149,15 +149,10 @@ @@ -150,15 +150,10 @@ void OBSAbout::ShowAuthors()
void OBSAbout::ShowLicense() void OBSAbout::ShowLicense()
{ {

View file

@ -9,10 +9,10 @@ Subject: Hide internal symbols
3 files changed, 17 insertions(+), 1 deletion(-) 3 files changed, 17 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 835c1b3..dff5370 100644 index 92fb1b9..b324251 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
@@ -160,6 +160,18 @@ add_library(obs-scripting SHARED @@ -183,6 +183,18 @@ add_library(obs-scripting SHARED
${SWIG_LUA_RUNTIME} ${SWIG_LUA_RUNTIME}
) )
@ -32,10 +32,10 @@ index 835c1b3..dff5370 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 bddfa5c..41ed749 100644 index 8681148..49fffcd 100644
--- a/libobs/CMakeLists.txt --- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt
@@ -463,6 +463,10 @@ if(NOT MSVC) @@ -478,6 +478,10 @@ elseif(NOT MSVC)
-msse2) -msse2)
endif() endif()
@ -47,7 +47,7 @@ index bddfa5c..41ed749 100644
target_compile_options(libobs target_compile_options(libobs
PUBLIC PUBLIC
diff --git a/libobs/util/c99defs.h b/libobs/util/c99defs.h diff --git a/libobs/util/c99defs.h b/libobs/util/c99defs.h
index c4ee627..d26b3dd 100644 index 6ea3534..6a99b13 100644
--- a/libobs/util/c99defs.h --- a/libobs/util/c99defs.h
+++ b/libobs/util/c99defs.h +++ b/libobs/util/c99defs.h
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@

View file

@ -6,9 +6,11 @@ Subject: Use path in /usr/lib
plugins/obs-ffmpeg/obs-ffmpeg-mux.c | 4 ++++ plugins/obs-ffmpeg/obs-ffmpeg-mux.c | 4 ++++
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
index f2d3f9b..da557b7 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
@@ -237,7 +237,11 @@ @@ -232,7 +232,11 @@ static void build_command_line(struct ffmpeg_muxer *stream, struct dstr *cmd,
num_tracks++; num_tracks++;
} }

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 41ed749..6840e4f 100644 index 49fffcd..5f48eb2 100644
--- a/libobs/CMakeLists.txt --- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt
@@ -221,6 +221,11 @@ elseif(UNIX) @@ -222,6 +222,11 @@ elseif(UNIX)
${PULSEAUDIO_LIBRARY}) ${PULSEAUDIO_LIBRARY})
endif() endif()

View file

@ -7,7 +7,7 @@ Subject: Link with xcb and X libraries to fix underlinking
1 file changed, 9 insertions(+), 4 deletions(-) 1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
index 6840e4f..589ab2c 100644 index 5f48eb2..3acb58c 100644
--- a/libobs/CMakeLists.txt --- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt
@@ -13,8 +13,8 @@ endif() @@ -13,8 +13,8 @@ endif()
@ -21,7 +21,7 @@ index 6840e4f..589ab2c 100644
if (XCB_XINPUT_FOUND) if (XCB_XINPUT_FOUND)
set(USE_XINPUT "1") set(USE_XINPUT "1")
else() else()
@@ -198,12 +198,17 @@ elseif(UNIX) @@ -199,12 +199,17 @@ elseif(UNIX)
endif() endif()
include_directories( include_directories(

View file

@ -7,10 +7,10 @@ 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 dff5370..a79d1f0 100644 index b324251..21023ea 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
@@ -172,6 +172,11 @@ if(UNIX) @@ -195,6 +195,11 @@ if(UNIX)
PROPERTIES COMPILE_FLAGS "-fvisibility=hidden") PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
endif() endif()