From 0578a2413cfc3f3d2d08649e58ecf1239dfb6090b2e8688c976188d261b28b18 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 24 Aug 2019 16:40:05 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/vlc revision 99.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=c6887ab468909765a5c238de71351745 --- vlc-3.0.7.1.tar.xz | 3 --- vlc-3.0.8.tar.xz | 3 +++ vlc-CVE-2019-13602_1.patch | 35 ------------------------------- vlc-CVE-2019-13602_2.patch | 33 ------------------------------ vlc-CVE-2019-13962.patch | 38 ---------------------------------- vlc.changes | 42 ++++++++++++++++++++++++++++++++++++++ vlc.spec | 23 +++++++++------------ 7 files changed, 55 insertions(+), 122 deletions(-) delete mode 100644 vlc-3.0.7.1.tar.xz create mode 100644 vlc-3.0.8.tar.xz delete mode 100644 vlc-CVE-2019-13602_1.patch delete mode 100644 vlc-CVE-2019-13602_2.patch delete mode 100644 vlc-CVE-2019-13962.patch diff --git a/vlc-3.0.7.1.tar.xz b/vlc-3.0.7.1.tar.xz deleted file mode 100644 index 6e23273..0000000 --- a/vlc-3.0.7.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0655804371096772f06104b75c21cde8a76e3b6c8a2fdadc97914f082c6264f5 -size 26052372 diff --git a/vlc-3.0.8.tar.xz b/vlc-3.0.8.tar.xz new file mode 100644 index 0000000..5c69cb6 --- /dev/null +++ b/vlc-3.0.8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6 +size 26041520 diff --git a/vlc-CVE-2019-13602_1.patch b/vlc-CVE-2019-13602_1.patch deleted file mode 100644 index 5ca1f1e..0000000 --- a/vlc-CVE-2019-13602_1.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b2b157076d9e94df34502dd8df0787deb940e938 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Thu, 27 Jun 2019 23:19:38 +0300 -Subject: [PATCH] mp4: fix integer underflow - -Reported-by: Hyeon-Ju Lee ---- - modules/demux/mp4/mp4.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c -index 540aa836c2..77b46de1c3 100644 ---- a/modules/demux/mp4/mp4.c -+++ b/modules/demux/mp4/mp4.c -@@ -510,11 +510,11 @@ static block_t * MP4_EIA608_Convert( block_t * p_block ) - block_t *p_newblock; - - /* always need at least 10 bytes (atom size+header+1pair)*/ -- if ( i_remaining < 10 || -- !(i_bytes = GetDWBE(p_block->p_buffer)) || -- (i_bytes > i_remaining) || -- memcmp("cdat", &p_block->p_buffer[4], 4) || -- !(p_newblock = block_Alloc( i_remaining * 3 - 8 )) ) -+ i_bytes = GetDWBE(p_block->p_buffer); -+ -+ if (10 < i_bytes || i_bytes < i_remaining || -+ memcmp("cdat", &p_block->p_buffer[4], 4) || -+ (p_newblock = block_Alloc(i_remaining * 3 - 8)) == NULL) - { - p_block->i_buffer = 0; - return p_block; --- -2.11.0 - - diff --git a/vlc-CVE-2019-13602_2.patch b/vlc-CVE-2019-13602_2.patch deleted file mode 100644 index 6f4903c..0000000 --- a/vlc-CVE-2019-13602_2.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8e8e0d72447f8378244f5b4a3dcde036dbeb1491 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Thu, 27 Jun 2019 23:19:38 +0300 -Subject: [PATCH] mp4: fix integer underflow - -Reported-by: Hyeon-Ju Lee ---- - modules/demux/mp4/mp4.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c -index 77b46de1c3..83f36db1a7 100644 ---- a/modules/demux/mp4/mp4.c -+++ b/modules/demux/mp4/mp4.c -@@ -536,10 +536,10 @@ static block_t * MP4_EIA608_Convert( block_t * p_block ) - } while( i_bytes >= 2 ); - - /* cdt2 is optional */ -- if ( i_remaining >= 10 && -- (i_bytes = GetDWBE(p_read)) && -- (i_bytes <= i_remaining) && -- !memcmp("cdt2", &p_read[4], 4) ) -+ i_bytes = GetDWBE(p_read); -+ -+ if (10 <= i_bytes && i_bytes <= i_remaining && -+ !memcmp("cdt2", &p_read[4], 4)) - { - p_read += 8; - i_bytes -= 8; --- -2.11.0 - - diff --git a/vlc-CVE-2019-13962.patch b/vlc-CVE-2019-13962.patch deleted file mode 100644 index 14c667e..0000000 --- a/vlc-CVE-2019-13962.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2b4f9d0b0e0861f262c90e9b9b94e7d53b864509 Mon Sep 17 00:00:00 2001 -From: Francois Cartegnie -Date: Mon, 20 May 2019 14:27:39 +0200 -Subject: [PATCH] codec: avcodec: fix broken check before copy (fix #22240) -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -copy parameters are the picture ones - -regression by c988b8d58b01ef6d628e3051774a2032dd7f6b7d - -(cherry picked from commit 603ecaf0f3fdf3b0a83cd2c773e05ac347b2149a) -Signed-off-by: Hugo Beauzée-Luyssen ---- - modules/codec/avcodec/video.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c -index 097e7cb11a..c5899fd736 100644 ---- a/modules/codec/avcodec/video.c -+++ b/modules/codec/avcodec/video.c -@@ -364,8 +364,9 @@ static int lavc_CopyPicture(decoder_t *dec, picture_t *pic, AVFrame *frame) - sys->p_context->pix_fmt, (name != NULL) ? name : "unknown"); - return VLC_EGENERIC; - } else if (fourcc != pic->format.i_chroma -- || frame->width > (int) pic->format.i_width -- || frame->height > (int) pic->format.i_height) -+ /* ensure we never read more than dst lines/pixels from src */ -+ || frame->width != (int) pic->format.i_visible_width -+ || frame->height < (int) pic->format.i_visible_height) - { - msg_Warn(dec, "dropping frame because the vout changed"); - return VLC_EGENERIC; --- -2.11.0 - - diff --git a/vlc.changes b/vlc.changes index 4fccf96..dcdb726 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Fri Aug 23 06:49:28 UTC 2019 - Bjørn Lie + +- Add conditional pkgconfig(libmfx) BuildRequires: Build with Intel + Media SDK support. + +------------------------------------------------------------------- +Tue Aug 20 07:55:46 UTC 2019 - Dominique Leuenberger + +- Update to version 3.0.8 'vetinari': + + Fix stuttering for low framerate videos + + Improve adaptive streaming + + Improve audio output for external audio devices on macOS/iOS + + Fix hardware acceleration with Direct3D11 for some AMD drivers + + Fix WebVTT subtitles rendering + + Vetinari is a major release changing a lot in the media engine of VLC. + It is one of the largest release we've ever done. + Notably, it: + - activates hardware decoding on all platforms, of H.264 & H.265, 8 & 10bits, + allowing 4K60 or even 8K decoding with little CPU consumption, + - merges all the code from the mobile ports into the same codebase with + common numbering and releases, + - supports 360 video and 3D audio, and prepares for VR content, + - supports direct HDR and HDR tone-mapping, + - updates the audio passthrough for HD Audio codecs, + - allows browsing of local network drives like SMB, FTP, SFTP, NFS... + - stores the passwords securely, + - brings a new subtitle rendering engine, supporting ComplexTextLayout + and font fallback to support multiple languages and fonts, + - supports ChromeCast with the new renderer framework, + - adds support for numerous new formats and codecs, including WebVTT, + AV1, TTML, HQX, 708, Cineform, and many more, + - improves Bluray support with Java menus, aka BD-J, + - updates the macOS interface with major cleaning and improvements, + - support HiDPI UI on Windows, with the switch to Qt5, + - prepares the experimental support for Wayland on Linux, and + switches to OpenGL by default on Linux. +- Drop vlc-CVE-2019-13962.patch, vlc-CVE-2019-13602_1.patch and + vlc-CVE-2019-13602_2.patch: fixed upstream. +- Disbale mod-plug for the time being: libmodplug 0.8.9 is not yet + available. + ------------------------------------------------------------------- Sun Aug 4 01:44:44 UTC 2019 - Stefan Brüns diff --git a/vlc.spec b/vlc.spec index ef4bef6..e72f359 100644 --- a/vlc.spec +++ b/vlc.spec @@ -33,7 +33,7 @@ %bcond_with faad %bcond_with fdk_aac Name: vlc -Version: 3.0.7.1 +Version: 3.0.8 Release: 0 Summary: Graphical media player License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -51,12 +51,6 @@ Patch1: vlc-allow-deprecated-fribidi.patch Patch2: vlc-lua-5.3.patch # PATCH-FIX-UPSTREAM fix-build-with-fdk-2.0.patch -- Fix building vlc with libfdk-aac v2 Patch3: fix-build-with-fdk-2.0.patch -# PATCH-FIX-UPSTREAM vlc-CVE-2019-13962.patch -- Fix An Integer Underflow in MP4_EIA608_Convert() -Patch4: vlc-CVE-2019-13962.patch -# PATCH-FIX-UPSTREAM vlc-CVE-2019-13602_1.patch -- mp4: fix integer underflow -Patch5: vlc-CVE-2019-13602_1.patch -# PATCH-FIX-UPSTREAM vlc-CVE-2019-13602_2.patch -- mp4: fix integer underflow -Patch6: vlc-CVE-2019-13602_2.patch # PATCH-FEATURE-OPENSUSE vlc-projectM-qt5.patch -- Build against projectM-qt5; openSUSE provides projectM as -qt and -qt5 variant Patch100: vlc-projectM-qt5.patch # PATCH-FIX-UPSTREAM 0001-Fix-leaking-AvahiServiceResolver-in-the-error-paths.patch -- Fix some memleaks @@ -136,7 +130,7 @@ BuildRequires: pkgconfig(libavformat) >= 53.21.0 BuildRequires: pkgconfig(libavutil) >= 52.4.0 BuildRequires: pkgconfig(libbluray) >= 0.6.2 BuildRequires: pkgconfig(libgme) -BuildRequires: pkgconfig(libmodplug) >= 0.8.4 +#BuildRequires: pkgconfig(libmodplug) >= 0.8.9 BuildRequires: pkgconfig(libmpeg2) > 0.3.2 BuildRequires: pkgconfig(libmtp) >= 1.0.0 BuildRequires: pkgconfig(libnfs) @@ -174,6 +168,9 @@ Conflicts: %{conflicts} Obsoletes: %{name}-gnome <= %{version} %if 0%{?suse_version} >= 1550 BuildRequires: pkgconfig(dav1d) +%ifarch x86_64 +BuildRequires: pkgconfig(libmfx) +%endif %endif %if 0%{?suse_version} > 1500 && 0%{?is_opensuse} BuildRequires: pkgconfig(srt) @@ -384,9 +381,6 @@ default when `vlc` is invoked from an X session. %patch0 -p1 %patch1 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %if 0%{?suse_version} > 1320 && 0%{?suse_version} < 1550 %patch100 -p1 %endif @@ -442,7 +436,7 @@ autoreconf -fiv --enable-live555 \ --enable-lua \ --enable-mad \ - --enable-mod \ + --disable-mod \ --enable-ogg \ --enable-optimizations \ --enable-postproc \ @@ -831,6 +825,9 @@ done %{_libdir}/vlc/plugins/codec/libcvdsub_plugin.so %if 0%{?suse_version} >= 1550 %{_libdir}/vlc/plugins/codec/libdav1d_plugin.so +%ifarch x86_64 +%{_libdir}/vlc/plugins/codec/libqsv_plugin.so +%endif %endif %{_libdir}/vlc/plugins/codec/libddummy_plugin.so %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so @@ -902,7 +899,7 @@ done %{_libdir}/vlc/plugins/demux/libimage_plugin.so %{_libdir}/vlc/plugins/demux/libmjpeg_plugin.so %{_libdir}/vlc/plugins/demux/libmkv_plugin.so -%{_libdir}/vlc/plugins/demux/libmod_plugin.so +#%{_libdir}/vlc/plugins/demux/libmod_plugin.so %{_libdir}/vlc/plugins/demux/libmp4_plugin.so %{_libdir}/vlc/plugins/demux/libmpgv_plugin.so %{_libdir}/vlc/plugins/demux/libnoseek_plugin.so