From 1960f53b18cbab2a39b1e90696a70acc65247310 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 1 Oct 2020 22:29:31 +0200 Subject: [PATCH] Refresh patches --- .../patches/0002-Hide-internal-symbols.patch | 6 ++-- debian/patches/0003-Use-path-in-usr-lib.patch | 4 +-- ...h-libm-and-libdl-to-fix-underlinking.patch | 4 +-- ...-and-X-libraries-to-fix-underlinking.patch | 22 +++++++------- debian/patches/0006-Add-SONAME.patch | 2 +- ...-not-build-with-SSE2-enabled-on-i386.patch | 8 ++--- ...verywhere-headers-from-libsimde-dev.patch} | 4 +-- ...0009-deps-glad-Fix-build-with-GCC-10.patch | 29 ------------------- debian/patches/series | 3 +- 9 files changed, 27 insertions(+), 55 deletions(-) rename debian/patches/{0008-use-libsimde-dev.patch => 0008-Use-the-simd-everywhere-headers-from-libsimde-dev.patch} (94%) delete mode 100644 debian/patches/0009-deps-glad-Fix-build-with-GCC-10.patch diff --git a/debian/patches/0002-Hide-internal-symbols.patch b/debian/patches/0002-Hide-internal-symbols.patch index 352e578..93ba8c2 100644 --- a/debian/patches/0002-Hide-internal-symbols.patch +++ b/debian/patches/0002-Hide-internal-symbols.patch @@ -9,7 +9,7 @@ Subject: Hide internal symbols 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt -index 7dd316f..6a88b12 100644 +index a9aaa34..ebf762b 100644 --- a/deps/obs-scripting/CMakeLists.txt +++ b/deps/obs-scripting/CMakeLists.txt @@ -200,6 +200,18 @@ add_library(obs-scripting SHARED @@ -32,10 +32,10 @@ index 7dd316f..6a88b12 100644 libobs ${LUAJIT_LIBRARIES} diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt -index 0b592d7..b59ba58 100644 +index 3702875..6e9a7d1 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt -@@ -491,6 +491,11 @@ target_compile_options(libobs +@@ -500,6 +500,11 @@ target_compile_options(libobs PUBLIC ${ARCH_SIMD_FLAGS}) diff --git a/debian/patches/0003-Use-path-in-usr-lib.patch b/debian/patches/0003-Use-path-in-usr-lib.patch index 1721508..9b9cd82 100644 --- a/debian/patches/0003-Use-path-in-usr-lib.patch +++ b/debian/patches/0003-Use-path-in-usr-lib.patch @@ -7,10 +7,10 @@ Subject: Use path in /usr/lib 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 +index 73ed76a..fbcb3df 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c -@@ -232,7 +232,11 @@ static void build_command_line(struct ffmpeg_muxer *stream, struct dstr *cmd, +@@ -270,7 +270,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 81476eb..45a5317 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 b59ba58..a562a88 100644 +index 6e9a7d1..22c5f9b 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt -@@ -244,6 +244,11 @@ elseif(UNIX) +@@ -247,6 +247,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 47b393f..b94b4be 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,37 +3,39 @@ Date: Wed, 19 Apr 2017 23:02:17 +0200 Subject: Link with xcb and X libraries to fix underlinking --- - libobs/CMakeLists.txt | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) + libobs/CMakeLists.txt | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt -index a562a88..8f12482 100644 +index 22c5f9b..b010101 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt -@@ -13,8 +13,8 @@ endif() +@@ -13,9 +13,8 @@ endif() if(UNIX) if (NOT APPLE) ++ find_package(XCB COMPONENTS XCB REQUIRED OPTIONAL_COMPONENTS XINPUT) + find_package(X11 REQUIRED) - find_package(X11_XCB REQUIRED) - find_package(XCB OPTIONAL_COMPONENTS XINPUT) -+ find_package(XCB COMPONENTS XCB REQUIRED OPTIONAL_COMPONENTS XINPUT) -+ find_package(X11 REQUIRED) if (XCB_XINPUT_FOUND) set(USE_XINPUT "1") else() -@@ -221,12 +221,17 @@ elseif(UNIX) +@@ -222,14 +221,18 @@ elseif(UNIX) endif() include_directories( -- ${X11_XCB_INCLUDE_DIRS}) +- ${X11_X11_INCLUDE_PATH} + ${XCB_INCLUDE_DIRS} -+ ${X11_XCB_INCLUDE_DIRS} -+ ${X11_X11_INCLUDE_DIRS}) ++ ${X11_X11_INCLUDE_DIRS} + ${X11_XCB_INCLUDE_DIRS}) ++ add_definitions( + ${XCB_DEFINITIONS} ${X11_XCB_DEFINITIONS}) set(libobs_PLATFORM_DEPS ${libobs_PLATFORM_DEPS} +- ${X11_X11_LIB} - ${X11_XCB_LIBRARIES}) + ${XCB_LIBRARIES} + ${X11_XCB_LIBRARIES} diff --git a/debian/patches/0006-Add-SONAME.patch b/debian/patches/0006-Add-SONAME.patch index a9f15df..027d651 100644 --- a/debian/patches/0006-Add-SONAME.patch +++ b/debian/patches/0006-Add-SONAME.patch @@ -7,7 +7,7 @@ Subject: Add SONAME 1 file changed, 5 insertions(+) diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt -index 6a88b12..a86262e 100644 +index ebf762b..c53bc1e 100644 --- a/deps/obs-scripting/CMakeLists.txt +++ b/deps/obs-scripting/CMakeLists.txt @@ -212,6 +212,11 @@ if(UNIX) diff --git a/debian/patches/0007-Do-not-build-with-SSE2-enabled-on-i386.patch b/debian/patches/0007-Do-not-build-with-SSE2-enabled-on-i386.patch index bc138af..c3436a8 100644 --- a/debian/patches/0007-Do-not-build-with-SSE2-enabled-on-i386.patch +++ b/debian/patches/0007-Do-not-build-with-SSE2-enabled-on-i386.patch @@ -7,15 +7,15 @@ Subject: Do not build with SSE2 enabled on i386 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index b56c2bb..1dabd39 100644 +index 5bdfe21..5ff4ee9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -118,7 +118,7 @@ else () +@@ -122,7 +122,7 @@ else () string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR) endif () --if(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86|x64|x86_64|amd64)") -+if(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)") +-if(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86|x64|x86_64|amd64|e2k)") ++if(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|x64|x86_64|amd64|e2k)") set(NEEDS_SIMDE "0") if(NOT MSVC) set(ARCH_SIMD_FLAGS "-mmmx" "-msse" "-msse2") diff --git a/debian/patches/0008-use-libsimde-dev.patch b/debian/patches/0008-Use-the-simd-everywhere-headers-from-libsimde-dev.patch similarity index 94% rename from debian/patches/0008-use-libsimde-dev.patch rename to debian/patches/0008-Use-the-simd-everywhere-headers-from-libsimde-dev.patch index a9291be..a3468c0 100644 --- a/debian/patches/0008-use-libsimde-dev.patch +++ b/debian/patches/0008-Use-the-simd-everywhere-headers-from-libsimde-dev.patch @@ -8,7 +8,7 @@ Subject: Use the simd everywhere headers from libsimde-dev 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt -index 8f12482..d42702f 100644 +index b010101..e583753 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt @@ -186,13 +186,6 @@ elseif(UNIX) @@ -26,7 +26,7 @@ index 8f12482..d42702f 100644 else() set(libobs_PLATFORM_HEADERS diff --git a/libobs/util/sse-intrin.h b/libobs/util/sse-intrin.h -index 8136c92..bde2029 100644 +index 49ccade..8c723a1 100644 --- a/libobs/util/sse-intrin.h +++ b/libobs/util/sse-intrin.h @@ -19,7 +19,7 @@ diff --git a/debian/patches/0009-deps-glad-Fix-build-with-GCC-10.patch b/debian/patches/0009-deps-glad-Fix-build-with-GCC-10.patch deleted file mode 100644 index 27c0433..0000000 --- a/debian/patches/0009-deps-glad-Fix-build-with-GCC-10.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Jimi Huotari -Date: Sun, 9 Feb 2020 05:23:55 +0200 -Subject: deps/glad: Fix build with GCC-10 - -GCC-10 defaults to '-fno-common' [1], which triggers issues with -defining global variables multiple times. To fix the build, use -'extern' to turn the first definition of 'gladGetProcAddressPtr' -into a declaration. - -1. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678 - -Closes https://github.com/obsproject/obs-studio/issues/2828 ---- - deps/glad/src/glad_glx.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/deps/glad/src/glad_glx.c b/deps/glad/src/glad_glx.c -index 7c55b9f..58086f1 100644 ---- a/deps/glad/src/glad_glx.c -+++ b/deps/glad/src/glad_glx.c -@@ -35,7 +35,7 @@ static void* libGL; - - #ifndef __APPLE__ - typedef void* (APIENTRYP PFNGLXGETPROCADDRESSPROC_PRIVATE)(const char*); --PFNGLXGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr; -+extern PFNGLXGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr; - #endif - - static diff --git a/debian/patches/series b/debian/patches/series index d572bc5..b8d40ca 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,5 +5,4 @@ 0005-Link-with-xcb-and-X-libraries-to-fix-underlinking.patch 0006-Add-SONAME.patch 0007-Do-not-build-with-SSE2-enabled-on-i386.patch -0008-use-libsimde-dev.patch -0009-deps-glad-Fix-build-with-GCC-10.patch +0008-Use-the-simd-everywhere-headers-from-libsimde-dev.patch