From 3d972023df25ef41e2fbc3ae0cf7a43897569d55 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 5 May 2022 15:42:53 +0200 Subject: [PATCH 01/32] Drop deprecated libmp4v2 --- vlc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 5605b5a..bb603db 100644 --- a/vlc.spec +++ b/vlc.spec @@ -136,7 +136,6 @@ BuildRequires: libmatroska-devel >= 0.7.6 BuildRequires: libmfx-devel %endif BuildRequires: libmodplug-devel -BuildRequires: libmp4v2-devel BuildRequires: libmpcdec-devel BuildRequires: libmpg123-devel BuildRequires: libmtp-devel >= 1.0.0 From 9d482354cebb6a71cd46c8a72f30a7398c61c6be Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 5 May 2022 15:46:01 +0200 Subject: [PATCH 02/32] Drop unused libdv --- vlc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index bb603db..60c72fa 100644 --- a/vlc.spec +++ b/vlc.spec @@ -123,7 +123,6 @@ BuildRequires: pkgconfig(daaladec) BuildRequires: pkgconfig(daalaenc) BuildRequires: libdc1394-devel >= 2.1.0 %{?_with_libdca:BuildRequires: libdca-devel} -BuildRequires: libdv-devel %{?_with_libdvbpsi:BuildRequires: libdvbpsi-devel} BuildRequires: libdvdnav-devel BuildRequires: libebml-devel From 74419de838a8fcd8d1a6c49376d460ca04680c7d Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 5 May 2022 15:46:53 +0200 Subject: [PATCH 03/32] Drop unused libtar --- vlc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 60c72fa..7219d63 100644 --- a/vlc.spec +++ b/vlc.spec @@ -145,7 +145,6 @@ BuildRequires: libssh2-devel BuildRequires: libsysfs-devel BuildRequires: libshout-devel BuildRequires: libsmbclient-devel -BuildRequires: libtar-devel BuildRequires: libtheora-devel BuildRequires: libtiger-devel BuildRequires: libtiff-devel From ad0c8bd1c0cc5e51a3586a73bf55422362008f3e Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 5 May 2022 16:40:43 +0200 Subject: [PATCH 04/32] Reverse condition --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 7219d63..98df3b6 100644 --- a/vlc.spec +++ b/vlc.spec @@ -29,7 +29,7 @@ %global _with_asdcp 1 %endif -%if 0%{?fedora} || 0%{?el8} +%if ! 0%{?el7} %global _with_bluray 1 %global _with_wayland 1 %endif From f86d80f805e7efc4e6d7150cd3f695bb692e3637 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 5 May 2022 16:43:05 +0200 Subject: [PATCH 05/32] Drop libdc1394 for el9+ --- vlc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 98df3b6..2d6e8d5 100644 --- a/vlc.spec +++ b/vlc.spec @@ -29,6 +29,10 @@ %global _with_asdcp 1 %endif +%if 0%{?rhel} && 0%{?rhel} >= 9 +%global _without_libdc1394 1 +%endif + %if ! 0%{?el7} %global _with_bluray 1 %global _with_wayland 1 @@ -121,7 +125,7 @@ BuildRequires: pkgconfig(libchromaprint) %{?_with_crystalhd:BuildRequires: libcrystalhd-devel} BuildRequires: pkgconfig(daaladec) BuildRequires: pkgconfig(daalaenc) -BuildRequires: libdc1394-devel >= 2.1.0 +%{!?_without_libdc1394:BuildRequires: libdc1394-devel} %{?_with_libdca:BuildRequires: libdca-devel} %{?_with_libdvbpsi:BuildRequires: libdvbpsi-devel} BuildRequires: libdvdnav-devel From 9d2b8771cc1037d635fdb8e969a839598b408ee0 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 5 May 2022 19:34:51 +0200 Subject: [PATCH 06/32] Drop unused minizip --- vlc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 2d6e8d5..28b8379 100644 --- a/vlc.spec +++ b/vlc.spec @@ -180,7 +180,6 @@ BuildRequires: lua5.1-devel, lua5.1 %else BuildRequires: lua-devel %endif -BuildRequires: minizip-devel %{?_with_libmpeg2:BuildRequires: libmpeg2-devel >= 0.3.2} BuildRequires: ncurses-devel %{?_with_opencv:BuildRequires: pkgconfig(opencv)} From b835a2257028606c01f0a9c8c68414108d8cf708 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 15 May 2022 16:00:15 +0200 Subject: [PATCH 07/32] Update to 3.0.17.4 --- vlc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 28b8379..89f5c0a 100644 --- a/vlc.spec +++ b/vlc.spec @@ -54,7 +54,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc -Version: 3.0.17.2 +Version: 3.0.17.4 Release: 1%{?dist} License: GPLv2+ URL: https://www.videolan.org @@ -620,6 +620,9 @@ fi || : %changelog +* Sun May 15 2022 Nicolas Chauvet - 1:3.0.17.4-1 +- Update to 3.0.17.4 + * Thu Mar 10 2022 Leigh Scott - 1:3.0.17.2-1 - Update to 3.0.17.2 (rfbz#6241) From ccc8619ace27cfd3a92d32c0b9c2d41f31a7341d Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 15 May 2022 16:30:47 +0200 Subject: [PATCH 08/32] Condition lirc --- vlc.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 89f5c0a..5775c7d 100644 --- a/vlc.spec +++ b/vlc.spec @@ -39,6 +39,7 @@ %endif %if 0%{?fedora} +%global _with_lirc 1 %ifarch x86_64 i686 %global _with_crystalhd 1 %endif @@ -168,7 +169,7 @@ BuildRequires: pkgconfig(vdpau) BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vpx) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: lirc-devel +%{?_with_lirc:BuildRequires: lirc-devel } %{?_with_live555:BuildRequires: live555-devel >= 0-0.33} BuildRequires: kernel-headers BuildRequires: pkgconfig(gl) From ca75b3efc0f3f2d96f766fbcac1ac183fd01bbe2 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 15 May 2022 16:31:39 +0200 Subject: [PATCH 09/32] Switch placebo fedora only for now --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 5775c7d..2bacd27 100644 --- a/vlc.spec +++ b/vlc.spec @@ -156,7 +156,7 @@ BuildRequires: libtiff-devel BuildRequires: pkgconfig(libidn) BuildRequires: pkgconfig(libjpeg) # Not Yet in EL8 -%if ! 0%{?el8} +%if 0%{?fedora} BuildRequires: pkgconfig(libplacebo) %endif BuildRequires: pkgconfig(libudev) From 6bcb482bf24fc1f09070927a94b65b283c54b728 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 11 May 2022 12:22:09 +0100 Subject: [PATCH 10/32] Use compat-ffmpeg4 for F36+ --- vlc.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/vlc.spec b/vlc.spec index 2bacd27..e88023d 100644 --- a/vlc.spec +++ b/vlc.spec @@ -104,7 +104,11 @@ BuildRequires: cdparanoia-devel %{?_with_dav1d:BuildRequires: libdav1d-devel} BuildRequires: pkgconfig(dbus-1) %{?_with_faad2:BuildRequires: faad2-devel} +%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9 +%{?_with_ffmpeg:BuildRequires: compat-ffmpeg4-devel} +%else %{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0} +%endif BuildRequires: flac-devel %{?_with_fluidsynth:BuildRequires: fluidsynth-devel} BuildRequires: fribidi-devel @@ -371,14 +375,18 @@ touch src/revision.txt . /opt/rh/devtoolset-%{dts_ver}/enable %endif +%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9 +export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg4/pkgconfig +%endif + %configure \ --disable-dependency-tracking \ --disable-optimizations \ --disable-silent-rules \ - --with-default-font=%{_fontbasedir}/dejavu/DejaVuSans.ttf \ - --with-default-font-family=DejaVuSans \ - --with-default-monospace-font=%{_fontbasedir}/dejavu/DejaVuSansMono.ttf \ - --with-default-monospace-font-family=DejaVuSansMono \ + --with-default-font=%{_fontbasedir}/dejavu/DejaVuSans.ttf \ + --with-default-font-family=DejaVuSans \ + --with-default-monospace-font=%{_fontbasedir}/dejavu/DejaVuSansMono.ttf \ + --with-default-monospace-font-family=DejaVuSansMono \ --with-kde-solid=no \ --with-pic \ --disable-rpath \ From c91e4966081770a33d17d5322d214b0b42befa16 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 31 May 2022 10:16:20 +0200 Subject: [PATCH 11/32] Fixup for el9 --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index e88023d..42da8c6 100644 --- a/vlc.spec +++ b/vlc.spec @@ -180,7 +180,7 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) BuildRequires: libsamplerate-devel BuildRequires: libshout-devel -%if 0%{?fedora} || 0%{?el8} +%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: lua5.1-devel, lua5.1 %else BuildRequires: lua-devel From 4e43f3ea817dc9af93e4a693112240548a6fb7d7 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 31 May 2022 10:31:25 +0200 Subject: [PATCH 12/32] Fixup libcaca --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 42da8c6..26bcf6e 100644 --- a/vlc.spec +++ b/vlc.spec @@ -358,7 +358,7 @@ sed -i -e 's/luac/luac-5.1/g' configure.ac %patch12 -p1 %endif %patch13 -p1 -%if 0%{?fedora} > 35 +%if 0%{?fedora} > 35 || 0%{?rhel} >= 9 %patch14 -p1 %endif From 80f8a6b399cad037e9c8a5ec0f558af065ae146c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 12 Jun 2022 12:48:21 +0100 Subject: [PATCH 13/32] Mass rebuild for x264-0.164 --- vlc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 26bcf6e..aa5f53b 100644 --- a/vlc.spec +++ b/vlc.spec @@ -56,7 +56,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.17.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://www.videolan.org %if 0%{?commit0:1} @@ -629,6 +629,9 @@ fi || : %changelog +* Sun Jun 12 2022 Sérgio Basto - 1:3.0.17.4-2 +- Mass rebuild for x264-0.164 + * Sun May 15 2022 Nicolas Chauvet - 1:3.0.17.4-1 - Update to 3.0.17.4 From e14b0540dc8d6ab3842dd8e964513168f2374db1 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 24 Jun 2022 09:50:19 +0200 Subject: [PATCH 14/32] Bump --- vlc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index aa5f53b..1e42634 100644 --- a/vlc.spec +++ b/vlc.spec @@ -56,7 +56,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.17.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://www.videolan.org %if 0%{?commit0:1} @@ -629,6 +629,9 @@ fi || : %changelog +* Fri Jun 24 2022 Nicolas Chauvet - 1:3.0.17.4-3 +- Rebuilt + * Sun Jun 12 2022 Sérgio Basto - 1:3.0.17.4-2 - Mass rebuild for x264-0.164 From f6ec72a913ec373b2cac5563130e08fc7262c248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Thu, 23 Jun 2022 15:11:03 +0200 Subject: [PATCH 15/32] Rebuilt for new AOM and dav1d --- vlc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 1e42634..798c773 100644 --- a/vlc.spec +++ b/vlc.spec @@ -56,7 +56,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.17.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://www.videolan.org %if 0%{?commit0:1} @@ -629,6 +629,9 @@ fi || : %changelog +* Thu Jun 24 2022 Robert-André Mauchin - 1:3.0.17.4-4 +- Rebuilt for new AOM and dav1d + * Fri Jun 24 2022 Nicolas Chauvet - 1:3.0.17.4-3 - Rebuilt From bac4125196c77d155937eaafc133a03c2797da5b Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 25 Jun 2022 00:42:16 +0100 Subject: [PATCH 16/32] fix --- fix-dav1d-1.0.patch | 149 ++++++++++++++++++++++++++++++++++++++++++++ vlc.spec | 8 ++- 2 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 fix-dav1d-1.0.patch diff --git a/fix-dav1d-1.0.patch b/fix-dav1d-1.0.patch new file mode 100644 index 0000000..47799bc --- /dev/null +++ b/fix-dav1d-1.0.patch @@ -0,0 +1,149 @@ +From 55b24abf7219a0c6a6560187496e41fd60638552 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Fri, 18 Mar 2022 11:42:49 +0100 +Subject: [PATCH 1/2] dav1d: fix compilation with (upcoming) dav1d 1.0 + +(cherry picked from commit dbf45cea2a8abdfbef897b8a71f3eb782bb1b712) (edited) +edited: +- 3.0 has the 128 pixels padding elsewhere +- 3.0 has an extra parameter for add_integer_with_range() +- 3.0 was setting i_extra_picture_buffers further down in the code +- 3.0 uses 16 threads max + +Signed-off-by: Steve Lhomme +--- + modules/codec/dav1d.c | 22 +++++++++++++++++++++- + 1 file changed, 21 insertions(+), 1 deletion(-) + +diff --git a/modules/codec/dav1d.c b/modules/codec/dav1d.c +index 039165f52e..cfabbc27cb 100644 +--- a/modules/codec/dav1d.c ++++ b/modules/codec/dav1d.c +@@ -63,10 +63,16 @@ vlc_module_begin () + set_category(CAT_INPUT) + set_subcategory(SUBCAT_INPUT_VCODEC) + ++#if DAV1D_API_VERSION_MAJOR >= 6 ++ add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_THREADS, ++ THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false) ++ add_obsolete_string("dav1d-thread-tiles") // unused with dav1d 1.0 ++#else + add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_FRAME_THREADS, + THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false) + add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS, + THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false) ++#endif + vlc_module_end () + + /***************************************************************************** +@@ -294,6 +300,11 @@ static int OpenDecoder(vlc_object_t *p_this) + return VLC_ENOMEM; + + dav1d_default_settings(&p_sys->s); ++#if DAV1D_API_VERSION_MAJOR >= 6 ++ p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-thread-frames"); ++ if (p_sys->s.n_threads == 0) ++ p_sys->s.n_threads = (i_core_count < 16) ? i_core_count : 16; ++#else + p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles"); + if (p_sys->s.n_tile_threads == 0) + p_sys->s.n_tile_threads = +@@ -303,6 +314,7 @@ static int OpenDecoder(vlc_object_t *p_this) + p_sys->s.n_frame_threads = var_InheritInteger(p_this, "dav1d-thread-frames"); + if (p_sys->s.n_frame_threads == 0) + p_sys->s.n_frame_threads = (i_core_count < 16) ? i_core_count : 16; ++#endif + p_sys->s.allocator.cookie = dec; + p_sys->s.allocator.alloc_picture_callback = NewPicture; + p_sys->s.allocator.release_picture_callback = FreePicture; +@@ -313,12 +325,20 @@ static int OpenDecoder(vlc_object_t *p_this) + return VLC_EGENERIC; + } + ++#if DAV1D_API_VERSION_MAJOR >= 6 ++ msg_Dbg(p_this, "Using dav1d version %s with %d threads", ++ dav1d_version(), p_sys->s.n_threads); ++ ++ dec->i_extra_picture_buffers = (p_sys->s.n_threads - 1); ++#else + msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads", + dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads); + ++ dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1); ++#endif ++ + dec->pf_decode = Decode; + dec->pf_flush = FlushDecoder; +- dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1); + + dec->fmt_out.video.i_width = dec->fmt_in.video.i_width; + dec->fmt_out.video.i_height = dec->fmt_in.video.i_height; +-- +2.36.1 + + +From c95e5288ab2d222346b19552a462afe5159d1122 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Mon, 21 Mar 2022 15:53:52 +0100 +Subject: [PATCH 2/2] dav1d: limit the number of extra frames needed by the + decoder + +The i_extra_picture_buffers is used to add pictures to the pool that the core +will allocate. dav1d is actually using n_threads frames. And the core is +allocating 10 frames per default for AV1. So we need to add the missing ones. + +(cherry picked from commit a32031dc0f5f32083fc54a21397bce732742ccbe) (rebased) +rebased: +- the code dav1d 1.0.0 in 3.0 uses different max versions + +Signed-off-by: Steve Lhomme +--- + modules/codec/dav1d.c | 25 +++++++++++++++++++++++-- + 1 file changed, 23 insertions(+), 2 deletions(-) + +diff --git a/modules/codec/dav1d.c b/modules/codec/dav1d.c +index cfabbc27cb..8a439ce4ff 100644 +--- a/modules/codec/dav1d.c ++++ b/modules/codec/dav1d.c +@@ -304,7 +304,28 @@ static int OpenDecoder(vlc_object_t *p_this) + p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-thread-frames"); + if (p_sys->s.n_threads == 0) + p_sys->s.n_threads = (i_core_count < 16) ? i_core_count : 16; +-#else ++ ++#if DAV1D_API_VERSION_MAJOR > 6 || DAV1D_API_VERSION_MINOR >= 7 ++ // after dav1d 1.0.0 ++ p_sys->s.max_frame_delay = dav1d_get_frame_delay( &p_sys->s ); ++#else // 1.0.0 ++ // corresponds to c->n_fc when max_frame_delay is 0 in dav1d 1.0.0 ++ static const uint8_t fc_lut[49] = { ++ 1, /* 1 */ ++ 2, 2, 2, /* 2- 4 */ ++ 3, 3, 3, 3, 3, /* 5- 9 */ ++ 4, 4, 4, 4, 4, 4, 4, /* 10-16 */ ++ 5, 5, 5, 5, 5, 5, 5, 5, 5, /* 17-25 */ ++ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, /* 26-36 */ ++ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, /* 37-49 */ ++ }; ++ if (p_sys->s.n_threads >= 50) ++ p_sys->s.max_frame_delay = 8; ++ else ++ p_sys->s.max_frame_delay = fc_lut[p_sys->s.n_threads - 1]; ++#endif ++ ++#else // before dav1d 1.0.0 + p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles"); + if (p_sys->s.n_tile_threads == 0) + p_sys->s.n_tile_threads = +@@ -329,7 +350,7 @@ static int OpenDecoder(vlc_object_t *p_this) + msg_Dbg(p_this, "Using dav1d version %s with %d threads", + dav1d_version(), p_sys->s.n_threads); + +- dec->i_extra_picture_buffers = (p_sys->s.n_threads - 1); ++ dec->i_extra_picture_buffers = p_sys->s.max_frame_delay; + #else + msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads", + dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads); +-- +2.36.1 + diff --git a/vlc.spec b/vlc.spec index 798c773..6b4fb61 100644 --- a/vlc.spec +++ b/vlc.spec @@ -81,6 +81,9 @@ Patch12: 0001-Revert-access-libdvdread-6.1.2-supports-UTF-8-paths-.patch Patch13: 0001-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch # https://code.videolan.org/videolan/vlc/-/merge_requests/889 Patch14: Remove_legacy_caca.patch +# https://code.videolan.org/videolan/vlc/-/commit/2202c892c8dc1381b596c53c2ebd3ca680061f95 +# https://code.videolan.org/videolan/vlc/-/commit/d38ddd7270ffaea705981b6a48086778850d3c96 +Patch15: fix-dav1d-1.0.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -361,6 +364,9 @@ sed -i -e 's/luac/luac-5.1/g' configure.ac %if 0%{?fedora} > 35 || 0%{?rhel} >= 9 %patch14 -p1 %endif +%if 0%{?fedora} > 36 +%patch15 -p1 +%endif %{?_with_bootstrap: rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || : @@ -629,7 +635,7 @@ fi || : %changelog -* Thu Jun 24 2022 Robert-André Mauchin - 1:3.0.17.4-4 +* Fri Jun 24 2022 Robert-André Mauchin - 1:3.0.17.4-4 - Rebuilt for new AOM and dav1d * Fri Jun 24 2022 Nicolas Chauvet - 1:3.0.17.4-3 From 499b02be52ce33dcce014ba5e924d6062f6b8363 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 5 Jul 2022 09:06:47 +0200 Subject: [PATCH 17/32] Rebuilt --- vlc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 6b4fb61..6e31384 100644 --- a/vlc.spec +++ b/vlc.spec @@ -56,7 +56,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.17.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://www.videolan.org %if 0%{?commit0:1} @@ -635,6 +635,9 @@ fi || : %changelog +* Tue Jul 05 2022 Nicolas Chauvet - 1:3.0.17.4-5 +- rebuilt + * Fri Jun 24 2022 Robert-André Mauchin - 1:3.0.17.4-4 - Rebuilt for new AOM and dav1d From e324a74469c969b4c8cbea87bc6340b46cc3b17f Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 15 Jul 2022 15:07:49 +0100 Subject: [PATCH 18/32] rebuilt --- sources | 2 +- vlc.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index bee4498..66bbbca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vlc-c4ab31d.tar.gz) = 1d3f5b61c6aa7b9f3f62badc153143c0ec4b86fbe0b807edc3101d951bc4b4c615dacc734eeb3376b9ff9e7a8299e2d11ca463ddcceadaa1cf9d5ea1b015eb76 +SHA512 (vlc-c650ce1.tar.gz) = 2cec2cd378f2101fa267a2f1eb47ec7d641a38ebb7163d57830ee82c6f02030e401e9abe45860d1b82cdd25a6dba7f586e142209a8979712f988e6c2f576c050 diff --git a/vlc.spec b/vlc.spec index 6e31384..2c97aba 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,4 +1,4 @@ -%global commit0 c4ab31d5f0d5d0ba298706241d5b67ae49215935 +%global commit0 c650ce1a4e352cc04192229a8878b8b6c312527d %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) #global vlc_rc -rc9 @@ -56,7 +56,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.17.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: https://www.videolan.org %if 0%{?commit0:1} @@ -635,6 +635,9 @@ fi || : %changelog +* Fri Jul 15 2022 Leigh Scott - 1:3.0.17.4-6 +- rebuilt + * Tue Jul 05 2022 Nicolas Chauvet - 1:3.0.17.4-5 - rebuilt From 2b817a02a020a77d974a0bf5ae879fdf29c6d656 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 23 Jul 2022 00:00:57 +0100 Subject: [PATCH 19/32] Rebuild for new ffmpeg --- vlc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 2c97aba..cadaeb5 100644 --- a/vlc.spec +++ b/vlc.spec @@ -56,7 +56,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.17.4 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: https://www.videolan.org %if 0%{?commit0:1} @@ -635,6 +635,9 @@ fi || : %changelog +* Fri Jul 22 2022 Leigh Scott - 1:3.0.17.4-7 +- Rebuild for new ffmpeg + * Fri Jul 15 2022 Leigh Scott - 1:3.0.17.4-6 - rebuilt From 254f1499e33f966008473f873cbf3f443a5b7dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 8 Aug 2022 03:02:53 +0100 Subject: [PATCH 20/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sérgio M. Basto --- vlc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index cadaeb5..3c03661 100644 --- a/vlc.spec +++ b/vlc.spec @@ -56,7 +56,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.17.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ URL: https://www.videolan.org %if 0%{?commit0:1} @@ -635,6 +635,10 @@ fi || : %changelog +* Mon Aug 08 2022 RPM Fusion Release Engineering - 1:3.0.17.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg + 5.1 + * Fri Jul 22 2022 Leigh Scott - 1:3.0.17.4-7 - Rebuild for new ffmpeg From 294ec1a54a0941f0e269297c4924bd9088d46052 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 29 Aug 2022 14:06:25 +0200 Subject: [PATCH 21/32] Update to 3.0.18-rc --- vlc.spec | 47 ++++++++++------------------------------------- 1 file changed, 10 insertions(+), 37 deletions(-) diff --git a/vlc.spec b/vlc.spec index 3c03661..0943ad4 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,6 +1,7 @@ -%global commit0 c650ce1a4e352cc04192229a8878b8b6c312527d +%global commit0 675232e5932e5f205f03a485f1b56c7ae4f1ca6d %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -#global vlc_rc -rc9 +%global vlc_rc -rc +%global vlc_setup vlc-%{?commit0} %global _with_bootstrap 1 @@ -55,19 +56,11 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc -Version: 3.0.17.4 -Release: 8%{?dist} +Version: 3.0.18 +Release: 0.1.rc%{?dist} License: GPLv2+ URL: https://www.videolan.org -%if 0%{?commit0:1} Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz -%global vlc_setup vlc-%{?commit0} -%else -Source0: https://download.videolan.org/pub/videolan/%{?vlc_rc:testing/}vlc/%{version}%{?vlc_rc}/vlc-%{version}%{?vlc_rc}.tar.xz -%global vlc_setup vlc-%{version}%{?vlc_rc} -%endif -Patch0: https://github.com/RPi-Distro/vlc/raw/buster-rpt/debian/patches/mmal_20.patch -Patch1: https://github.com/RPi-Distro/vlc/raw/buster-rpt/debian/patches/mmal_chain.patch Patch3: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch Patch5: Lower-libgcrypt-to-1.5.3.patch Patch6: Restore-support-for-thread-callbacks-for-older-gcryp.patch @@ -76,14 +69,6 @@ Patch7: Switch-to-Fedora-lua-5.1.patch # Backport for 3.0 notifyd without gtk3 Patch9: notify-don-t-depend-on-any-GTK-version.patch -Patch12: 0001-Revert-access-libdvdread-6.1.2-supports-UTF-8-paths-.patch -# https://code.videolan.org/videolan/vlc/-/issues/25473#note_256576 -Patch13: 0001-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch -# https://code.videolan.org/videolan/vlc/-/merge_requests/889 -Patch14: Remove_legacy_caca.patch -# https://code.videolan.org/videolan/vlc/-/commit/2202c892c8dc1381b596c53c2ebd3ca680061f95 -# https://code.videolan.org/videolan/vlc/-/commit/d38ddd7270ffaea705981b6a48086778850d3c96 -Patch15: fix-dav1d-1.0.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -314,10 +299,6 @@ Summary: VLC media player core Provides: vlc-nox = %{epoch}:%{version}-%{release} %{?live555_version:Requires: live555%{?_isa} = %{live555_version}} %{?lua_version:Requires: lua(abi) = %{lua_version}} -Requires: libmicrodns%{?_isa} > 0.1.2-1 -%if 0%{?fc31} -Requires: srt-libs%{?_isa} > 1.4.1-3 -%endif %description core VLC media player core components @@ -336,9 +317,6 @@ VLC media player extras modules. %prep %setup -q -n %{vlc_setup} -%{?_with_rpi: -%patch0 -p1 -} %patch3 -p1 %if 0%{?el7} %patch5 -p1 @@ -357,16 +335,6 @@ sed -i -e 's/luac/luac-5.1/g' configure.ac %endif %patch9 -p1 -%if 0%{?rhel} >= 7 -%patch12 -p1 -%endif -%patch13 -p1 -%if 0%{?fedora} > 35 || 0%{?rhel} >= 9 -%patch14 -p1 -%endif -%if 0%{?fedora} > 36 -%patch15 -p1 -%endif %{?_with_bootstrap: rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || : @@ -635,6 +603,11 @@ fi || : %changelog +* Mon Aug 29 2022 Nicolas Chauvet - 1:3.0.18-0.1.rc +- Update to 3.0.18-rc +- Drop mmal downstream (rpi) patches +- Drop merged patches + * Mon Aug 08 2022 RPM Fusion Release Engineering - 1:3.0.17.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 From 09bb15e224910df117e39c93b7aaf0f51e5adf56 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 29 Aug 2022 14:07:10 +0200 Subject: [PATCH 22/32] Update sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 66bbbca..71050e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vlc-c650ce1.tar.gz) = 2cec2cd378f2101fa267a2f1eb47ec7d641a38ebb7163d57830ee82c6f02030e401e9abe45860d1b82cdd25a6dba7f586e142209a8979712f988e6c2f576c050 +SHA512 (vlc-675232e.tar.gz) = be7a4ac945f19c68609ed3a2b5b6e69dfaca03deabbc9ee898223f64c22d71823b3bfc30959c36199fec5dc2f2a1d49684a6d8b38e19c1b7d5b2e1bd9796072e From ba01a0a2d3cd3f2c1a0b909b3222fc42d1551e21 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 4 Sep 2022 11:33:06 +0100 Subject: [PATCH 23/32] Add requires ffmpeg-libs --- vlc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 0943ad4..d47cf8b 100644 --- a/vlc.spec +++ b/vlc.spec @@ -57,7 +57,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.18 -Release: 0.1.rc%{?dist} +Release: 0.2.rc%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -299,6 +299,7 @@ Summary: VLC media player core Provides: vlc-nox = %{epoch}:%{version}-%{release} %{?live555_version:Requires: live555%{?_isa} = %{live555_version}} %{?lua_version:Requires: lua(abi) = %{lua_version}} +Requires: ffmpeg-libs%{?_isa} %description core VLC media player core components @@ -603,6 +604,9 @@ fi || : %changelog +* Sun Sep 04 2022 Leigh Scott - 1:3.0.18-0.2.rc +- Add requires ffmpeg-libs + * Mon Aug 29 2022 Nicolas Chauvet - 1:3.0.18-0.1.rc - Update to 3.0.18-rc - Drop mmal downstream (rpi) patches From acb8dd7eb265d08cff45ef3d753f7fecda712c51 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 4 Sep 2022 13:40:37 +0100 Subject: [PATCH 24/32] Revert "Add requires ffmpeg-libs" This reverts commit ba01a0a2d3cd3f2c1a0b909b3222fc42d1551e21. --- vlc.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/vlc.spec b/vlc.spec index d47cf8b..0943ad4 100644 --- a/vlc.spec +++ b/vlc.spec @@ -57,7 +57,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.18 -Release: 0.2.rc%{?dist} +Release: 0.1.rc%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -299,7 +299,6 @@ Summary: VLC media player core Provides: vlc-nox = %{epoch}:%{version}-%{release} %{?live555_version:Requires: live555%{?_isa} = %{live555_version}} %{?lua_version:Requires: lua(abi) = %{lua_version}} -Requires: ffmpeg-libs%{?_isa} %description core VLC media player core components @@ -604,9 +603,6 @@ fi || : %changelog -* Sun Sep 04 2022 Leigh Scott - 1:3.0.18-0.2.rc -- Add requires ffmpeg-libs - * Mon Aug 29 2022 Nicolas Chauvet - 1:3.0.18-0.1.rc - Update to 3.0.18-rc - Drop mmal downstream (rpi) patches From 4e40ba64be04feaf74b05386d45fe125df95cc78 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 5 Sep 2022 06:19:03 +0100 Subject: [PATCH 25/32] Remove compat-ffmpeg4 export --- vlc.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vlc.spec b/vlc.spec index 0943ad4..10df5ed 100644 --- a/vlc.spec +++ b/vlc.spec @@ -349,10 +349,6 @@ touch src/revision.txt . /opt/rh/devtoolset-%{dts_ver}/enable %endif -%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9 -export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg4/pkgconfig -%endif - %configure \ --disable-dependency-tracking \ --disable-optimizations \ From d4b1b493283310ae10440d20a6976f2e9a718aba Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 26 Sep 2022 15:35:29 +0100 Subject: [PATCH 26/32] Rebuild for new flac --- vlc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 10df5ed..bf59e89 100644 --- a/vlc.spec +++ b/vlc.spec @@ -57,7 +57,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.18 -Release: 0.1.rc%{?dist} +Release: 0.2.rc%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -599,6 +599,9 @@ fi || : %changelog +* Mon Sep 26 2022 Leigh Scott - 1:3.0.18-0.2.rc +- Rebuild for new flac + * Mon Aug 29 2022 Nicolas Chauvet - 1:3.0.18-0.1.rc - Update to 3.0.18-rc - Drop mmal downstream (rpi) patches From de726dfdcb02fa8ca4fdc26d1d2851d33219bd88 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 27 Sep 2022 13:18:20 +0200 Subject: [PATCH 27/32] Workaround breaking api with dcp --- vlc.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vlc.spec b/vlc.spec index bf59e89..2bc29cc 100644 --- a/vlc.spec +++ b/vlc.spec @@ -27,8 +27,10 @@ %global _with_dav1d 1 %global _with_aom 1 %ifarch x86_64 ppc64le aarch64 +%if ! 0%{?fedora} >= 37 %global _with_asdcp 1 %endif +%endif %if 0%{?rhel} && 0%{?rhel} >= 9 %global _without_libdc1394 1 From c7d23fa52f735149fed59f76cba23d276a0ec1a0 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 27 Sep 2022 17:54:57 +0200 Subject: [PATCH 28/32] fixup --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 2bc29cc..bb58e54 100644 --- a/vlc.spec +++ b/vlc.spec @@ -27,7 +27,7 @@ %global _with_dav1d 1 %global _with_aom 1 %ifarch x86_64 ppc64le aarch64 -%if ! 0%{?fedora} >= 37 +%if ! (0%{?fedora} >= 37) %global _with_asdcp 1 %endif %endif From 2a99c9d36d7d2acac337a717bd3ff7d0bf0e520f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 30 Sep 2022 12:51:36 +0200 Subject: [PATCH 29/32] Update to vlc-3.0.18-rc2 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 71050e4..8ddacb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vlc-675232e.tar.gz) = be7a4ac945f19c68609ed3a2b5b6e69dfaca03deabbc9ee898223f64c22d71823b3bfc30959c36199fec5dc2f2a1d49684a6d8b38e19c1b7d5b2e1bd9796072e +SHA512 (vlc-ed93768.tar.gz) = cc97a4e2f81f0eda09a726b22228ec7cc11a186a69eed139da16c2137bd8dfa358d65b6773027f4c016d9b0f517272ffb1840a6754240af65a8a3b791e70c963 From c312188f23528b826b137551ff442b5d898a5edd Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 30 Sep 2022 12:52:34 +0200 Subject: [PATCH 30/32] Update spec --- vlc.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vlc.spec b/vlc.spec index bb58e54..bfd8563 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,6 +1,6 @@ -%global commit0 675232e5932e5f205f03a485f1b56c7ae4f1ca6d +%global commit0 ed93768cedee7dae31a5b44d57a38d59da4dd1cf %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global vlc_rc -rc +%global vlc_rc -rc2 %global vlc_setup vlc-%{?commit0} %global _with_bootstrap 1 @@ -59,7 +59,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.18 -Release: 0.2.rc%{?dist} +Release: 0.3.rc%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -601,6 +601,9 @@ fi || : %changelog +* Fri Sep 30 2022 Nicolas Chauvet - 1:3.0.18-0.3.rc +- Update to 3.0.18-rc2 + * Mon Sep 26 2022 Leigh Scott - 1:3.0.18-0.2.rc - Rebuild for new flac From 0dfa3c8b4713cbe7b9aebbc3f1691ecbb7309ae4 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 30 Sep 2022 20:35:03 +0200 Subject: [PATCH 31/32] fixup rc2 --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index bfd8563..f3093e2 100644 --- a/vlc.spec +++ b/vlc.spec @@ -59,7 +59,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.18 -Release: 0.3.rc%{?dist} +Release: 0.3.rc2%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz From ca4689ca8ca579e04d6a4ccf42d617b247c8ea62 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 16 Oct 2022 16:35:34 +0200 Subject: [PATCH 32/32] Update to 3.0.18 --- sources | 2 +- vlc.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 8ddacb4..111f80b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vlc-ed93768.tar.gz) = cc97a4e2f81f0eda09a726b22228ec7cc11a186a69eed139da16c2137bd8dfa358d65b6773027f4c016d9b0f517272ffb1840a6754240af65a8a3b791e70c963 +SHA512 (vlc-e9eceae.tar.gz) = 164e9e96954415ed25b5b0256e50f588a6853223a859805609ba7a4ce2ab0f1cc0966926182e7fe74a1a6d7b63deacbe3aaf67316b41c33b024999fb45b5902e diff --git a/vlc.spec b/vlc.spec index f3093e2..e782f9e 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,6 +1,6 @@ -%global commit0 ed93768cedee7dae31a5b44d57a38d59da4dd1cf +%global commit0 e9eceaed4d838dbd84638bfb2e4bdd08294163b1 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global vlc_rc -rc2 +#global vlc_rc -rc2 %global vlc_setup vlc-%{?commit0} %global _with_bootstrap 1 @@ -59,7 +59,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.18 -Release: 0.3.rc2%{?dist} +Release: 1%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -601,6 +601,9 @@ fi || : %changelog +* Sun Oct 16 2022 Nicolas Chauvet - 1:3.0.18-1 +- Update to 3.0.18 + * Fri Sep 30 2022 Nicolas Chauvet - 1:3.0.18-0.3.rc - Update to 3.0.18-rc2