From 396d6d75b9710920f59a8f0d3db884aab7db9956 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 19 Apr 2017 21:47:41 +0200 Subject: [PATCH] Switch to gbp pq --- debian/patches/0001-Use-common-license.patch | 6 +++-- ...em.patch => 0002-Build-system-fixes.patch} | 21 ++++++++++------ debian/patches/0003-Use-path-in-usr-lib.patch | 24 +++++++++++++++++++ debian/patches/0003-override-path.patch | 19 --------------- debian/patches/series | 4 ++-- 5 files changed, 44 insertions(+), 30 deletions(-) rename debian/patches/{0002-Buildsystem.patch => 0002-Build-system-fixes.patch} (67%) create mode 100644 debian/patches/0003-Use-path-in-usr-lib.patch delete mode 100644 debian/patches/0003-override-path.patch diff --git a/debian/patches/0001-Use-common-license.patch b/debian/patches/0001-Use-common-license.patch index f1aa7b4..d9c1450 100644 --- a/debian/patches/0001-Use-common-license.patch +++ b/debian/patches/0001-Use-common-license.patch @@ -5,12 +5,14 @@ Subject: Use common license use common license at /usr/share/common-licenses instead of the shipped copy --- - obs/window-license-agreement.cpp | 4 +--- + UI/window-license-agreement.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) +diff --git a/UI/window-license-agreement.cpp b/UI/window-license-agreement.cpp +index a7a5f3b..60cad40 100644 --- a/UI/window-license-agreement.cpp +++ b/UI/window-license-agreement.cpp -@@ -13,9 +13,7 @@ +@@ -13,9 +13,7 @@ OBSLicenseAgreement::OBSLicenseAgreement(QWidget *parent) { ui->setupUi(this); diff --git a/debian/patches/0002-Buildsystem.patch b/debian/patches/0002-Build-system-fixes.patch similarity index 67% rename from debian/patches/0002-Buildsystem.patch rename to debian/patches/0002-Build-system-fixes.patch index d5a8451..b2f53d2 100644 --- a/debian/patches/0002-Buildsystem.patch +++ b/debian/patches/0002-Build-system-fixes.patch @@ -1,12 +1,17 @@ -Description: Various build system fixes - This fixes issues with underlinking and build libobs with -fvisibility=hidden - to hide internal symbols. It also disables -msse*. -Author: Sebastian Ramacher -Last-Update: 2016-02-24 +From: Sebastian Ramacher +Date: Wed, 19 Apr 2017 21:45:40 +0200 +Subject: Build system fixes +--- + libobs/CMakeLists.txt | 27 ++++++++++++++++++++------- + libobs/util/c99defs.h | 2 +- + 2 files changed, 21 insertions(+), 8 deletions(-) + +diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt +index cd2b80e..de274dd 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt -@@ -168,6 +168,23 @@ +@@ -168,6 +168,23 @@ elseif(UNIX) ${libobs_PLATFORM_DEPS} ${X11_XCB_LIBRARIES}) @@ -30,7 +35,7 @@ Last-Update: 2016-02-24 if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") # use the sysinfo compatibility library on bsd find_package(Libsysinfo REQUIRED) -@@ -401,15 +418,11 @@ +@@ -401,15 +418,11 @@ target_compile_definitions(libobs PUBLIC HAVE_OBSCONFIG_H) @@ -49,6 +54,8 @@ Last-Update: 2016-02-24 target_compile_options(libobs PUBLIC "${THREADS_DEFINITIONS}") +diff --git a/libobs/util/c99defs.h b/libobs/util/c99defs.h +index 43d52c8..4890858 100644 --- a/libobs/util/c99defs.h +++ b/libobs/util/c99defs.h @@ -46,7 +46,7 @@ diff --git a/debian/patches/0003-Use-path-in-usr-lib.patch b/debian/patches/0003-Use-path-in-usr-lib.patch new file mode 100644 index 0000000..1c4be1f --- /dev/null +++ b/debian/patches/0003-Use-path-in-usr-lib.patch @@ -0,0 +1,24 @@ +From: Sebastian Ramacher +Date: Wed, 19 Apr 2017 21:45:52 +0200 +Subject: Use path in /usr/lib + +--- + plugins/obs-ffmpeg/obs-ffmpeg-mux.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c +index 5d5d533..c25ddcc 100644 +--- a/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, + num_tracks++; + } + ++#ifdef FFMPEG_MUX_FIXED ++ dstr_init_copy(cmd, FFMPEG_MUX_FIXED); ++#else + dstr_init_move_array(cmd, obs_module_file(FFMPEG_MUX)); ++#endif + dstr_insert_ch(cmd, 0, '\"'); + dstr_cat(cmd, "\" \""); + diff --git a/debian/patches/0003-override-path.patch b/debian/patches/0003-override-path.patch deleted file mode 100644 index 50a6330..0000000 --- a/debian/patches/0003-override-path.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Override path for ffmpeg-mux -Author: Sebastian Ramacher -Forwarded: not-needed -Last-Update: 2016-02-24 - ---- a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c -+++ b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c -@@ -236,7 +236,11 @@ - num_tracks++; - } - -+#ifdef FFMPEG_MUX_FIXED -+ dstr_init_copy(cmd, FFMPEG_MUX_FIXED); -+#else - dstr_init_move_array(cmd, obs_module_file(FFMPEG_MUX)); -+#endif - dstr_insert_ch(cmd, 0, '\"'); - dstr_cat(cmd, "\" \""); - diff --git a/debian/patches/series b/debian/patches/series index 3b3ce8d..7c22d81 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ 0001-Use-common-license.patch -0002-Buildsystem.patch -0003-override-path.patch +0002-Build-system-fixes.patch +0003-Use-path-in-usr-lib.patch