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-02-19 21:07:10 +01:00
parent e9f93d899e
commit ab10ec5384
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
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 cd2b80e..ef5b9bc 100644 index 00c0ebc..c82d94e 100644
--- a/libobs/CMakeLists.txt --- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt
@@ -409,6 +409,10 @@ if(NOT MSVC) @@ -447,6 +447,10 @@ if(NOT MSVC)
-msse2) -msse2)
endif() endif()
@ -23,7 +23,7 @@ index cd2b80e..ef5b9bc 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 43d52c8..4890858 100644 index c4ee627..d26b3dd 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 @@

4
debian/patches/0003-Use-path-in-usr-lib.patch vendored
View file

@ -7,10 +7,10 @@ Subject: Use path in /usr/lib
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 diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c
index 5d5d533..c25ddcc 100644 index 9b65276..60b0b8b 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
@@ -236,7 +236,11 @@ static void build_command_line(struct ffmpeg_muxer *stream, struct dstr *cmd, @@ -237,7 +237,11 @@ static void build_command_line(struct ffmpeg_muxer *stream, struct dstr *cmd,
num_tracks++; num_tracks++;
} }

8
debian/patches/0004-Link-with-libm-and-libdl-to-fix-underlinking.patch vendored
View file

@ -7,12 +7,12 @@ 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 ef5b9bc..d1b62c5 100644 index c82d94e..83dcb75 100644
--- a/libobs/CMakeLists.txt --- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt
@@ -168,6 +168,11 @@ elseif(UNIX) @@ -205,6 +205,11 @@ elseif(UNIX)
${libobs_PLATFORM_DEPS} ${PULSEAUDIO_LIBRARY})
${X11_XCB_LIBRARIES}) endif()
+ set(libobs_PLATFORM_DEPS + set(libobs_PLATFORM_DEPS
+ ${libobs_PLATFORM_DEPS} + ${libobs_PLATFORM_DEPS}

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

@ -7,11 +7,11 @@ Subject: Link with xcb and X libraries to fix underlinking
1 file changed, 9 insertions(+), 3 deletions(-) 1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
index d1b62c5..d36afa1 100644 index 83dcb75..56401fe 100644
--- a/libobs/CMakeLists.txt --- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt
@@ -14,7 +14,8 @@ endif() @@ -25,7 +25,8 @@ if(UNIX)
if(UNIX) endif()
find_package(DBus QUIET) find_package(DBus QUIET)
if (NOT APPLE) if (NOT APPLE)
- find_package(X11_XCB REQUIRED) - find_package(X11_XCB REQUIRED)
@ -20,7 +20,7 @@ index d1b62c5..d36afa1 100644
endif() endif()
else() else()
set(HAVE_DBUS "0") set(HAVE_DBUS "0")
@@ -161,12 +162,17 @@ elseif(UNIX) @@ -192,12 +193,17 @@ elseif(UNIX)
endif() endif()
include_directories( include_directories(
@ -38,5 +38,5 @@ index d1b62c5..d36afa1 100644
+ ${X11_XCB_LIBRARIES} + ${X11_XCB_LIBRARIES}
+ ${X11_X11_LIB}) + ${X11_X11_LIB})
set(libobs_PLATFORM_DEPS if(HAVE_PULSEAUDIO)
${libobs_PLATFORM_DEPS} set(libobs_PLATFORM_DEPS