up to 3.0.7

- libssh2/livpx patches no longer necessary

diff --git a/libssh2.patch b/libssh2.patch
deleted file mode 100644 (file)
index 8238c7b..0000000
--- a/libssh2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 11449b5cd8b415768e010d9b7c1d6ba3cea21f82
-Author: Rémi Denis-Courmont <remi@remlab.net>
-Date:   Wed Mar 20 05:20:30 2019 +0200
-
-    sftp: fix version for ECDSA known hosts (fixes #22060)
-    
-    1.8.x is a stable branch, separate from the feature branch that contains
-    the ECDSA support.
-
-diff --git a/modules/access/sftp.c b/modules/access/sftp.c
-index e420b91ca9..dc7f6cc27f 100644
---- a/modules/access/sftp.c
-+++ b/modules/access/sftp.c
-@@ -307,7 +307,7 @@ static int Open( vlc_object_t* p_this )
-         case LIBSSH2_HOSTKEY_TYPE_DSS:
-             knownhost_fingerprint_algo = LIBSSH2_KNOWNHOST_KEY_SSHDSS;
-             break;
--#if LIBSSH2_VERSION_NUM >= 0x010801
-+#if LIBSSH2_VERSION_NUM >= 0x010900
-         case LIBSSH2_HOSTKEY_TYPE_ECDSA_256:
-             knownhost_fingerprint_algo = LIBSSH2_KNOWNHOST_KEY_ECDSA_256;
-             break;

diff --git a/vlc-libvpx-1.8.patch b/vlc-libvpx-1.8.patch
deleted file mode 100644 (file)
index 3148595..0000000
--- a/vlc-libvpx-1.8.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5575fe3eb3fd46bada8662268b74d03493476a84 Mon Sep 17 00:00:00 2001
-From: Danny Milosavljevic <dannym@scratchpost.org>
-Date: Mon, 11 Feb 2019 16:07:12 +0100
-Subject: [PATCH] codec: vpx: Detect libvpx 1.8.0 and, if detected, use fewer
- frame formats in the chroma_table
-
-Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
----
- modules/codec/vpx.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules/codec/vpx.c b/modules/codec/vpx.c
-index f03c7fae62..59b3acdef7 100644
---- a/modules/codec/vpx.c
-+++ b/modules/codec/vpx.c
-@@ -117,6 +117,7 @@ static const struct
-     { VLC_CODEC_I440, VPX_IMG_FMT_I440, 8, 0 },
- 
-     { VLC_CODEC_YV12, VPX_IMG_FMT_YV12, 8, 0 },
-+#if VPX_IMAGE_ABI_VERSION < 5
-     { VLC_CODEC_YUVA, VPX_IMG_FMT_444A, 8, 0 },
-     { VLC_CODEC_YUYV, VPX_IMG_FMT_YUY2, 8, 0 },
-     { VLC_CODEC_UYVY, VPX_IMG_FMT_UYVY, 8, 0 },
-@@ -129,7 +130,7 @@ static const struct
- 
-     { VLC_CODEC_ARGB, VPX_IMG_FMT_ARGB, 8, 0 },
-     { VLC_CODEC_BGRA, VPX_IMG_FMT_ARGB_LE, 8, 0 },
--
-+#endif
-     { VLC_CODEC_GBR_PLANAR, VPX_IMG_FMT_I444, 8, 1 },
-     { VLC_CODEC_GBR_PLANAR_10L, VPX_IMG_FMT_I44416, 10, 1 },
- 
--- 
-2.18.1
-

diff --git a/vlc.spec b/vlc.spec
index c3dc68964a59929ae3cb25810631655435cc4d1f..2a0eb87d6e4f29421c385f1ba0ad5a66bc67b5d7 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -63,19 +63,17 @@
 Summary:       VLC - a multimedia player and stream server
 Summary(pl.UTF-8):     VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:          vlc
-Version:       3.0.6
-Release:       4
+Version:       3.0.7
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 4ff71d262e070fd19f86a1c3542c7b4e
+# Source0-md5: 230932ec40185856af28f82ec2e38b8a
 Patch0:                %{name}-buildflags.patch
 Patch1:                %{name}-tremor.patch
 Patch2:                %{name}-mpc.patch
 Patch3:                xmas-sucks.patch
 Patch4:                no-cache.patch
-Patch5:                %{name}-libvpx-1.8.patch
-Patch6:                libssh2.patch
 URL:           http://www.videolan.org/vlc/
 # 1.0 for X11 or GLESv1, 1.1 for GLESv2
 BuildRequires: EGL-devel >= %{?with_glesv2:1.1}%{!?with_glesv2:1.0}
@@ -356,8 +354,6 @@ Akcje klienta VLC dla Solid.
 %patch3 -p1
 %endif
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -468,8 +464,7 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -regex '.*\.l?a$' | xargs %{__rm}
 # ach (Acoli)
 # cgg (Chiga)
 # co (Corsican)
-# tet (Tetum)
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{ach,as_IN,cgg,co,ks_IN,tet}
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{ach,am_ET,as_IN,cgg,co,ks_IN,ku_IQ}
 
 # .ico is win32 only
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/vlc/vlc*.ico