[SCM] vlc/master: Remove patches from upstream
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sun Mar 19 20:55:56 UTC 2017
The following commit has been merged in the master branch:
commit 53600fb31b57eb427e7fa13640e14fc244f960eb
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sun Mar 19 21:11:00 2017 +0100
Remove patches from upstream
diff --git a/debian/patches/Fix-build-using-old-GCC-intrinsics.patch b/debian/patches/Fix-build-using-old-GCC-intrinsics.patch
deleted file mode 100644
index 7bfc0e6..0000000
--- a/debian/patches/Fix-build-using-old-GCC-intrinsics.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 8b0a359be21c8b66c7f7f5d34b85df3cf6689035 Mon Sep 17 00:00:00 2001
-From: Francois Cartegnie <fcvlcdev at free.fr>
-Date: Sun, 24 Jul 2016 12:59:20 +0200
-Subject: [PATCH] Fix build using old GCC intrinsics
-
-As the 2.2 headers are still using vlc_atomics (picture)
-we cannot have a way to avoid collisions with early
-or late <atomic> inclusion when using GCC >= 4.7
-
-Conditionals in vlc_atomic won't work.
-
-Happens in ProjectM and Qt5.
-
-Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
----
- modules/gui/qt4/actions_manager.cpp | 2 ++
- modules/gui/qt4/adapters/seekpoints.cpp | 4 +--
- modules/gui/qt4/adapters/seekpoints.hpp | 4 +--
- modules/gui/qt4/components/controller.cpp | 2 ++
- .../gui/qt4/components/playlist/playlist_model.hpp | 4 +--
- modules/gui/qt4/components/playlist/views.cpp | 6 ++++
- modules/gui/qt4/dialogs/messages.cpp | 2 ++
- modules/gui/qt4/dialogs/vlm.cpp | 4 ---
- modules/gui/qt4/dialogs/vlm.hpp | 4 ++-
- modules/gui/qt4/input_manager.cpp | 2 ++
- modules/gui/qt4/input_manager.hpp | 3 +-
- modules/gui/qt4/menus.cpp | 2 ++
- modules/gui/qt4/qt4.hpp | 32 ++++++++++++++++++----
- modules/gui/qt4/util/pictureflow.cpp | 2 ++
- modules/visualization/projectm.cpp | 4 +++
- 15 files changed, 56 insertions(+), 21 deletions(-)
-
-diff --git a/modules/gui/qt4/actions_manager.cpp b/modules/gui/qt4/actions_manager.cpp
-index eff40d9..b7ca967 100644
---- a/modules/gui/qt4/actions_manager.cpp
-+++ b/modules/gui/qt4/actions_manager.cpp
-@@ -25,6 +25,8 @@
- # include "config.h"
- #endif
-
-+#include "qt4.hpp"
-+
- #include <vlc_vout.h>
- #include <vlc_keys.h>
-
-diff --git a/modules/gui/qt4/adapters/seekpoints.cpp b/modules/gui/qt4/adapters/seekpoints.cpp
-index fbf2957..a3564bb 100644
---- a/modules/gui/qt4/adapters/seekpoints.cpp
-+++ b/modules/gui/qt4/adapters/seekpoints.cpp
-@@ -19,14 +19,12 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-+#include "seekpoints.hpp"
-
- #include "recents.hpp"
- #include "dialogs_provider.hpp"
- #include "menus.hpp"
-
--#include "seekpoints.hpp"
--
--#include "qt4.hpp"
- #include "input_manager.hpp"
-
- SeekPoints::SeekPoints( QObject *parent, intf_thread_t *p_intf_ ) :
-diff --git a/modules/gui/qt4/adapters/seekpoints.hpp b/modules/gui/qt4/adapters/seekpoints.hpp
-index 0083989..bbb9214 100644
---- a/modules/gui/qt4/adapters/seekpoints.hpp
-+++ b/modules/gui/qt4/adapters/seekpoints.hpp
-@@ -22,9 +22,7 @@
- #ifndef SEEKPOINTS_HPP
- #define SEEKPOINTS_HPP
-
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "qt4.hpp"
-
- #include <vlc_common.h>
- #include <vlc_interface.h>
-diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
-index d93e0db..c43d929 100644
---- a/modules/gui/qt4/components/controller.cpp
-+++ b/modules/gui/qt4/components/controller.cpp
-@@ -26,6 +26,8 @@
- # include "config.h"
- #endif
-
-+#include "qt4.hpp"
-+
- #include <vlc_vout.h> /* vout_thread_t for FSC */
-
- /* Widgets */
-diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
-index f9d1d0c..1f71ac9 100644
---- a/modules/gui/qt4/components/playlist/playlist_model.hpp
-+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
-@@ -25,9 +25,7 @@
- #ifndef _PLAYLIST_MODEL_H_
- #define _PLAYLIST_MODEL_H_
-
--#ifdef HAVE_CONFIG_H
--# include "config.h"
--#endif
-+#include "qt4.hpp"
-
- #include <vlc_input.h>
- #include <vlc_playlist.h>
-diff --git a/modules/gui/qt4/components/playlist/views.cpp b/modules/gui/qt4/components/playlist/views.cpp
-index 59f6535..0066205 100644
---- a/modules/gui/qt4/components/playlist/views.cpp
-+++ b/modules/gui/qt4/components/playlist/views.cpp
-@@ -21,6 +21,12 @@
- * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include "qt4.hpp"
-+
- #include "components/playlist/views.hpp"
- #include "components/playlist/vlc_model.hpp" /* VLCModel */
- #include "components/playlist/sorting.h" /* Columns List */
-diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
-index 30793a2..9c79c99 100644
---- a/modules/gui/qt4/dialogs/messages.cpp
-+++ b/modules/gui/qt4/dialogs/messages.cpp
-@@ -24,6 +24,8 @@
- # include "config.h"
- #endif
-
-+#include "qt4.hpp"
-+
- #include "dialogs/messages.hpp"
-
- #include <QPlainTextEdit>
-diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp
-index 0da88cc..595f015 100644
---- a/modules/gui/qt4/dialogs/vlm.cpp
-+++ b/modules/gui/qt4/dialogs/vlm.cpp
-@@ -23,10 +23,6 @@
- * Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
--#ifdef HAVE_CONFIG_H
--# include "config.h"
--#endif
--
- #include "dialogs/vlm.hpp"
-
- #ifdef ENABLE_VLM
-diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp
-index a3c6e5d..dcf7110 100644
---- a/modules/gui/qt4/dialogs/vlm.hpp
-+++ b/modules/gui/qt4/dialogs/vlm.hpp
-@@ -25,8 +25,10 @@
- #ifndef QVLC_VLM_DIALOG_H_
- #define QVLC_VLM_DIALOG_H_ 1
-
-+#include "qt4.hpp"
-+
- #ifdef HAVE_CONFIG_H
--# include "config.h"
-+#include "config.h"
- #endif
-
- #ifdef ENABLE_VLM
-diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
-index fd45f4a..c50cb6c 100644
---- a/modules/gui/qt4/input_manager.cpp
-+++ b/modules/gui/qt4/input_manager.cpp
-@@ -30,6 +30,8 @@
- # include "config.h"
- #endif
-
-+#include "qt4.hpp"
-+
- #include "input_manager.hpp"
- #include "recents.hpp"
-
-diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
-index 7d3b76a..4fbecbb 100644
---- a/modules/gui/qt4/input_manager.hpp
-+++ b/modules/gui/qt4/input_manager.hpp
-@@ -29,9 +29,10 @@
- # include "config.h"
- #endif
-
-+#include "qt4.hpp"
-+
- #include <vlc_input.h>
-
--#include "qt4.hpp"
- #include "util/singleton.hpp"
- #include "adapters/variables.hpp"
-
-diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
-index 116e98c..46240b0 100644
---- a/modules/gui/qt4/menus.cpp
-+++ b/modules/gui/qt4/menus.cpp
-@@ -34,6 +34,8 @@
- # include "config.h"
- #endif
-
-+#include "qt4.hpp"
-+
- #include <vlc_common.h>
- #include <vlc_intf_strings.h>
- #include <vlc_vout.h> /* vout_thread_t */
-diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
-index 44d7db6..5aec957 100644
---- a/modules/gui/qt4/qt4.hpp
-+++ b/modules/gui/qt4/qt4.hpp
-@@ -29,12 +29,7 @@
- # include "config.h"
- #endif
-
--#include <vlc_common.h> /* VLC_COMMON_MEMBERS for vlc_interface.h */
--#include <vlc_interface.h> /* intf_thread_t */
--#include <vlc_playlist.h> /* playlist_t */
--
--#define QT_NO_CAST_TO_ASCII
--#include <QString>
-+#include <QtGlobal>
-
- #if ( QT_VERSION < 0x040600 )
- # error Update your Qt version to at least 4.6.0
-@@ -43,6 +38,31 @@
- #define HAS_QT47 ( QT_VERSION >= 0x040700 )
- #define HAS_QT5 ( QT_VERSION >= 0x050000 )
-
-+#if HAS_QT5
-+ #include <QtCore/qcompilerdetection.h>
-+ #if defined(Q_COMPILER_ATOMICS) && \
-+ ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
-+ #define VLC_ATOMIC_H
-+ #include <atomic>
-+ using namespace std;
-+ # define atomic_store(object,desired) \
-+ do { \
-+ *(object) = (desired); \
-+ __sync_synchronize(); \
-+ } while (0)
-+
-+ # define atomic_load(object) \
-+ (__sync_synchronize(), *(object))
-+ #endif
-+#endif
-+
-+#include <vlc_common.h> /* VLC_COMMON_MEMBERS for vlc_interface.h */
-+#include <vlc_interface.h> /* intf_thread_t */
-+#include <vlc_playlist.h> /* playlist_t */
-+
-+#define QT_NO_CAST_TO_ASCII
-+#include <QString>
-+
- enum {
- DialogEventTypeOffset = 0,
- IMEventTypeOffset = 100,
-diff --git a/modules/gui/qt4/util/pictureflow.cpp b/modules/gui/qt4/util/pictureflow.cpp
-index 9318953..a7e6a01 100644
---- a/modules/gui/qt4/util/pictureflow.cpp
-+++ b/modules/gui/qt4/util/pictureflow.cpp
-@@ -29,6 +29,8 @@
- THE SOFTWARE.
- */
-
-+#include "qt4.hpp"
-+
- #include "pictureflow.hpp"
-
- #include <QApplication>
-diff --git a/modules/visualization/projectm.cpp b/modules/visualization/projectm.cpp
-index e80fbf4..96d532d 100644
---- a/modules/visualization/projectm.cpp
-+++ b/modules/visualization/projectm.cpp
-@@ -30,6 +30,10 @@
- #endif
-
- #include <assert.h>
-+#if defined(__GNUC__) && \
-+ ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
-+ #define VLC_ATOMIC_H /* Ensure C atomics wont collide with old intrinsics */
-+#endif
-
- #include <vlc_common.h>
- #include <vlc_plugin.h>
---
-2.8.1
-
diff --git a/debian/patches/Revert-Build-default.vlt-in-a-reproducible-fashion-f.patch b/debian/patches/Revert-Build-default.vlt-in-a-reproducible-fashion-f.patch
deleted file mode 100644
index 7578484..0000000
--- a/debian/patches/Revert-Build-default.vlt-in-a-reproducible-fashion-f.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d0339fa10a29e78155a9d32a9c0ecf6cfda10a4d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
-Date: Fri, 21 Oct 2016 15:56:51 +0300
-Subject: [PATCH 1/5] Revert "Build default.vlt in a reproducible fashion
- (fixes #4562)"
-
-This broke error propagation.
-
-This reverts commit ceacef3bbb0c34d67aa84e6ca91b360cbe2419e5.
-
-(cherry picked from commit 9f2f2165b7f7afa912fdf7ffbe8b3f0db51f687a)
----
- share/Makefile.am | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
---- a/share/Makefile.am
-+++ b/share/Makefile.am
-@@ -78,10 +78,7 @@
-
- skins2/default.vlt: $(skins2_default_vlt_FILES)
- mkdir -p skins2
-- (cd "$(srcdir)/skins2"; find default -print0 | \
-- LC_ALL=C sort -z | \
-- tar cvv --exclude .svn --no-recursion --null -T -) | \
-- gzip -n > skins2/default.vlt
-+ tar cvvzf skins2/default.vlt -C $(srcdir)/skins2 default/
-
- #
- # LUA
diff --git a/debian/patches/VLSub-don-t-pretend-to-support-HTTP-1.1.patch b/debian/patches/VLSub-don-t-pretend-to-support-HTTP-1.1.patch
deleted file mode 100644
index c215d8f..0000000
--- a/debian/patches/VLSub-don-t-pretend-to-support-HTTP-1.1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4b1c65d5da017d807efea415fb3ab069945da75d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
-Date: Sun, 4 Dec 2016 14:36:29 +0200
-Subject: [PATCH] VLSub: don't pretend to support HTTP 1.1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-(cherry picked from commit 5c26ad66d4b3b1d3de13ae778161f9ddde25cd59)
-Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
----
- share/lua/extensions/VLSub.lua | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/share/lua/extensions/VLSub.lua b/share/lua/extensions/VLSub.lua
-index ecac0030ac..cd6f7b770d 100644
---- a/share/lua/extensions/VLSub.lua
-+++ b/share/lua/extensions/VLSub.lua
-@@ -1189,7 +1189,7 @@ openSub = {
- local request = "<?xml version='1.0'?>"..dump_xml(reqTable)
- local host, path = parse_url(openSub.conf.url)
- local header = {
-- "POST "..path.." HTTP/1.1",
-+ "POST "..path.." HTTP/1.0",
- "Host: "..host,
- "User-Agent: "..openSub.conf.userAgentHTTP,
- "Content-Type: text/xml",
-@@ -1840,7 +1840,7 @@ end
- function get(url)
- local host, path = parse_url(url)
- local header = {
-- "GET "..path.." HTTP/1.1",
-+ "GET "..path.." HTTP/1.0",
- "Host: "..host,
- "User-Agent: "..openSub.conf.userAgentHTTP,
- "",
---
-2.11.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 683cccf..f4e8490 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,2 @@
fix-translation.patch
generated-mimetypes.patch
-vlc_atomic-atomic_compare_exchange_weak_explicit-tak.patch
-vlc_atomic-atomic_compare_exchange_strong_explicit-t.patch
-Fix-build-using-old-GCC-intrinsics.patch
-video_splliter-Add-XCB-flags-for-panoramix.patch
-Revert-Build-default.vlt-in-a-reproducible-fashion-f.patch
-skins2-do-not-save-user-and-group-names-in-the-defau.patch
-skins-remove-timestamp-from-default.vlt-fixes-4562.patch
-skins-implement-silent-mode-make.patch
-skins2-do-not-generate-broken-default.vlt-on-error.patch
-VLSub-don-t-pretend-to-support-HTTP-1.1.patch
diff --git a/debian/patches/skins-implement-silent-mode-make.patch b/debian/patches/skins-implement-silent-mode-make.patch
deleted file mode 100644
index 13621bc..0000000
--- a/debian/patches/skins-implement-silent-mode-make.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 43f830f9e81e2534c42496005391104005cab6d6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
-Date: Fri, 21 Oct 2016 16:05:02 +0300
-Subject: [PATCH 4/5] skins: implement silent mode make
-
-(cherry picked from commit 0bdddcb8dcebe18cecfeed5805ceaaf50432a658)
----
- share/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/share/Makefile.am
-+++ b/share/Makefile.am
-@@ -77,8 +77,8 @@
- skins2/default/subX/vol_slider.png
-
- skins2/default.vlt: $(skins2_default_vlt_FILES)
-- mkdir -p skins2
-- GZIP=--no-name \
-+ $(AM_V_at)mkdir -p skins2
-+ $(AM_V_GEN)GZIP=--no-name \
- tar cvvzf skins2/default.vlt \
- --owner=root --group=root --directory="$(srcdir)/skins2" \
- default/
diff --git a/debian/patches/skins-remove-timestamp-from-default.vlt-fixes-4562.patch b/debian/patches/skins-remove-timestamp-from-default.vlt-fixes-4562.patch
deleted file mode 100644
index 8667d8c..0000000
--- a/debian/patches/skins-remove-timestamp-from-default.vlt-fixes-4562.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 75b4a84c0b7061807f13a734331287d24dd46ffe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
-Date: Fri, 21 Oct 2016 16:04:21 +0300
-Subject: [PATCH 3/5] skins: remove timestamp from default.vlt (fixes #4562)
-
-(cherry picked from commit 7b4bcf17d1f493c2d49f74ff573591e662a03924)
----
- share/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/share/Makefile.am
-+++ b/share/Makefile.am
-@@ -78,6 +78,7 @@
-
- skins2/default.vlt: $(skins2_default_vlt_FILES)
- mkdir -p skins2
-+ GZIP=--no-name \
- tar cvvzf skins2/default.vlt \
- --owner=root --group=root --directory="$(srcdir)/skins2" \
- default/
diff --git a/debian/patches/skins2-do-not-generate-broken-default.vlt-on-error.patch b/debian/patches/skins2-do-not-generate-broken-default.vlt-on-error.patch
deleted file mode 100644
index ecf8026..0000000
--- a/debian/patches/skins2-do-not-generate-broken-default.vlt-on-error.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 953263bf5839054b162fe114db6b132521747bf7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
-Date: Fri, 21 Oct 2016 16:08:25 +0300
-Subject: [PATCH 5/5] skins2: do not generate (broken) default.vlt on error
-
-(cherry picked from commit 096c3544b55a88ca07ece9a5624671484e362945)
----
- share/Makefile.am | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/share/Makefile.am
-+++ b/share/Makefile.am
-@@ -78,10 +78,12 @@
-
- skins2/default.vlt: $(skins2_default_vlt_FILES)
- $(AM_V_at)mkdir -p skins2
-+ $(AM_V_at)rm -f -- skins2/default.vlt.tmp
- $(AM_V_GEN)GZIP=--no-name \
-- tar cvvzf skins2/default.vlt \
-+ tar cvvzf skins2/default.vlt.tmp \
- --owner=root --group=root --directory="$(srcdir)/skins2" \
- default/
-+ $(AM_V_at)mv -f -- skins2/default.vlt.tmp skins2/default.vlt
-
- #
- # LUA
diff --git a/debian/patches/skins2-do-not-save-user-and-group-names-in-the-defau.patch b/debian/patches/skins2-do-not-save-user-and-group-names-in-the-defau.patch
deleted file mode 100644
index fb73a04..0000000
--- a/debian/patches/skins2-do-not-save-user-and-group-names-in-the-defau.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From cac50d90bae28f7125a46422cc6d497f316c9ad6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
-Date: Fri, 21 Oct 2016 15:35:18 +0300
-Subject: [PATCH 2/5] skins2: do not save user and group names in the default
- skin
-
-(cherry picked from commit 79bed730df73ff241545e4ffe85ed293bf52adc1)
----
- share/Makefile.am | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/share/Makefile.am
-+++ b/share/Makefile.am
-@@ -78,7 +78,9 @@
-
- skins2/default.vlt: $(skins2_default_vlt_FILES)
- mkdir -p skins2
-- tar cvvzf skins2/default.vlt -C $(srcdir)/skins2 default/
-+ tar cvvzf skins2/default.vlt \
-+ --owner=root --group=root --directory="$(srcdir)/skins2" \
-+ default/
-
- #
- # LUA
diff --git a/debian/patches/video_splliter-Add-XCB-flags-for-panoramix.patch b/debian/patches/video_splliter-Add-XCB-flags-for-panoramix.patch
deleted file mode 100644
index ba26788..0000000
--- a/debian/patches/video_splliter-Add-XCB-flags-for-panoramix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a854dc7108cdb70b5f58a1232868c74ad3620c99 Mon Sep 17 00:00:00 2001
-From: Vinson Lee <vlee at freedesktop.org>
-Date: Sat, 20 Aug 2016 06:02:27 +0000
-Subject: [PATCH] video_splliter: Add XCB flags for panoramix.
-
-This patch fixes this build error.
-
-video_splitter/.libs/libpanoramix_plugin_la-panoramix.o: In function `CountMonitors':
-modules/video_splitter/panoramix.c:352: undefined reference to `xcb_connect'
-modules/video_splitter/panoramix.c:354: undefined reference to `xcb_connection_has_error'
-modules/video_splitter/panoramix.c:357: undefined reference to `xcb_get_setup'
-modules/video_splitter/panoramix.c:359: undefined reference to `xcb_setup_roots_iterator'
-modules/video_splitter/panoramix.c:360: undefined reference to `xcb_screen_next'
-modules/video_splitter/panoramix.c:407: undefined reference to `xcb_disconnect'
-modules/video_splitter/panoramix.c:407: undefined reference to `xcb_disconnect'
-modules/video_splitter/panoramix.c:407: undefined reference to `xcb_disconnect'
-
-Signed-off-by: Vinson Lee <vlee at freedesktop.org>
-Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
----
- modules/video_splitter/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/video_splitter/Makefile.am b/modules/video_splitter/Makefile.am
-index da32c52..ffeb94e 100644
---- a/modules/video_splitter/Makefile.am
-+++ b/modules/video_splitter/Makefile.am
-@@ -15,8 +15,8 @@ if HAVE_WIN32_DESKTOP
- splitter_LTLIBRARIES += libpanoramix_plugin.la
- else
- if HAVE_XCB_RANDR
--libpanoramix_plugin_la_CFLAGS += $(XCB_RANDR_CFLAGS)
--libpanoramix_plugin_la_LIBADD += $(XCB_RANDR_LIBS)
-+libpanoramix_plugin_la_CFLAGS += $(XCB_RANDR_CFLAGS) $(XCB_CFLAGS)
-+libpanoramix_plugin_la_LIBADD += $(XCB_RANDR_LIBS) $(XCB_LIBS)
- splitter_LTLIBRARIES += libpanoramix_plugin.la
- endif
- endif
---
-2.9.3
-
diff --git a/debian/patches/vlc_atomic-atomic_compare_exchange_strong_explicit-t.patch b/debian/patches/vlc_atomic-atomic_compare_exchange_strong_explicit-t.patch
deleted file mode 100644
index 5ba1a83..0000000
--- a/debian/patches/vlc_atomic-atomic_compare_exchange_strong_explicit-t.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ec34ff174f04d1e81c939ed0325a0073c6f68fce Mon Sep 17 00:00:00 2001
-From: Francois Cartegnie <fcvlcdev at free.fr>
-Date: Fri, 22 Jul 2016 13:37:15 +0200
-Subject: [PATCH 2/2] vlc_atomic: atomic_compare_exchange_strong_explicit takes
- 5 parameters
-
-Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
----
- include/vlc_atomic.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h
-index 01e0f85..15ccf8c 100644
---- a/include/vlc_atomic.h
-+++ b/include/vlc_atomic.h
-@@ -152,7 +152,7 @@ typedef uintmax_t atomic_uintmax_t;
- # define atomic_compare_exchange_strong(object,expected,desired) \
- atomic_compare_exchange(object, expected, desired)
-
--# define atomic_compare_exchange_strong_explicit(object,expected,desired,order) \
-+# define atomic_compare_exchange_strong_explicit(object,expected,desired,order,order_different) \
- atomic_compare_exchange_strong(object, expected, desired)
-
- # define atomic_compare_exchange_weak(object,expected,desired) \
---
-2.8.1
-
diff --git a/debian/patches/vlc_atomic-atomic_compare_exchange_weak_explicit-tak.patch b/debian/patches/vlc_atomic-atomic_compare_exchange_weak_explicit-tak.patch
deleted file mode 100644
index 2c07fc7..0000000
--- a/debian/patches/vlc_atomic-atomic_compare_exchange_weak_explicit-tak.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ce8cc916ab43e12b85abd6a1b850f1ccf43319c8 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolabs.io>
-Date: Fri, 22 Jul 2016 13:37:14 +0200
-Subject: [PATCH 1/2] vlc_atomic: atomic_compare_exchange_weak_explicit takes 5
- parameters
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
-Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
----
- include/vlc_atomic.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h
-index af88eab..01e0f85 100644
---- a/include/vlc_atomic.h
-+++ b/include/vlc_atomic.h
-@@ -158,7 +158,7 @@ typedef uintmax_t atomic_uintmax_t;
- # define atomic_compare_exchange_weak(object,expected,desired) \
- atomic_compare_exchange(object, expected, desired)
-
--# define atomic_compare_exchange_weak_explicit(object,expected,desired,order) \
-+# define atomic_compare_exchange_weak_explicit(object,expected,desired,order_equal,order_different) \
- atomic_compare_exchange_weak(object, expected, desired)
-
- # define atomic_fetch_add(object,operand) \
---
-2.8.1
-
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list