From 977d60245fab29c4713df789fce1e4463fcb4e07 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sun, 22 Sep 2019 23:29:12 +0200 Subject: [PATCH] Refresh patches --- debian/patches/0001-Use-common-license.patch | 8 +++++--- debian/patches/0002-Hide-internal-symbols.patch | 10 +++++----- debian/patches/0003-Use-path-in-usr-lib.patch | 4 +++- ...-Link-with-libm-and-libdl-to-fix-underlinking.patch | 4 ++-- ...-with-xcb-and-X-libraries-to-fix-underlinking.patch | 4 ++-- debian/patches/0006-Add-SONAME.patch | 4 ++-- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/debian/patches/0001-Use-common-license.patch b/debian/patches/0001-Use-common-license.patch index 15168f0..da87028 100644 --- a/debian/patches/0001-Use-common-license.patch +++ b/debian/patches/0001-Use-common-license.patch @@ -5,12 +5,14 @@ Subject: Use common license use common license at /usr/share/common-licenses instead of the shipped copy --- - UI/window-license-agreement.cpp | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) + UI/window-basic-about.cpp | 7 +------ + 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 +++ b/UI/window-basic-about.cpp -@@ -149,15 +149,10 @@ +@@ -150,15 +150,10 @@ void OBSAbout::ShowAuthors() void OBSAbout::ShowLicense() { diff --git a/debian/patches/0002-Hide-internal-symbols.patch b/debian/patches/0002-Hide-internal-symbols.patch index 2d792ae..99d24fb 100644 --- a/debian/patches/0002-Hide-internal-symbols.patch +++ b/debian/patches/0002-Hide-internal-symbols.patch @@ -9,10 +9,10 @@ Subject: Hide internal symbols 3 files changed, 17 insertions(+), 1 deletion(-) 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 +++ 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} ) @@ -32,10 +32,10 @@ index 835c1b3..dff5370 100644 libobs ${LUAJIT_LIBRARIES} diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt -index bddfa5c..41ed749 100644 +index 8681148..49fffcd 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt -@@ -463,6 +463,10 @@ if(NOT MSVC) +@@ -478,6 +478,10 @@ elseif(NOT MSVC) -msse2) endif() @@ -47,7 +47,7 @@ index bddfa5c..41ed749 100644 target_compile_options(libobs PUBLIC 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 +++ b/libobs/util/c99defs.h @@ -46,7 +46,7 @@ diff --git a/debian/patches/0003-Use-path-in-usr-lib.patch b/debian/patches/0003-Use-path-in-usr-lib.patch index ed4fa6d..1721508 100644 --- a/debian/patches/0003-Use-path-in-usr-lib.patch +++ b/debian/patches/0003-Use-path-in-usr-lib.patch @@ -6,9 +6,11 @@ Subject: Use path in /usr/lib plugins/obs-ffmpeg/obs-ffmpeg-mux.c | 4 ++++ 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 +++ 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++; } diff --git a/debian/patches/0004-Link-with-libm-and-libdl-to-fix-underlinking.patch b/debian/patches/0004-Link-with-libm-and-libdl-to-fix-underlinking.patch index 3bf2dae..f3e7e6a 100644 --- a/debian/patches/0004-Link-with-libm-and-libdl-to-fix-underlinking.patch +++ b/debian/patches/0004-Link-with-libm-and-libdl-to-fix-underlinking.patch @@ -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 41ed749..6840e4f 100644 +index 49fffcd..5f48eb2 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt -@@ -221,6 +221,11 @@ elseif(UNIX) +@@ -222,6 +222,11 @@ elseif(UNIX) ${PULSEAUDIO_LIBRARY}) endif() diff --git a/debian/patches/0005-Link-with-xcb-and-X-libraries-to-fix-underlinking.patch b/debian/patches/0005-Link-with-xcb-and-X-libraries-to-fix-underlinking.patch index 2b8b455..c8fe87c 100644 --- a/debian/patches/0005-Link-with-xcb-and-X-libraries-to-fix-underlinking.patch +++ b/debian/patches/0005-Link-with-xcb-and-X-libraries-to-fix-underlinking.patch @@ -7,7 +7,7 @@ Subject: Link with xcb and X libraries to fix underlinking 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt -index 6840e4f..589ab2c 100644 +index 5f48eb2..3acb58c 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt @@ -13,8 +13,8 @@ endif() @@ -21,7 +21,7 @@ index 6840e4f..589ab2c 100644 if (XCB_XINPUT_FOUND) set(USE_XINPUT "1") else() -@@ -198,12 +198,17 @@ elseif(UNIX) +@@ -199,12 +199,17 @@ elseif(UNIX) endif() include_directories( diff --git a/debian/patches/0006-Add-SONAME.patch b/debian/patches/0006-Add-SONAME.patch index e941996..c0d76e5 100644 --- a/debian/patches/0006-Add-SONAME.patch +++ b/debian/patches/0006-Add-SONAME.patch @@ -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 dff5370..a79d1f0 100644 +index b324251..21023ea 100644 --- a/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") endif()