Rebase patches
This commit is contained in:
parent
b3aa399d22
commit
1755557f03
5 changed files with 21 additions and 20 deletions
2
debian/patches/0001-Use-common-license.patch
vendored
2
debian/patches/0001-Use-common-license.patch
vendored
|
@ -9,7 +9,7 @@ copy
|
|||
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
|
||||
index 98f893c..d1b2f82 100644
|
||||
--- a/UI/window-basic-about.cpp
|
||||
+++ b/UI/window-basic-about.cpp
|
||||
@@ -150,15 +150,10 @@ void OBSAbout::ShowAuthors()
|
||||
|
|
27
debian/patches/0002-Hide-internal-symbols.patch
vendored
27
debian/patches/0002-Hide-internal-symbols.patch
vendored
|
@ -4,15 +4,15 @@ Subject: Hide internal symbols
|
|||
|
||||
---
|
||||
deps/obs-scripting/CMakeLists.txt | 12 ++++++++++++
|
||||
libobs/CMakeLists.txt | 4 ++++
|
||||
libobs/CMakeLists.txt | 5 +++++
|
||||
libobs/util/c99defs.h | 2 +-
|
||||
3 files changed, 17 insertions(+), 1 deletion(-)
|
||||
3 files changed, 18 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt
|
||||
index 92fb1b9..b324251 100644
|
||||
index 0421ec9..165b2d9 100644
|
||||
--- a/deps/obs-scripting/CMakeLists.txt
|
||||
+++ b/deps/obs-scripting/CMakeLists.txt
|
||||
@@ -183,6 +183,18 @@ add_library(obs-scripting SHARED
|
||||
@@ -193,6 +193,18 @@ add_library(obs-scripting SHARED
|
||||
${SWIG_LUA_RUNTIME}
|
||||
)
|
||||
|
||||
|
@ -32,30 +32,31 @@ index 92fb1b9..b324251 100644
|
|||
libobs
|
||||
${LUAJIT_LIBRARIES}
|
||||
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
|
||||
index 8681148..49fffcd 100644
|
||||
index 84889e6..5ebd1eb 100644
|
||||
--- a/libobs/CMakeLists.txt
|
||||
+++ b/libobs/CMakeLists.txt
|
||||
@@ -478,6 +478,10 @@ elseif(NOT MSVC)
|
||||
-msse2)
|
||||
endif()
|
||||
@@ -481,6 +481,11 @@ target_compile_options(libobs
|
||||
PUBLIC
|
||||
${ARCH_SIMD_FLAGS})
|
||||
|
||||
+if(UNIX)
|
||||
+ set_source_files_properties(${libobs_SOURCES} PROPERTIES
|
||||
+ COMPILE_FLAGS "-fvisibility=hidden")
|
||||
+endif()
|
||||
|
||||
+
|
||||
target_compile_options(libobs
|
||||
PUBLIC
|
||||
"${THREADS_DEFINITIONS}")
|
||||
diff --git a/libobs/util/c99defs.h b/libobs/util/c99defs.h
|
||||
index 6ea3534..6a99b13 100644
|
||||
index f84432a..1fb4821 100644
|
||||
--- a/libobs/util/c99defs.h
|
||||
+++ b/libobs/util/c99defs.h
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
#ifdef _MSC_VER
|
||||
#define EXPORT __declspec(dllexport)
|
||||
#else
|
||||
-#define EXPORT
|
||||
+#define EXPORT __attribute__((visibility("default")))
|
||||
#endif
|
||||
|
||||
#if _MSC_VER && _MSC_VER < 0x0708
|
||||
#include <stddef.h>
|
||||
|
|
|
@ -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 49fffcd..5f48eb2 100644
|
||||
index 5ebd1eb..21f3522 100644
|
||||
--- a/libobs/CMakeLists.txt
|
||||
+++ b/libobs/CMakeLists.txt
|
||||
@@ -222,6 +222,11 @@ elseif(UNIX)
|
||||
@@ -234,6 +234,11 @@ elseif(UNIX)
|
||||
${PULSEAUDIO_LIBRARY})
|
||||
endif()
|
||||
|
||||
|
|
|
@ -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 5f48eb2..3acb58c 100644
|
||||
index 21f3522..bfb74f3 100644
|
||||
--- a/libobs/CMakeLists.txt
|
||||
+++ b/libobs/CMakeLists.txt
|
||||
@@ -13,8 +13,8 @@ endif()
|
||||
|
@ -21,7 +21,7 @@ index 5f48eb2..3acb58c 100644
|
|||
if (XCB_XINPUT_FOUND)
|
||||
set(USE_XINPUT "1")
|
||||
else()
|
||||
@@ -199,12 +199,17 @@ elseif(UNIX)
|
||||
@@ -211,12 +211,17 @@ elseif(UNIX)
|
||||
endif()
|
||||
|
||||
include_directories(
|
||||
|
|
4
debian/patches/0006-Add-SONAME.patch
vendored
4
debian/patches/0006-Add-SONAME.patch
vendored
|
@ -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 b324251..21023ea 100644
|
||||
index 165b2d9..506abf2 100644
|
||||
--- a/deps/obs-scripting/CMakeLists.txt
|
||||
+++ b/deps/obs-scripting/CMakeLists.txt
|
||||
@@ -195,6 +195,11 @@ if(UNIX)
|
||||
@@ -205,6 +205,11 @@ if(UNIX)
|
||||
PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
|
||||
endif()
|
||||
|
||||
|
|
Loading…
Reference in a new issue