From ef94bed19cf95faf1e169b45a3901ad7bef2ffc2 Mon Sep 17 00:00:00 2001 From: tigro Date: Thu, 19 Oct 2023 17:40:25 +0300 Subject: [PATCH] Sync with RPM Fusion --- .gitignore | 2 +- .vlc.metadata | 2 +- SPECS/vlc.spec | 49 ++++++++++++++++++++++++++++++++++--------------- 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 1ccd8ac..87586f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/vlc-3e48354.tar.gz +SOURCES/vlc-32b50de.tar.gz diff --git a/.vlc.metadata b/.vlc.metadata index 53fba29..e1008bd 100644 --- a/.vlc.metadata +++ b/.vlc.metadata @@ -1 +1 @@ -0557127740b267324a22a76bac1d03747f7e5102 SOURCES/vlc-3e48354.tar.gz +d50afc678ccf730afbdab2f1bcf6c6e3cc313167 SOURCES/vlc-32b50de.tar.gz diff --git a/SPECS/vlc.spec b/SPECS/vlc.spec index e1c606c..b24f08d 100644 --- a/SPECS/vlc.spec +++ b/SPECS/vlc.spec @@ -1,4 +1,4 @@ -%global commit0 3e483547037e49f8ef828f2f0455593400968cf4 +%global commit0 32b50de2a28418ca9e843e91383dd09b4cd1c529 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) #global vlc_rc -rc2 %global vlc_setup vlc-%{?commit0} @@ -6,26 +6,26 @@ %global _with_bootstrap 1 %if 0%{?!_without_freeworld:1} -%global _with_faad2 1 -%global _with_ffmpeg 1 -%global _with_libdca 1 %global _with_x264 1 %global _with_x265 1 -%global _with_xvidcore 1 %global _with_live555 1 -%global _with_vaapi 1 %endif %global _with_a52dec 1 +%global _with_aom 1 +%global _with_dav1d 1 +%global _with_faad2 1 +%global _with_ffmpeg 1 +%global _with_fluidsynth 1 +%global _with_freerdp 1 +%global _with_libdca 1 %global _with_libdvbpsi 1 %global _with_libmad 1 %global _with_libmpeg2 1 -%global _with_twolame 1 -%global _with_fluidsynth 1 %global _with_schroedinger 1 -%global _with_freerdp 1 -%global _with_dav1d 1 -%global _with_aom 1 +%global _with_twolame 1 +%global _with_vaapi 1 +%global _with_xvidcore 1 %ifarch x86_64 ppc64le aarch64 %if ! (0%{?fedora} >= 37) %global _with_asdcp 1 @@ -59,7 +59,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.19 -Release: 0.3%{?dist}.1 +Release: 1%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -93,6 +93,8 @@ BuildRequires: cdparanoia-devel %{?_with_dav1d:BuildRequires: libdav1d-devel} BuildRequires: pkgconfig(dbus-1) %{?_with_faad2:BuildRequires: faad2-devel} +# vlc-3 works with ffmpeg <= 4 for vaapi support +#https://code.videolan.org/videolan/vlc/-/issues/26772 %if 0%{?fedora} >= 36 || 0%{?rhel} >= 9 %{?_with_ffmpeg:BuildRequires: compat-ffmpeg4-devel} %else @@ -148,8 +150,9 @@ BuildRequires: libtiger-devel BuildRequires: libtiff-devel BuildRequires: pkgconfig(libidn) BuildRequires: pkgconfig(libjpeg) -# Not Yet in EL8 -%if 0%{?fedora} +# Not Yet in EL - libplacebo-6 incompatible +# https://code.videolan.org/videolan/vlc/-/merge_requests/3950 +%if 0%{?fedora} && 0%{?fedora} < 39 BuildRequires: pkgconfig(libplacebo) %endif BuildRequires: pkgconfig(libudev) @@ -600,9 +603,25 @@ fi || : %changelog -* Mon Jul 24 2023 Arkady L. Shane - 3.0.19-0.3R.1 +* Thu Oct 19 2023 Arkady L. Shane - 1:3.0.19-1 - Rebuilt for MSVSphere 9.2 +* Thu Oct 12 2023 Nicolas Chauvet - 1:3.0.19-1 +- Update to 3.0.19 + +* Sun Aug 06 2023 Leigh Scott - 1:3.0.19-0.7 +- rebuilt + +* Fri Jul 28 2023 Nicolas Chauvet - 1:3.0.19-0.6 +- Drop onevpl for now (see rfbz#6711) + +* Fri Jul 28 2023 Nicolas Chauvet - 1:3.0.19-0.5 +- Update snapshot +- Use onevpl for f38+ and el9+ + +* Tue Jun 13 2023 Nicolas Chauvet - 1:3.0.19-0.4 +- Update snapshot + * Mon Apr 10 2023 Leigh Scott - 1:3.0.19-0.3.1 - Rebuild for live555