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 2018-12-16 17:18:48 +01:00
parent d0b9aab731
commit f343962e1e
4 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,10 +8,10 @@ Subject: Hide internal symbols
2 files changed, 5 insertions(+), 1 deletion(-) 2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
index 00c0ebc..c82d94e 100644 index bddfa5c..41ed749 100644
--- a/libobs/CMakeLists.txt --- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt
@@ -447,6 +447,10 @@ if(NOT MSVC) @@ -463,6 +463,10 @@ if(NOT MSVC)
-msse2) -msse2)
endif() endif()

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

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

@ -3,24 +3,25 @@ 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 | 12 +++++++++--- libobs/CMakeLists.txt | 13 +++++++++----
1 file changed, 9 insertions(+), 3 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 83dcb75..56401fe 100644 index 6840e4f..c386102 100644
--- a/libobs/CMakeLists.txt --- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt
@@ -25,7 +25,8 @@ if(UNIX) @@ -13,8 +13,8 @@ endif()
endif()
find_package(DBus QUIET) if(UNIX)
if (NOT APPLE) if (NOT APPLE)
- find_package(X11_XCB REQUIRED) - find_package(X11_XCB REQUIRED)
+ find_package(XCB COMPONENTS XCB REQUIRED) - find_package(XCB OPTIONAL_COMPONENTS XINPUT)
+ find_package(X11 REQUIRED) + find_package(XCB COMPONENTS XCB REQUIRED OPTIONAL_COMPONENTS XINPUT)
endif() + find_package(XII REQUIRED)
if (XCB_XINPUT_FOUND)
set(USE_XINPUT "1")
else() else()
set(HAVE_DBUS "0") @@ -198,12 +198,17 @@ elseif(UNIX)
@@ -192,12 +193,17 @@ elseif(UNIX)
endif() endif()
include_directories( include_directories(
@ -38,5 +39,5 @@ index 83dcb75..56401fe 100644
+ ${X11_XCB_LIBRARIES} + ${X11_XCB_LIBRARIES}
+ ${X11_X11_LIB}) + ${X11_X11_LIB})
if(HAVE_PULSEAUDIO) if(USE_XINPUT)
set(libobs_PLATFORM_DEPS include_directories(

4
debian/patches/0006-Do-not-display-license-on-first-startup.patch vendored
View file

@ -7,10 +7,10 @@ Subject: Do not display license on first startup
1 file changed, 1 insertion(+), 2 deletions(-) 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp 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 --- a/UI/obs-app.cpp
+++ b/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"); ProfileScope("OBSApp::OBSInit");