pool/vlc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 358381 from multimedia:libs

Browse Source 
- Update to version 2.2.2:
  + libVLC:
    - Expose audio mute, cork and volume change events:
      libvlc_MediaPlayerCorked, libvlc_MediaPlayerUncorked,
      libvlc_MediaPlayerMuted, libvlc_MediaPlayerUnmuted and
      libvlc_MediaPlayerAudioVolume.
    - Fix propagation of libvlc_MediaPlayerTitleChanged event.
  + Access:
    - Fix SetupFormat for continuous framesize in v4l2.
    - Fix off-by-one buffer overflow in RealRtsp module.
    - Fix screen recording aspect-ratio, framerate and potential
      crash.
    - Fix Windows directshow input freeze.
    - Fix MMS segmentation fault/abort when server forces a large
      allocation.
  + Demux:
    - Fix support for ms-dvr files.
    - Fix time detection in AVI files over HTTP.
    - HLS: fix hang on stop, crashes and small improvements.
    - Fix mp4 NULL dereference reported by by Fortinet's FortiGuard
      Labs.
    - Fix regression for VC-1 in WMV.
    - Fix MXF crashes on stop.
    - Fix EAC3 detection in some TS files.
  + Decoders:
    - Fix importing surface from main memory in VDPAU.
    - Fix possible double-free in ADPCM decoder.
    - Support 9-bit and 10-bit GBR planar formats.
    - Support GoToMeeting 2 and GoToMeeting 3 codecs.
    - Fix crash in teletext (zvbi) decoder.

OBS-URL: https://build.opensuse.org/request/show/358381
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vlc?expand=0&rev=51
This commit is contained in:
Dominique Leuenberger 2016-02-11 11:37:38 +00:00 committed by Git OBS Bridge
commit 52c38baa1c
7 changed files with 132 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vlc-2.2.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb
size 20940288

3
vlc-2.2.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ad23128be16f9b40ed772961272cb0748ed8e4aa1bc79c129e589feebea5fb5
size 22253152

30
vlc-CVE-2015-5949.patch
View File

@ -1,30 +0,0 @@
From ce91452460a75d7424b165c4dc8db98114c3cbd9 Mon Sep 17 00:00:00 2001
From: Francois Cartegnie <fcartegnie@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@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

93
vlc-qt5.5-mousepointer.patch
View File

@ -1,93 +0,0 @@
From 729d28e766f37e166000c0c9d15c19138281b754 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Fri, 23 Oct 2015 22:46:26 +0300
Subject: [PATCH] qt5: unsubscribe disable motion and XI2 mouse events
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
╔═══════════════════════════╗
║ PARENTAL ADVISORY: R-24 ║
║ EXPLICIT CONTENT ║
║ INAPPROPRIATE KLUDGY HACK ║
╚═══════════════════════════╝
This extends the existing kludge to catch mouse clicks in the video
output instead of the Qt framework. From version 5.5, Qt uses XI2 to
catch mouse events.
May or may not interfere with touch devices.
May or may not interfere with cursor changes.
May or may not be forward compatible.
(cherry picked from commit 4e55554c37e7c55586c41a5e9fc50f393167ac0b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
configure.ac | 10 ++++++++++
modules/gui/qt4/components/interface_widgets.cpp | 21 +++++++++++++++++++++
2 files changed, 31 insertions(+)
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

33
vlc-support-qt5.5.patch Normal file
View File

@ -0,0 +1,33 @@
From 64dccb0fdd71075e37e03c4b52a0c9f5bb749d3f Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 16 Nov 2015 14:54:35 +0100
Subject: [PATCH 1/1] Configure: Refuse Qt 5.5.0 and 5.5.1
If you are a packager, I'm sorry for you, but you MUST patch Qt5.5 with
https://codereview.qt-project.org/#/c/139066/1
and then revert this commit.
You can also lobby for a Qt5.5.2
---
configure.ac | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/configure.ac b/configure.ac
index 63a0577..d90097c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3735,6 +3735,11 @@ AS_IF([test "${enable_qt}" != "no"], [
],[
AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
])
+
+ PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [
+ AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"])
+ ])
+
QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
--
1.7.10.4

87
vlc.changes
View File

@ -1,3 +1,90 @@
-------------------------------------------------------------------
Fri Feb 5 21:28:01 UTC 2016 - dimstar@opensuse.org
- Update to version 2.2.2:
+ libVLC:
- Expose audio mute, cork and volume change events:
libvlc_MediaPlayerCorked, libvlc_MediaPlayerUncorked,
libvlc_MediaPlayerMuted, libvlc_MediaPlayerUnmuted and
libvlc_MediaPlayerAudioVolume.
- Fix propagation of libvlc_MediaPlayerTitleChanged event.
+ Access:
- Fix SetupFormat for continuous framesize in v4l2.
- Fix off-by-one buffer overflow in RealRtsp module.
- Fix screen recording aspect-ratio, framerate and potential
crash.
- Fix Windows directshow input freeze.
- Fix MMS segmentation fault/abort when server forces a large
allocation.
+ Demux:
- Fix support for ms-dvr files.
- Fix time detection in AVI files over HTTP.
- HLS: fix hang on stop, crashes and small improvements.
- Fix mp4 NULL dereference reported by by Fortinet's FortiGuard
Labs.
- Fix regression for VC-1 in WMV.
- Fix MXF crashes on stop.
- Fix EAC3 detection in some TS files.
+ Decoders:
- Fix importing surface from main memory in VDPAU.
- Fix possible double-free in ADPCM decoder.
- Support 9-bit and 10-bit GBR planar formats.
- Support GoToMeeting 2 and GoToMeeting 3 codecs.
- Fix crash in teletext (zvbi) decoder.
- Fix Bluray subtitles (PGS) timestamps.
+ Audio output:
- Fix audio drop after a flush with pulseaudio.
- Fix audio initialization on iOS.
- Fix audio stuttering with AirPlay devices on OS X (2 sec
delay needs to be set manually by the user).
- Fix pulseaudio latency computation.
- Fix alsa default device selection.
+ Skins2:
- Fix video control that fails to show up.
- Fix UTF-8 conversion issues.
- Fix Unicode folders location failing to open the skins.
- Fix crash over malformed skins bitmaps.
- Fix fullscreen for Gnome3/Unity Window Managers.
+ OS X fixes.
+ Qt:
- Fix crash when opening multiple items on Windows.
- Fix recent items appending when using a playlist.
- Improve addons manager dialog, playlist.
- Fix changing the audio-device in the menu.
- Fix key and mouse event support for Qt >= 5.5 under X11.
- Fix memory leaks.
+ Video Output:
- Fix build if one disables XCB but activate VDPAU on Unix.
- Fix Direct3D plane allocation size to avoid colour bleeding.
- Fix some crashes in swscale resizing.
+ Misc:
- Fix build with recent FreeRDP versions.
- Fix interface crashes when input-title-format option is
empty.
- Fix MP4 mux divide-by-zero crash.
- Improve PNG encoding time.
- Fix some UPnP initialization lag.
- Rewrite of the Jamendo Service Discovery.
- Fix snapshot aspect ratio for anamorphic contents.
- Fix custom snapshot sizes.
- Dynamic generation of GnuTLS Diffie-Hellman parameters.
- Fix "vb" transcoding parameter.
- Fix superfluous audio channel extraction in the core.
- Fix miscellaneous crashes, double-frees, integer overflows,
infinite loops, read overflow, invalid frees and division by
zero issues.
- Fix support for lua 5.2 and fix XSS in the http interface.
- Update and improve Soundcloud, Vimeo and Youtube scripts.
- Update of codecs and libraries to fix 3rd party security
issues (like TALOS-CAN-0036, TALOS-CAN-0037, CVE-2015-7981,
CVE-2015-8126).
+ Updated translations.
- Drop vlc-CVE-2015-5949.patch and vlc-qt5.5-mousepointer.patch:
fixed upstream.
- Add vlc-support-qt5.5.patch (reverse applied): The Qt 5.5 package
in Leap and Tumbleweed have been patched to have the fix upstream
wanted to make us aware of with this commit.
-------------------------------------------------------------------
Fri Feb 5 09:07:03 UTC 2016 - dimstar@opensuse.org

17
vlc.spec
View File

@ -31,7 +31,7 @@
%endif
Name: vlc
Version: 2.2.1
Version: 2.2.2
Release: 0
Summary: Video Lan Client multimedia player
License: GPL-2.0+ and LGPL-2.1+
@ -43,12 +43,10 @@ Source1: %{name}.changes
Source2: %{name}-rpmlintrc
# PATCH-FIX-OPENSUSE vlc-2.1.5-fix-skins2-default-skin-creation.patch -- see description in patch header
Patch1: vlc-2.1.5-fix-skins2-default-skin-creation.patch
# PATCH-FIX-UPSTREAM vlc-qt5.5-mousepointer.patch boo#956769 dimstar@opensuse.org -- Fix mouse cursor in video interface
Patch2: vlc-qt5.5-mousepointer.patch
Patch3: 0001-no-return-in-non-void.patch
Patch4: vlc-2.2.0-fix_deinterlace_mmx.patch
# PATCH-FIX-UPSTREAM vlc-CVE-2015-5949.patch boo#965227 CVE-2015-5949 dimstar@opensuse.org -- demux: mp4: correctly match release function
Patch5: vlc-CVE-2015-5949.patch
# PATCH-FIX-UPSTREAM vlc-support-qt5.5.patch dimstar@opensuse.org -- The Qt 5.5 packages in Leap and Tumbleweed are patched. Other dists don't have Qt 5.5 yet. Patch from upstream, reverse applied
Patch5: vlc-support-qt5.5.patch
BuildRequires: Mesa-devel
BuildRequires: SDL-devel >= 1.2.10
BuildRequires: aalib-devel
@ -307,7 +305,6 @@ date
%setup -q
%if 0%{?suse_version} >=1140
%patch1 -p1
%patch2 -p1
%endif
%patch3 -p1
%if 0%{?suse_version} == 1110
@ -315,7 +312,11 @@ date
%patch4
%endif
%endif
%patch5 -p1
%if 0%{?suse_version} > 1310
# openSUSE Leap and Tumbleweed have Qt 5.5.x, but with the required patch applied
# openSUSE 13.2 (also > 1310) comes with Qt 5.3, so is not affected, but the patch does not harm
%patch5 -p1 -R
%endif
### Fix up sources for LUA 5.3
if pkg-config --atleast-version 5.3 lua; then
@ -500,7 +501,7 @@ rm %{buildroot}/%{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so
%endif
# clean up some lang issues...
for lang in ach an cgg co ff tet; do
for lang in ach an cgg co ff tet ks_IN; do
rm -rf %{buildroot}%{_datadir}/locale/$lang
done
%find_lang vlc