From f343962e1e70512021e42ea0ef3a95baae6a75ba Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sun, 16 Dec 2018 17:18:48 +0100 Subject: [PATCH] Refresh patches --- .../patches/0002-Hide-internal-symbols.patch | 4 +-- ...h-libm-and-libdl-to-fix-underlinking.patch | 4 +-- ...-and-X-libraries-to-fix-underlinking.patch | 29 ++++++++++--------- ...not-display-license-on-first-startup.patch | 4 +-- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/debian/patches/0002-Hide-internal-symbols.patch b/debian/patches/0002-Hide-internal-symbols.patch index d97aa28..b96728e 100644 --- a/debian/patches/0002-Hide-internal-symbols.patch +++ b/debian/patches/0002-Hide-internal-symbols.patch @@ -8,10 +8,10 @@ Subject: Hide internal symbols 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt -index 00c0ebc..c82d94e 100644 +index bddfa5c..41ed749 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt -@@ -447,6 +447,10 @@ if(NOT MSVC) +@@ -463,6 +463,10 @@ if(NOT MSVC) -msse2) endif() 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 bd7b1ec..3bf2dae 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 c82d94e..83dcb75 100644 +index 41ed749..6840e4f 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt -@@ -205,6 +205,11 @@ elseif(UNIX) +@@ -221,6 +221,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 26377ac..137b105 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 @@ -3,24 +3,25 @@ Date: Wed, 19 Apr 2017 23:02:17 +0200 Subject: Link with xcb and X libraries to fix underlinking --- - libobs/CMakeLists.txt | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) + libobs/CMakeLists.txt | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt -index 83dcb75..56401fe 100644 +index 6840e4f..c386102 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt -@@ -25,7 +25,8 @@ if(UNIX) - endif() - find_package(DBus QUIET) +@@ -13,8 +13,8 @@ endif() + + if(UNIX) if (NOT APPLE) - find_package(X11_XCB REQUIRED) -+ find_package(XCB COMPONENTS XCB REQUIRED) -+ find_package(X11 REQUIRED) - endif() - else() - set(HAVE_DBUS "0") -@@ -192,12 +193,17 @@ elseif(UNIX) +- find_package(XCB OPTIONAL_COMPONENTS XINPUT) ++ find_package(XCB COMPONENTS XCB REQUIRED OPTIONAL_COMPONENTS XINPUT) ++ find_package(XII REQUIRED) + if (XCB_XINPUT_FOUND) + set(USE_XINPUT "1") + else() +@@ -198,12 +198,17 @@ elseif(UNIX) endif() include_directories( @@ -38,5 +39,5 @@ index 83dcb75..56401fe 100644 + ${X11_XCB_LIBRARIES} + ${X11_X11_LIB}) - if(HAVE_PULSEAUDIO) - set(libobs_PLATFORM_DEPS + if(USE_XINPUT) + include_directories( diff --git a/debian/patches/0006-Do-not-display-license-on-first-startup.patch b/debian/patches/0006-Do-not-display-license-on-first-startup.patch index 35d0f41..baad04b 100644 --- a/debian/patches/0006-Do-not-display-license-on-first-startup.patch +++ b/debian/patches/0006-Do-not-display-license-on-first-startup.patch @@ -7,10 +7,10 @@ Subject: Do not display license on first startup 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp -index 503e5e1..258d6ca 100644 +index 52b15a0..186128c 100644 --- a/UI/obs-app.cpp +++ b/UI/obs-app.cpp -@@ -946,8 +946,7 @@ bool OBSApp::OBSInit() +@@ -1216,8 +1216,7 @@ bool OBSApp::OBSInit() { ProfileScope("OBSApp::OBSInit");