[SCM] vlc/master: Remove patches from upstream
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sun Jan 31 22:14:29 UTC 2016
The following commit has been merged in the master branch:
commit fc8db53cf4903999fde047461c61b20c5854c1cf
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sun Jan 31 21:59:59 2016 +0100
Remove patches from upstream
diff --git a/debian/patches/alsa-fix-changing-audio-device.patch b/debian/patches/alsa-fix-changing-audio-device.patch
deleted file mode 100644
index 9e519c8..0000000
--- a/debian/patches/alsa-fix-changing-audio-device.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Qt: fix changing audio device
-Origin: upstream,
- https://git.videolan.org/?p=vlc/vlc-2.2.git;a=commit;h=994c11fb4c2d7c6af7b4e406d56fac72e95e7218
-Last-Update: 2015-10-27
-Bug-Debian: https://bugs.debian.org/801448
-
-diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
-index 15a14b9..998bc80 100644
---- a/modules/gui/qt4/menus.cpp
-+++ b/modules/gui/qt4/menus.cpp
-@@ -1583,7 +1583,7 @@ void VLCMenuBar::updateAudioDevice( intf_thread_t * p_intf, audio_output_t *p_ao
- action->setChecked( true );
- actionGroup->addAction( action );
- current->addAction( action );
-- CONNECT(action, changed(), THEMIM->menusAudioMapper, map());
-+ CONNECT(action, triggered(), THEMIM->menusAudioMapper, map());
- THEMIM->menusAudioMapper->setMapping(action, ids[i]);
- free( ids[i] );
- free( names[i] );
---
-1.7.10.4
-
diff --git a/debian/patches/demux-mp4-correctly-match-release-function.patch b/debian/patches/demux-mp4-correctly-match-release-function.patch
deleted file mode 100644
index 751482c..0000000
--- a/debian/patches/demux-mp4-correctly-match-release-function.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ce91452460a75d7424b165c4dc8db98114c3cbd9 Mon Sep 17 00:00:00 2001
-From: Francois Cartegnie <fcartegnie at free.fr>
-Date: Mon, 3 Aug 2015 15:17:32 +0200
-Subject: [PATCH 1/1] demux: mp4: correctly match release function
-
-Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
----
- modules/demux/mp4/libmp4.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
-index 331262b..f220e51 100644
---- a/modules/demux/mp4/libmp4.c
-+++ b/modules/demux/mp4/libmp4.c
-@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box )
- {
- for( i_index = 0; ; i_index++ )
- {
-+ if ( MP4_Box_Function[i_index].i_parent &&
-+ p_box->p_father &&
-+ p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent )
-+ continue;
-+
- if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )||
- ( MP4_Box_Function[i_index].i_type == 0 ) )
- {
---
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a176165..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-demux-mp4-correctly-match-release-function.patch
-unsubscribe-disable-motion.patch
-alsa-fix-changing-audio-device.patch
diff --git a/debian/patches/unsubscribe-disable-motion.patch b/debian/patches/unsubscribe-disable-motion.patch
deleted file mode 100644
index 576485f..0000000
--- a/debian/patches/unsubscribe-disable-motion.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: qt5: unsubscribe disable motion and XI2 mouse events
-Origin: upstream,
- https://git.videolan.org/?p=vlc/vlc-2.2.git;a=commit;h=729d28e766f37e166000c0c9d15c19138281b754
-Last-Update: 2015-10-27
-
-diff --git a/configure.ac b/configure.ac
-index bed99d9..63a0577 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3722,6 +3722,16 @@ AS_IF([test "${enable_qt}" != "no"], [
- PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [
- VLC_ADD_LIBS([qt4],[${QTX11_LIBS}])
- VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11])
-+ PKG_CHECK_MODULES([XI], [xi], [
-+ VLC_ADD_LIBS([qt4], [${XI_LIBS}])
-+ VLC_ADD_CXXFLAGS([qt4], [${XI_CFLAGS} -DHAVE_XI])
-+ ], [
-+ PKG_CHECK_EXISTS([Qt5Gui >= 5.5], [
-+ AC_MSG_ERROR([${XI_PKG_ERRORS}.])
-+ ], [
-+ AC_MSG_WARN([${XI_PKG_ERRORS}.])
-+ ])
-+ ])
- ],[
- AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
- ])
-diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
-index 8c30ac0..f433446 100644
---- a/modules/gui/qt4/components/interface_widgets.cpp
-+++ b/modules/gui/qt4/components/interface_widgets.cpp
-@@ -58,6 +58,9 @@
-
- #ifdef Q_WS_X11
- # include <X11/Xlib.h>
-+# ifdef HAVE_XI
-+# include <X11/extensions/XInput2.h>
-+# endif
- # include <qx11info_x11.h>
- #endif
-
-@@ -148,7 +151,25 @@ WId VideoWidget::request( int *pi_x, int *pi_y,
-
- XGetWindowAttributes( dpy, w, &attr );
- attr.your_event_mask &= ~(ButtonPressMask|ButtonReleaseMask);
-+ attr.your_event_mask &= ~PointerMotionMask;
- XSelectInput( dpy, w, attr.your_event_mask );
-+# ifdef HAVE_XI
-+ int n;
-+ XIEventMask *xi_masks = XIGetSelectedEvents( dpy, w, &n );
-+ if( xi_masks != NULL )
-+ {
-+ for( int i = 0; i < n; i++ )
-+ if( xi_masks[i].mask_len >= 1 )
-+ {
-+ xi_masks[i].mask[0] &= ~XI_ButtonPressMask;
-+ xi_masks[i].mask[0] &= ~XI_ButtonReleaseMask;
-+ xi_masks[i].mask[0] &= ~XI_MotionMask;
-+ }
-+
-+ XISelectEvents( dpy, w, xi_masks, n );
-+ XFree( xi_masks );
-+ }
-+# endif
- #endif
- sync();
- return stable->winId();
---
-1.7.10.4
-
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list