From afdfc75c8ac920cba76b1f5f7d7f2683e9514f8622171f795d8d50683dc0893b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 20 Jan 2021 17:23:30 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/vlc revision 114.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=0c5def45f712da584a7a8793ba2a5f16 --- fix-missing-includes-with-qt-5.15.patch | 36 ------------------------- vlc-3.0.11.1.tar.xz | 3 --- vlc-3.0.11.1.tar.xz.asc | 6 ----- vlc-3.0.12.tar.xz | 3 +++ vlc-3.0.12.tar.xz.asc | 6 +++++ vlc-CVE-2020-26664.patch | 13 --------- vlc.changes | 21 +++++++++++++++ vlc.spec | 10 +++---- 8 files changed, 33 insertions(+), 65 deletions(-) delete mode 100644 fix-missing-includes-with-qt-5.15.patch delete mode 100644 vlc-3.0.11.1.tar.xz delete mode 100644 vlc-3.0.11.1.tar.xz.asc create mode 100644 vlc-3.0.12.tar.xz create mode 100644 vlc-3.0.12.tar.xz.asc delete mode 100644 vlc-CVE-2020-26664.patch diff --git a/fix-missing-includes-with-qt-5.15.patch b/fix-missing-includes-with-qt-5.15.patch deleted file mode 100644 index f169521..0000000 --- a/fix-missing-includes-with-qt-5.15.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp -=================================================================== ---- vlc-3.0.8.orig/modules/gui/qt/util/timetooltip.hpp -+++ vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp -@@ -25,6 +25,7 @@ - #include "qt.hpp" - - #include -+#include - - class TimeTooltip : public QWidget - { -Index: vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp -=================================================================== ---- vlc-3.0.8.orig/modules/gui/qt/components/playlist/views.cpp -+++ vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp -@@ -27,6 +27,7 @@ - #include "input_manager.hpp" /* THEMIM */ - - #include -+#include - #include - #include - #include -Index: vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp -=================================================================== ---- vlc-3.0.8.orig/modules/gui/qt/dialogs/plugins.cpp -+++ vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp -@@ -53,6 +53,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/vlc-3.0.11.1.tar.xz b/vlc-3.0.11.1.tar.xz deleted file mode 100644 index b789ba3..0000000 --- a/vlc-3.0.11.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:189311d28aa814f106a7b3645211ac52c0b3e2b9f4b348de2f63bab3218086b8 -size 25886644 diff --git a/vlc-3.0.11.1.tar.xz.asc b/vlc-3.0.11.1.tar.xz.asc deleted file mode 100644 index 5c73b3f..0000000 --- a/vlc-3.0.11.1.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQRl98a0IGvQV6frc3hxgHE75Y0a3AUCXyBAZgAKCRBxgHE75Y0a -3EAJAJ9LrWqzUZbmQmnvXycSQf8q2qwvkACgtv5t/H4QN551EcyMPjS7EGNdlCc= -=snOo ------END PGP SIGNATURE----- diff --git a/vlc-3.0.12.tar.xz b/vlc-3.0.12.tar.xz new file mode 100644 index 0000000..ce94a27 --- /dev/null +++ b/vlc-3.0.12.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eff458f38a92126094f44f2263c2bf2c7cdef271b48192d0fe7b1726388cf879 +size 25997468 diff --git a/vlc-3.0.12.tar.xz.asc b/vlc-3.0.12.tar.xz.asc new file mode 100644 index 0000000..bad10c3 --- /dev/null +++ b/vlc-3.0.12.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQRl98a0IGvQV6frc3hxgHE75Y0a3AUCYAS3nAAKCRBxgHE75Y0a +3En+AJ9tfUrBauA6umkC6m8lU2O34+LPGwCePT5iuqlNV3gBO+OXYaNbatOzHfY= +=/YAk +-----END PGP SIGNATURE----- diff --git a/vlc-CVE-2020-26664.patch b/vlc-CVE-2020-26664.patch deleted file mode 100644 index 578edf8..0000000 --- a/vlc-CVE-2020-26664.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp -index 38a62aa2af2ca8462eedfda25608543d1bd9eec6..fa9a1e81a5994a487ec846fed6d8c9a2cec3139e 100644 ---- a/modules/demux/mkv/mkv.hpp -+++ b/modules/demux/mkv/mkv.hpp -@@ -113,7 +113,7 @@ enum - - #define MKVD_TIMECODESCALE 1000000 - --#define MKV_IS_ID( el, C ) ( el != NULL && (el->operator const EbmlId&()) == (C::ClassInfos.ClassId()) ) -+#define MKV_IS_ID( el, C ) ( el != NULL && (el->operator const EbmlId&()) == (C::ClassInfos.ClassId()) && !el->IsDummy() ) - #define MKV_CHECKED_PTR_DECL( name, type, src ) type * name = MKV_IS_ID(src, type) ? static_cast(src) : NULL - #define MKV_CHECKED_PTR_DECL_CONST( name, type, src ) const type * name = MKV_IS_ID(src, type) ? static_cast(src) : NULL - diff --git a/vlc.changes b/vlc.changes index ce907b0..6b941dc 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Tue Jan 19 11:22:39 UTC 2021 - Dominique Leuenberger + +- Update to version 3.0.12: + + Access: Add new RIST access module compliant with simple + profile (VSF_TR-06-1). + + Access Output: Add new RIST access output module compliant with + simple profile (VSF_TR-06-1). + + Demux: Fixed adaptive's handling of resolution settings. + + Audio output: Fix audio distortion on macOS during start of + playback. + + Video Output: Direct3D11: Fix some potential crashes when using + video filters. + + Misc: + - Several fixes in the web interface, including privacy and + security improvements + - Update YouTube and Vocaroo scripts. + + Updated translations. +- Drop vlc-CVE-2020-26664.patch: fixed upstream. +- Drop fix-missing-includes-with-qt-5.15.patch: fixed upstream. + ------------------------------------------------------------------- Thu Jan 14 15:58:51 UTC 2021 - Dominique Leuenberger diff --git a/vlc.spec b/vlc.spec index 8b3b45e..e4406e2 100644 --- a/vlc.spec +++ b/vlc.spec @@ -33,7 +33,7 @@ %bcond_with faad %bcond_with fdk_aac Name: vlc -Version: 3.0.11.1 +Version: 3.0.12 Release: 0 Summary: Graphical media player License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -51,14 +51,10 @@ 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-2020-26664.patch CVE-2020-26664 dimstar@opensuse.org -- mkv: Ensure we don't use an EbmlDummy element for something it's not -Patch4: vlc-CVE-2020-26664.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 -- Use OpenCV C++ API Patch103: 0001-Port-OpenCV-facedetect-example-to-C-API.patch -# PATCH-FIX-UPSTREAM -- Fix building with Qt 5.15 by adding a missing include -Patch104: fix-missing-includes-with-qt-5.15.patch # Fix building against recent srt where SRTO_TSBPDDELAY is no longer defined Patch105: vlc-srto_tsbpddelay.patch BuildRequires: Mesa-devel @@ -402,12 +398,10 @@ OpenCV based video filters and a face detection example. %patch0 -p1 %patch1 -p1 %patch3 -p1 -%patch4 -p1 %if 0%{?suse_version} > 1320 && 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200 %patch100 -p1 %endif %patch103 -p1 -%patch104 -p1 %patch105 -p1 ### And LUA 5.3.1 has some more API changes @@ -779,6 +773,7 @@ dd if=/dev/zero bs=1M count=1 of=%{buildroot}/%{_libdir}/vlc/plugins/plugins.dat %if 0%{?suse_version} < 1330 && ( 0%{?sle_version} < 120200 || 0%{?is_opensuse} < 1 ) %{_libdir}/vlc/plugins/access/librdp_plugin.so %endif +%{_libdir}/vlc/plugins/access/librist_plugin.so %{_libdir}/vlc/plugins/access/librtp_plugin.so %{_libdir}/vlc/plugins/access/libsatip_plugin.so %{_libdir}/vlc/plugins/access/libsdp_plugin.so @@ -801,6 +796,7 @@ dd if=/dev/zero bs=1M count=1 of=%{buildroot}/%{_libdir}/vlc/plugins/plugins.dat %{_libdir}/vlc/plugins/access_output/libaccess_output_file_plugin.so %{_libdir}/vlc/plugins/access_output/libaccess_output_http_plugin.so %{_libdir}/vlc/plugins/access_output/libaccess_output_livehttp_plugin.so +%{_libdir}/vlc/plugins/access_output/libaccess_output_rist_plugin.so %{_libdir}/vlc/plugins/access_output/libaccess_output_shout_plugin.so %if 0%{?suse_version} > 1500 && 0%{?is_opensuse} %{_libdir}/vlc/plugins/access_output/libaccess_output_srt_plugin.so