From d8eb463bd4b153c6e7437bc1c6a61a1916d35651 Mon Sep 17 00:00:00 2001
From: Sebastian Ramacher <sramacher@debian.org>
Date: Sat, 15 Apr 2017 21:14:54 +0200
Subject: [PATCH] Refresh patches

---
 debian/patches/0002-Buildsystem.patch     | 40 +++--------------------
 debian/patches/0003-override-path.patch   |  4 +--
 debian/patches/0004-no-update-check.patch | 16 ---------
 debian/patches/series                     |  1 -
 4 files changed, 7 insertions(+), 54 deletions(-)
 delete mode 100644 debian/patches/0004-no-update-check.patch

diff --git a/debian/patches/0002-Buildsystem.patch b/debian/patches/0002-Buildsystem.patch
index da9cc57..d5a8451 100644
--- a/debian/patches/0002-Buildsystem.patch
+++ b/debian/patches/0002-Buildsystem.patch
@@ -6,18 +6,9 @@ Last-Update: 2016-02-24
 
 --- a/libobs/CMakeLists.txt
 +++ b/libobs/CMakeLists.txt
-@@ -13,6 +13,8 @@
- 
- if(UNIX)
- 	find_package(DBus QUIET)
-+	find_package(XCB COMPONENTS XCB REQUIRED)
-+	find_package(X11)
- else()
- 	set(HAVE_DBUS "0")
- endif()
-@@ -125,6 +127,23 @@
- 			${DBUS_LIBRARIES})
- 	endif()
+@@ -168,6 +168,23 @@
+ 		${libobs_PLATFORM_DEPS}
+ 		${X11_XCB_LIBRARIES})
  
 +	include_directories(
 +		${XCB_INCLUDE_DIRS}
@@ -39,7 +30,7 @@ Last-Update: 2016-02-24
  	if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
  		# use the sysinfo compatibility library on bsd
  		find_package(Libsysinfo REQUIRED)
-@@ -346,15 +365,11 @@
+@@ -401,15 +418,11 @@
  	PUBLIC
  		HAVE_OBSCONFIG_H)
  
@@ -58,30 +49,9 @@ Last-Update: 2016-02-24
  target_compile_options(libobs
  	PUBLIC
  		"${THREADS_DEFINITIONS}")
---- a/obs/CMakeLists.txt
-+++ b/obs/CMakeLists.txt
-@@ -81,16 +81,13 @@
- 	find_package(XCB COMPONENTS XCB REQUIRED RANDR REQUIRED XINERAMA REQUIRED)
- 	
- 	include_directories(
--		${XCB_INCLUDE_DIRS}
--		${X11_XCB_INCLUDE_DIRS})
-+		${XCB_INCLUDE_DIRS})
- 		
- 	add_definitions(
--		${XCB_DEFINITIONS}
--		${X11_XCB_DEFINITIONS})
-+		${XCB_DEFINITIONS})
- 
- 	set(obs_PLATFORM_LIBRARIES
- 		${XCB_LIBRARIES}
--		${X11_XCB_LIBRARIES}
-                 Qt5::X11Extras)
- endif()
- 
 --- a/libobs/util/c99defs.h
 +++ b/libobs/util/c99defs.h
-@@ -50,7 +50,7 @@
+@@ -46,7 +46,7 @@
  
  #define EXPORT __declspec(dllexport)
  #else
diff --git a/debian/patches/0003-override-path.patch b/debian/patches/0003-override-path.patch
index 3aec060..50a6330 100644
--- a/debian/patches/0003-override-path.patch
+++ b/debian/patches/0003-override-path.patch
@@ -5,7 +5,7 @@ Last-Update: 2016-02-24
 
 --- a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c
 +++ b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c
-@@ -193,7 +193,11 @@
+@@ -236,7 +236,11 @@
  		num_tracks++;
  	}
  
@@ -16,4 +16,4 @@ Last-Update: 2016-02-24
 +#endif
  	dstr_insert_ch(cmd, 0, '\"');
  	dstr_cat(cmd, "\" \"");
- 	dstr_cat_dstr(cmd, &stream->path);
+ 
diff --git a/debian/patches/0004-no-update-check.patch b/debian/patches/0004-no-update-check.patch
deleted file mode 100644
index 3f02a65..0000000
--- a/debian/patches/0004-no-update-check.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Update checks do not make sense for a distribution
-Author: Sebastian Ramacher <sramacher@debian.org>
-Forwarded: not-needed
-Last-Update: 2016-02-24
-
---- a/UI/window-basic-main.cpp
-+++ b/UI/window-basic-main.cpp
-@@ -1926,7 +1926,7 @@
- #ifdef UPDATE_SPARKLE
- 	init_sparkle_updater(config_get_bool(App()->GlobalConfig(), "General",
- 				"UpdateToUndeployed"));
--#else
-+#elif 0
- 	long long lastUpdate = config_get_int(App()->GlobalConfig(), "General",
- 			"LastUpdateCheck");
- 	uint32_t lastVersion = config_get_int(App()->GlobalConfig(), "General",
diff --git a/debian/patches/series b/debian/patches/series
index 1b47c52..3b3ce8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Use-common-license.patch
 0002-Buildsystem.patch
 0003-override-path.patch
-0004-no-update-check.patch