From 27cc6a89273c958b55c3069a0c8bee0ca8760e3cedfedb79ea85398ae6a0362a Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 2 Jun 2017 08:31:18 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/vlc revision 68.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=0240c2d311dd2e99a46c84e58edd48ab --- 0001-no-return-in-non-void.patch | 60 +++++++++---------- ...1.5-fix-skins2-default-skin-creation.patch | 20 ------- vlc-2.2.4.tar.xz | 3 - vlc-2.2.6.tar.xz | 3 + vlc.changes | 42 +++++++++++++ vlc.spec | 8 +-- 6 files changed, 76 insertions(+), 60 deletions(-) delete mode 100644 vlc-2.1.5-fix-skins2-default-skin-creation.patch delete mode 100644 vlc-2.2.4.tar.xz create mode 100644 vlc-2.2.6.tar.xz diff --git a/0001-no-return-in-non-void.patch b/0001-no-return-in-non-void.patch index eaa7e97..0e9725f 100644 --- a/0001-no-return-in-non-void.patch +++ b/0001-no-return-in-non-void.patch @@ -1,8 +1,8 @@ -Index: vlc-2.2.1/modules/access/v4l2/demux.c +Index: vlc-2.2.6/modules/access/v4l2/demux.c =================================================================== ---- vlc-2.2.1.orig/modules/access/v4l2/demux.c -+++ vlc-2.2.1/modules/access/v4l2/demux.c -@@ -632,6 +632,7 @@ static void *MmapThread (void *data) +--- vlc-2.2.6.orig/modules/access/v4l2/demux.c ++++ vlc-2.2.6/modules/access/v4l2/demux.c +@@ -634,6 +634,7 @@ static void *MmapThread (void *data) } assert (0); @@ -10,7 +10,7 @@ Index: vlc-2.2.1/modules/access/v4l2/demux.c } static void *ReadThread (void *data) -@@ -694,6 +695,7 @@ static void *ReadThread (void *data) +@@ -696,6 +697,7 @@ static void *ReadThread (void *data) #endif } assert (0); @@ -18,10 +18,10 @@ Index: vlc-2.2.1/modules/access/v4l2/demux.c } static int DemuxControl( demux_t *demux, int query, va_list args ) -Index: vlc-2.2.1/modules/control/dbus/dbus.c +Index: vlc-2.2.6/modules/control/dbus/dbus.c =================================================================== ---- vlc-2.2.1.orig/modules/control/dbus/dbus.c -+++ vlc-2.2.1/modules/control/dbus/dbus.c +--- vlc-2.2.6.orig/modules/control/dbus/dbus.c ++++ vlc-2.2.6/modules/control/dbus/dbus.c @@ -891,6 +891,7 @@ static void *Run( void *data ) vlc_restorecancel( canc ); } @@ -30,10 +30,10 @@ Index: vlc-2.2.1/modules/control/dbus/dbus.c } static void wakeup_main_loop( void *p_data ) -Index: vlc-2.2.1/modules/control/motion.c +Index: vlc-2.2.6/modules/control/motion.c =================================================================== ---- vlc-2.2.1.orig/modules/control/motion.c -+++ vlc-2.2.1/modules/control/motion.c +--- vlc-2.2.6.orig/modules/control/motion.c ++++ vlc-2.2.6/modules/control/motion.c @@ -188,6 +188,7 @@ static void *RunIntf( void *data ) vlc_restorecancel( canc ); } @@ -42,10 +42,10 @@ Index: vlc-2.2.1/modules/control/motion.c } #undef LOW_THRESHOLD #undef HIGH_THRESHOLD -Index: vlc-2.2.1/modules/control/motionlib.c +Index: vlc-2.2.6/modules/control/motionlib.c =================================================================== ---- vlc-2.2.1.orig/modules/control/motionlib.c -+++ vlc-2.2.1/modules/control/motionlib.c +--- vlc-2.2.6.orig/modules/control/motionlib.c ++++ vlc-2.2.6/modules/control/motionlib.c @@ -196,6 +196,7 @@ static int GetOrientation( motion_sensor default: assert( 0 ); @@ -54,10 +54,10 @@ Index: vlc-2.2.1/modules/control/motionlib.c } /***************************************************************************** -Index: vlc-2.2.1/modules/stream_out/rtp.c +Index: vlc-2.2.6/modules/stream_out/rtp.c =================================================================== ---- vlc-2.2.1.orig/modules/stream_out/rtp.c -+++ vlc-2.2.1/modules/stream_out/rtp.c +--- vlc-2.2.6.orig/modules/stream_out/rtp.c ++++ vlc-2.2.6/modules/stream_out/rtp.c @@ -1499,6 +1499,7 @@ static void *rtp_listen_thread( void *da } @@ -66,10 +66,10 @@ Index: vlc-2.2.1/modules/stream_out/rtp.c } -Index: vlc-2.2.1/modules/visualization/visual/visual.c +Index: vlc-2.2.6/modules/visualization/visual/visual.c =================================================================== ---- vlc-2.2.1.orig/modules/visualization/visual/visual.c -+++ vlc-2.2.1/modules/visualization/visual/visual.c +--- vlc-2.2.6.orig/modules/visualization/visual/visual.c ++++ vlc-2.2.6/modules/visualization/visual/visual.c @@ -382,6 +382,7 @@ static void *Thread( void *data ) vlc_restorecancel( canc ); } @@ -78,10 +78,10 @@ Index: vlc-2.2.1/modules/visualization/visual/visual.c } static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf ) -Index: vlc-2.2.1/src/misc/events.c +Index: vlc-2.2.6/src/misc/events.c =================================================================== ---- vlc-2.2.1.orig/src/misc/events.c -+++ vlc-2.2.1/src/misc/events.c +--- vlc-2.2.6.orig/src/misc/events.c ++++ vlc-2.2.6/src/misc/events.c @@ -271,6 +271,7 @@ int vlc_event_attach( vlc_event_manager_ FOREACH_END() /* Unknown event = BUG */ @@ -90,15 +90,15 @@ Index: vlc-2.2.1/src/misc/events.c } /** -Index: vlc-2.2.1/modules/demux/mp4/mp4.c +Index: vlc-2.2.6/modules/demux/mp4/mp4.c =================================================================== ---- vlc-2.2.1.orig/modules/demux/mp4/mp4.c -+++ vlc-2.2.1/modules/demux/mp4/mp4.c -@@ -277,6 +277,7 @@ static inline int64_t MP4_TrackGetPTSDel - - i_sample -= ck->p_sample_count_pts[i_index]; +--- vlc-2.2.6.orig/modules/demux/mp4/mp4.c ++++ vlc-2.2.6/modules/demux/mp4/mp4.c +@@ -386,6 +386,7 @@ static void CreateTracksFromSmooBox( dem + p_track->p_es = es_out_Add( p_demux->out, &p_track->fmt ); + } } + return 0; } - static inline int64_t MP4_GetMoviePTS(demux_sys_t *p_sys ) + /***************************************************************************** diff --git a/vlc-2.1.5-fix-skins2-default-skin-creation.patch b/vlc-2.1.5-fix-skins2-default-skin-creation.patch deleted file mode 100644 index 317ab25..0000000 --- a/vlc-2.1.5-fix-skins2-default-skin-creation.patch +++ /dev/null @@ -1,20 +0,0 @@ -Author: Stefan Seyfried - -New tar defaults create PAX archives which have two problems: -* VLC cannot read them -* they contain atime and thus the build time -Avoid this by passign "--format=ustar" to tar when creating skins2/default.vlt - -Index: b/share/Makefile.am -=================================================================== ---- a/share/Makefile.am -+++ b/share/Makefile.am -@@ -79,7 +79,7 @@ skins2/default.vlt: $(skins2_default_vlt - mkdir -p skins2 - (cd "$(srcdir)/skins2"; find default -print0 | \ - LC_ALL=C sort -z | \ -- tar cvv --exclude .svn --no-recursion --null -T -) | \ -+ tar cvv --format=ustar --exclude .svn --no-recursion --null -T -) | \ - gzip -n > skins2/default.vlt - - # diff --git a/vlc-2.2.4.tar.xz b/vlc-2.2.4.tar.xz deleted file mode 100644 index f421fda..0000000 --- a/vlc-2.2.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1632e91d2a0087e0ef4c3fb4c95c3c2890f7715a9d1d43ffd46329f428cf53be -size 22199316 diff --git a/vlc-2.2.6.tar.xz b/vlc-2.2.6.tar.xz new file mode 100644 index 0000000..e1c5f8f --- /dev/null +++ b/vlc-2.2.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c403d3accd9a400eb2181c958f3e7bc5524fe5738425f4253d42883b425a42a8 +size 22198720 diff --git a/vlc.changes b/vlc.changes index 01f29bb..6be2721 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Fri May 26 14:28:36 UTC 2017 - dimstar@opensuse.org + +- Update to version 2.2.6: + + Video output: + - Fix systematic green line on nvidia. + - Fix direct3d SPU texture offsets handling. + + Demuxer: Fix heap buffer overflows. +- Changes from version 2.2.5.1: + + Security hardening for DLL hijacking environments. +- Changes from version 2.2.5: + + Decoder: + - Fix mp3 playback quality regression in libmad. + - Fix video scaling in VDPAU. + - Fix playback of palettized codecs. + - Fix ADPCM heap corruption (FG-VD-16-067). + - Fix AES3 16bps decoding. + - Fix DVD/LPCM heap corruption (FG-VD-16-090). + - Fix SCTE-27 colors. + + Demuxer: + - Fix possible ASF integer overflow. + - Fix MP4, VOC, XA, SMF divide-by-zero errors. + - Fix MP4 heap buffer overflows. + - Fix Flac metadata integer overflow. + - Fix NSVf and AIFF infinite loops. + - Fix flac null-pointer dereference. + - Fix vorbis and opus comments integer overflows and leaks. + + Video output: + - Fix green line on Windows with AMD drivers. + - Fix screenshots size. + + Access: + - Fix crash in screen recording on Windows. + - Fix FTP scan string injection. + - Fix HTTP size handling. + + Mux: Fix mp4 drift. + + Lua: Fix vimeo, youtube, dailymotion, cli, appletrailers, http, + soundcloud scripts. + + Audio filter: Fix heap write in stereo_widen audio filter. +- Rebase 0001-no-return-in-non-void.patch. +- Drop vlc-2.1.5-fix-skins2-default-skin-creation.patch: this + should really not be required anymore. + ------------------------------------------------------------------- Wed May 3 06:57:57 UTC 2017 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index 5d2340b..434786b 100644 --- a/vlc.spec +++ b/vlc.spec @@ -37,7 +37,7 @@ %endif Name: vlc -Version: 2.2.4 +Version: 2.2.6 Release: 0 Summary: Graphical media player License: GPL-2.0+ and LGPL-2.1+ @@ -48,8 +48,6 @@ Source: http://download.videolan.org/%{name}/%{version}/%{name}-%{versio Source1: %{name}.changes Source2: %{name}-rpmlintrc Source3: %{name}.appdata.xml -# 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 Patch3: 0001-no-return-in-non-void.patch Patch4: vlc-2.2.0-fix_deinterlace_mmx.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 @@ -341,9 +339,6 @@ default when `vlc` is invoked from an X session. echo '********* ENTERED PREP PHASE ********' date %setup -q -%if 0%{?suse_version} >=1140 -%patch1 -p1 -%endif %patch3 -p1 %if 0%{?suse_version} == 1110 %ifarch %ix86 @@ -728,7 +723,6 @@ install -Dm0644 %{S:3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/lua/sd/icast.luac %{_libdir}/vlc/lua/sd/icecast.luac %{_libdir}/vlc/lua/sd/jamendo.luac -%{_libdir}/vlc/lua/sd/metachannels.luac %{_libdir}/vlc/plugins/access/libaccess_alsa_plugin.so %{_libdir}/vlc/plugins/access/libaccess_bd_plugin.so %{_libdir}/vlc/plugins/access/libftp_plugin.so