From 672d261db49320044ecb608175325482b94ef889 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 6 Nov 2022 13:52:08 +0000 Subject: [PATCH 01/33] Rebuild for live555 --- vlc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index e782f9e..aca17a1 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: 1%{?dist} +Release: 2%{?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 Nov 06 2022 Leigh Scott - 1:3.0.18-2 +- Rebuild for live555 + * Sun Oct 16 2022 Nicolas Chauvet - 1:3.0.18-1 - Update to 3.0.18 From 4b4eace026319a3cb89a3d2a5e4ce3b2665ba572 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 23 Dec 2022 18:33:10 +0100 Subject: [PATCH 02/33] Update to current snapshot --- sources | 2 +- vlc.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 111f80b..1a95114 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vlc-e9eceae.tar.gz) = 164e9e96954415ed25b5b0256e50f588a6853223a859805609ba7a4ce2ab0f1cc0966926182e7fe74a1a6d7b63deacbe3aaf67316b41c33b024999fb45b5902e +SHA512 (vlc-6183d1e.tar.gz) = 50ead4f163337885c3bfb48a74869bb9d4ec6de9ebbeb97234ca6719c962422070ab88942e29f84cfc162eaad562e0b95aa735ed0ae9110bdbbd19ba8d1b2121 diff --git a/vlc.spec b/vlc.spec index aca17a1..f2c0219 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,4 +1,4 @@ -%global commit0 e9eceaed4d838dbd84638bfb2e4bdd08294163b1 +%global commit0 6183d1e1530e5fee926a4fbbae8fe8628a2bcd57 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) #global vlc_rc -rc2 %global vlc_setup vlc-%{?commit0} @@ -59,7 +59,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.18 -Release: 2%{?dist} +Release: 3%{?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 Dec 23 2022 Nicolas Chauvet - 1:3.0.18-3 +- Update to current snapshot + * Sun Nov 06 2022 Leigh Scott - 1:3.0.18-2 - Rebuild for live555 From 3eba6e6a71878536123f397d0b02f09e8a2d4263 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 23 Dec 2022 21:53:38 +0100 Subject: [PATCH 03/33] Disable placebo on f38 --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index f2c0219..844190a 100644 --- a/vlc.spec +++ b/vlc.spec @@ -150,7 +150,7 @@ BuildRequires: libtiff-devel BuildRequires: pkgconfig(libidn) BuildRequires: pkgconfig(libjpeg) # Not Yet in EL8 -%if 0%{?fedora} +%if 0%{?fedora} && 0%{?fedora} < 38 BuildRequires: pkgconfig(libplacebo) %endif BuildRequires: pkgconfig(libudev) From 9bcd7d402900183ddc5a1f64b244135ddb44be53 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 25 Dec 2022 17:33:53 +0100 Subject: [PATCH 04/33] Revert "Disable placebo on f38" This reverts commit 3eba6e6a71878536123f397d0b02f09e8a2d4263. --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 844190a..f2c0219 100644 --- a/vlc.spec +++ b/vlc.spec @@ -150,7 +150,7 @@ BuildRequires: libtiff-devel BuildRequires: pkgconfig(libidn) BuildRequires: pkgconfig(libjpeg) # Not Yet in EL8 -%if 0%{?fedora} && 0%{?fedora} < 38 +%if 0%{?fedora} BuildRequires: pkgconfig(libplacebo) %endif BuildRequires: pkgconfig(libudev) From f92d042ebbf5c35729312a10b84db082c262d0b0 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 25 Dec 2022 17:34:11 +0100 Subject: [PATCH 05/33] Add libplacebo-5.patch --- vlc-libplacebo-5.patch | 131 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 vlc-libplacebo-5.patch diff --git a/vlc-libplacebo-5.patch b/vlc-libplacebo-5.patch new file mode 100644 index 0000000..8da84e5 --- /dev/null +++ b/vlc-libplacebo-5.patch @@ -0,0 +1,131 @@ +From efbb1fdbc4420365b3ffd22e55dd27ad520037c7 Mon Sep 17 00:00:00 2001 +From: Niklas Haas +Date: Sat, 16 Jul 2022 14:41:13 +0200 +Subject: [PATCH] opengl: port to libplacebo v4 API + +These v3.x APIs will be removed in v5.x. Fortunately, the new APIs are a +near drop-in replacement, so the change was minimal. Only the error +handling was cleaned up slightly. +--- + modules/video_output/opengl/converter.h | 18 ++++++++++-------- + modules/video_output/opengl/fragment_shaders.c | 4 ++-- + modules/video_output/opengl/vout_helper.c | 14 +++++++------- + 3 files changed, 19 insertions(+), 17 deletions(-) + +diff --git a/modules/video_output/opengl/converter.h b/modules/video_output/opengl/converter.h +index 7000e1f38e..cb8e593a9a 100644 +--- a/modules/video_output/opengl/converter.h ++++ b/modules/video_output/opengl/converter.h +@@ -52,6 +52,11 @@ + # endif + #endif + ++#ifdef HAVE_LIBPLACEBO ++# include ++# include ++#endif ++ + #define VLCGL_PICTURE_MAX 128 + + #ifndef GL_TEXTURE_RECTANGLE +@@ -253,10 +258,6 @@ static inline bool HasExtension(const char *apis, const char *api) + return false; + } + +-struct pl_context; +-struct pl_shader; +-struct pl_shader_res; +- + /* + * Structure that is filled by "glhw converter" module probe function + * The implementation should initialize every members of the struct that are +@@ -272,8 +273,12 @@ struct opengl_tex_converter_t + /* Pointer to object gl, set by the caller */ + vlc_gl_t *gl; + ++#ifdef HAVE_LIBPLACEBO + /* libplacebo context, created by the caller (optional) */ +- struct pl_context *pl_ctx; ++ pl_log pl_log; ++ pl_shader pl_sh; ++ const struct pl_shader_res *pl_sh_res; ++#endif + + /* Function pointers to OpenGL functions, set by the caller */ + const opengl_vtable_t *vt; +@@ -337,9 +342,6 @@ struct opengl_tex_converter_t + bool yuv_color; + GLfloat yuv_coefficients[16]; + +- struct pl_shader *pl_sh; +- const struct pl_shader_res *pl_sh_res; +- + /* Private context */ + void *priv; + +diff --git a/modules/video_output/opengl/fragment_shaders.c b/modules/video_output/opengl/fragment_shaders.c +index 2246e33afd..16380335cc 100644 +--- a/modules/video_output/opengl/fragment_shaders.c ++++ b/modules/video_output/opengl/fragment_shaders.c +@@ -611,7 +611,7 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target, + + #ifdef HAVE_LIBPLACEBO + if (tc->pl_sh) { +- struct pl_shader *sh = tc->pl_sh; ++ pl_shader sh = tc->pl_sh; + struct pl_color_map_params color_params = pl_color_map_default_params; + color_params.intent = var_InheritInteger(tc->gl, "rendering-intent"); + color_params.tone_mapping_algo = var_InheritInteger(tc->gl, "tone-mapping"); +@@ -634,7 +634,7 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target, + pl_color_space_from_video_format(&tc->fmt), + dst_space, NULL, false); + +- struct pl_shader_obj *dither_state = NULL; ++ pl_shader_obj dither_state = NULL; + int method = var_InheritInteger(tc->gl, "dither-algo"); + if (method >= 0) { + +diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c +index 13d65e04c8..e971f5170b 100644 +--- a/modules/video_output/opengl/vout_helper.c ++++ b/modules/video_output/opengl/vout_helper.c +@@ -570,8 +570,8 @@ opengl_deinit_program(vout_display_opengl_t *vgl, struct prgm *prgm) + + #ifdef HAVE_LIBPLACEBO + FREENULL(tc->uloc.pl_vars); +- if (tc->pl_ctx) +- pl_context_destroy(&tc->pl_ctx); ++ pl_shader_free(&tc->pl_sh); ++ pl_log_destroy(&tc->pl_log); + #endif + + vlc_object_release(tc); +@@ -622,21 +622,21 @@ opengl_init_program(vout_display_opengl_t *vgl, struct prgm *prgm, + // create the main libplacebo context + if (!subpics) + { +- tc->pl_ctx = pl_context_create(PL_API_VER, &(struct pl_context_params) { ++ tc->pl_log = pl_log_create(PL_API_VER, &(struct pl_log_params) { + .log_cb = log_cb, + .log_priv = tc, + .log_level = PL_LOG_INFO, + }); +- if (tc->pl_ctx) { ++ if (tc->pl_log) { + # if PL_API_VER >= 20 +- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, &(struct pl_shader_params) { ++ tc->pl_sh = pl_shader_alloc(tc->pl_log, &(struct pl_shader_params) { + .glsl.version = tc->glsl_version, + .glsl.gles = tc->is_gles, + }); + # elif PL_API_VER >= 6 +- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0); ++ tc->pl_sh = pl_shader_alloc(tc->pl_log, NULL, 0); + # else +- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0, 0); ++ tc->pl_sh = pl_shader_alloc(tc->pl_log, NULL, 0, 0); + # endif + } + } +-- +2.38.1 From d86100c98bd3fef259bcfc2ff3a3d83344a3a951 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 25 Dec 2022 17:35:14 +0100 Subject: [PATCH 06/33] Apply patch --- vlc.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index f2c0219..bf5a718 100644 --- a/vlc.spec +++ b/vlc.spec @@ -68,7 +68,8 @@ Patch5: Lower-libgcrypt-to-1.5.3.patch Patch6: Restore-support-for-thread-callbacks-for-older-gcryp.patch # lua-5.1 is used by default for vlc build Patch7: Switch-to-Fedora-lua-5.1.patch - +# https://build.opensuse.org/package/view_file/openSUSE:Factory/vlc/vlc-libplacebo-5.patch?expand=1 +Patch8: vlc-libplacebo-5.patch # Backport for 3.0 notifyd without gtk3 Patch9: notify-don-t-depend-on-any-GTK-version.patch From 3a41ed25d0cedc89d8247fdc0bb4a67c51979a8c Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 25 Dec 2022 17:36:06 +0100 Subject: [PATCH 07/33] Update changelog --- vlc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index bf5a718..20c7f64 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: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -602,6 +602,9 @@ fi || : %changelog +* Sun Dec 25 2022 Nicolas Chauvet - 1:3.0.18-4 +- Add libplacebo-5 + * Fri Dec 23 2022 Nicolas Chauvet - 1:3.0.18-3 - Update to current snapshot From 9f57825606eb90ac6e44ca2ae8ec55ecb7ec4c62 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 25 Dec 2022 17:52:41 +0100 Subject: [PATCH 08/33] Apply patch8 --- vlc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vlc.spec b/vlc.spec index 20c7f64..0eb38ca 100644 --- a/vlc.spec +++ b/vlc.spec @@ -336,6 +336,7 @@ sed -i -e 's/taglib >= 1.9/taglib >= 1.8/' configure.ac %patch7 -p1 sed -i -e 's/luac/luac-5.1/g' configure.ac %endif +%patch8 -p1 %patch9 -p1 From 1d7c9a9473c8d80a80e3a3c962e3a39b9fe7246b Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 2 Mar 2023 11:03:13 +0000 Subject: [PATCH 09/33] Drop chromaprint support due to it's ffmpeg requires --- vlc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vlc.spec b/vlc.spec index 0eb38ca..02defbd 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: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -99,6 +99,7 @@ BuildRequires: pkgconfig(dbus-1) %{?_with_ffmpeg:BuildRequires: compat-ffmpeg4-devel} %else %{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0} +BuildRequires: pkgconfig(libchromaprint) %endif BuildRequires: flac-devel %{?_with_fluidsynth:BuildRequires: fluidsynth-devel} @@ -117,7 +118,6 @@ BuildRequires: libass-devel >= 0.9.7 BuildRequires: libcaca-devel BuildRequires: libcddb-devel BuildRequires: libcdio-devel >= 0.77-3 -BuildRequires: pkgconfig(libchromaprint) %{?_with_crystalhd:BuildRequires: libcrystalhd-devel} BuildRequires: pkgconfig(daaladec) BuildRequires: pkgconfig(daalaenc) @@ -603,6 +603,9 @@ fi || : %changelog +* Thu Mar 02 2023 Leigh Scott - 1:3.0.18-5 +- Drop chromaprint support due to it's ffmpeg requires + * Sun Dec 25 2022 Nicolas Chauvet - 1:3.0.18-4 - Add libplacebo-5 From bd6da12872f448ed2ebf5182e0a03496e8942e3f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 22 Mar 2023 22:58:08 +0100 Subject: [PATCH 10/33] Revert "Drop chromaprint support due to it's ffmpeg requires" This reverts commit 1d7c9a9473c8d80a80e3a3c962e3a39b9fe7246b. --- vlc.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vlc.spec b/vlc.spec index 02defbd..0eb38ca 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: 5%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -99,7 +99,6 @@ BuildRequires: pkgconfig(dbus-1) %{?_with_ffmpeg:BuildRequires: compat-ffmpeg4-devel} %else %{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0} -BuildRequires: pkgconfig(libchromaprint) %endif BuildRequires: flac-devel %{?_with_fluidsynth:BuildRequires: fluidsynth-devel} @@ -118,6 +117,7 @@ BuildRequires: libass-devel >= 0.9.7 BuildRequires: libcaca-devel BuildRequires: libcddb-devel BuildRequires: libcdio-devel >= 0.77-3 +BuildRequires: pkgconfig(libchromaprint) %{?_with_crystalhd:BuildRequires: libcrystalhd-devel} BuildRequires: pkgconfig(daaladec) BuildRequires: pkgconfig(daalaenc) @@ -603,9 +603,6 @@ fi || : %changelog -* Thu Mar 02 2023 Leigh Scott - 1:3.0.18-5 -- Drop chromaprint support due to it's ffmpeg requires - * Sun Dec 25 2022 Nicolas Chauvet - 1:3.0.18-4 - Add libplacebo-5 From 6040d5b70dec05ba226b2fed035cfb7c27775bc1 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 22 Mar 2023 23:12:13 +0100 Subject: [PATCH 11/33] Update to 3.0.19 snapshot --- sources | 2 +- vlc.spec | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sources b/sources index 1a95114..9f9eb94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vlc-6183d1e.tar.gz) = 50ead4f163337885c3bfb48a74869bb9d4ec6de9ebbeb97234ca6719c962422070ab88942e29f84cfc162eaad562e0b95aa735ed0ae9110bdbbd19ba8d1b2121 +SHA512 (vlc-3e48354.tar.gz) = fca7723ab1760d6ca8cda0cd997039b9a2b0f4171d47550e5a5268445a4c31ee23e2786e9cb9a2525dc844886b49da47e492a80f38a04084b9cdf9341d8d6934 diff --git a/vlc.spec b/vlc.spec index 0eb38ca..8c9781c 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,4 +1,4 @@ -%global commit0 6183d1e1530e5fee926a4fbbae8fe8628a2bcd57 +%global commit0 3e483547037e49f8ef828f2f0455593400968cf4 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) #global vlc_rc -rc2 %global vlc_setup vlc-%{?commit0} @@ -58,8 +58,8 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc -Version: 3.0.18 -Release: 4%{?dist} +Version: 3.0.19 +Release: 0.1%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -68,8 +68,6 @@ Patch5: Lower-libgcrypt-to-1.5.3.patch Patch6: Restore-support-for-thread-callbacks-for-older-gcryp.patch # lua-5.1 is used by default for vlc build Patch7: Switch-to-Fedora-lua-5.1.patch -# https://build.opensuse.org/package/view_file/openSUSE:Factory/vlc/vlc-libplacebo-5.patch?expand=1 -Patch8: vlc-libplacebo-5.patch # Backport for 3.0 notifyd without gtk3 Patch9: notify-don-t-depend-on-any-GTK-version.patch @@ -336,7 +334,6 @@ sed -i -e 's/taglib >= 1.9/taglib >= 1.8/' configure.ac %patch7 -p1 sed -i -e 's/luac/luac-5.1/g' configure.ac %endif -%patch8 -p1 %patch9 -p1 @@ -603,6 +600,9 @@ fi || : %changelog +* Wed Mar 22 2023 Nicolas Chauvet - 1:3.0.19-0.2 +- Update snapshot + * Sun Dec 25 2022 Nicolas Chauvet - 1:3.0.18-4 - Add libplacebo-5 From 616ec9c6650db7ecb6e579077c8a3cf65e42b7fc Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 23 Mar 2023 14:12:20 +0100 Subject: [PATCH 12/33] Rebuilt --- vlc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 8c9781c..6d610bf 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.19 -Release: 0.1%{?dist} +Release: 0.1%{?dist}.1 License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -600,6 +600,9 @@ fi || : %changelog +* Thu Mar 23 2023 Nicolas Chauvet - 1:3.0.19-0.1.1 +- rebuilt + * Wed Mar 22 2023 Nicolas Chauvet - 1:3.0.19-0.2 - Update snapshot From 03bf0f6caebc23a51d8f3b8a86af84b0484bad9f Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 26 Mar 2023 14:07:12 +0100 Subject: [PATCH 13/33] Rebuild --- vlc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 6d610bf..e174f4a 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.19 -Release: 0.1%{?dist}.1 +Release: 0.2%{?dist}.1 License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -600,6 +600,9 @@ fi || : %changelog +* Sun Mar 26 2023 Leigh Scott - 1:3.0.19-0.2.1 +- rebuilt + * Thu Mar 23 2023 Nicolas Chauvet - 1:3.0.19-0.1.1 - rebuilt From fb2170b2badcb963198e05360a9fc2074df8f79a Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 26 Mar 2023 14:11:18 +0100 Subject: [PATCH 14/33] Fix deprecated patch method --- vlc.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vlc.spec b/vlc.spec index e174f4a..9e87495 100644 --- a/vlc.spec +++ b/vlc.spec @@ -318,10 +318,10 @@ VLC media player extras modules. %prep %setup -q -n %{vlc_setup} -%patch3 -p1 +%patch -P3 -p1 %if 0%{?el7} -%patch5 -p1 -%patch6 -p1 +%patch -P5 -p1 +%patch -P6 -p1 # Lower opus requirement - rfbz#5585 sed -i -e 's/opus >= 1.0.3/opus >= 1.0.2/' configure.ac sed -i -e 's/opus_multistream_surround_encoder_create/opus_multistream_encoder_create/g' modules/codec/opus.c @@ -331,11 +331,11 @@ sed -i -e 's/taglib >= 1.9/taglib >= 1.8/' configure.ac . /opt/rh/devtoolset-%{dts_ver}/enable %endif %if 0%{?fedora} || 0%{?rhel} > 7 -%patch7 -p1 +%patch -P7 -p1 sed -i -e 's/luac/luac-5.1/g' configure.ac %endif -%patch9 -p1 +%patch -P9 -p1 %{?_with_bootstrap: rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || : From c158dd0b566e8a141e14767a19e038a2f2da9f79 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 10 Apr 2023 19:23:15 +0100 Subject: [PATCH 15/33] Rebuild for live555 --- vlc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 9e87495..245cfdd 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.19 -Release: 0.2%{?dist}.1 +Release: 0.3%{?dist}.1 License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -600,6 +600,9 @@ fi || : %changelog +* Mon Apr 10 2023 Leigh Scott - 1:3.0.19-0.3.1 +- Rebuild for live555 + * Sun Mar 26 2023 Leigh Scott - 1:3.0.19-0.2.1 - rebuilt From 34397371fbab4c80487642eca02d769262032f3c Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 11 Apr 2023 10:25:54 +0200 Subject: [PATCH 16/33] Remove right bump --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 245cfdd..1b6287f 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.19 -Release: 0.3%{?dist}.1 +Release: 0.3%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz From 062d42a55f4b01a080643b92ba0757114fa283f0 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 17 Apr 2023 09:30:21 +0200 Subject: [PATCH 17/33] Explicit comment about compat-ffmpeg4 usage --- vlc.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vlc.spec b/vlc.spec index 1b6287f..c49ef06 100644 --- a/vlc.spec +++ b/vlc.spec @@ -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 From f550af0ebb9782d61621d301af7e5d61053edd7c Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 13 Jun 2023 17:37:27 +0200 Subject: [PATCH 18/33] Rework freeworld --- vlc.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/vlc.spec b/vlc.spec index c49ef06..db0f367 100644 --- a/vlc.spec +++ b/vlc.spec @@ -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 From 485563d78e50a5700630a6adfde9cda80f4f1e48 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 13 Jun 2023 17:40:02 +0200 Subject: [PATCH 19/33] Update to 3.0.19.0 --- sources | 2 +- vlc.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 9f9eb94..f974dd1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vlc-3e48354.tar.gz) = fca7723ab1760d6ca8cda0cd997039b9a2b0f4171d47550e5a5268445a4c31ee23e2786e9cb9a2525dc844886b49da47e492a80f38a04084b9cdf9341d8d6934 +SHA512 (vlc-df6ab08.tar.gz) = c1bb77f89c413a9e8d90e96abdc2f1825caa27c68c843875ebaf36aea26ae8011cfc9a016a79d73f9bb1da4eb164bfa54387c8e4fae72a778b7e462455f98cf1 diff --git a/vlc.spec b/vlc.spec index db0f367..b78b983 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,4 +1,4 @@ -%global commit0 3e483547037e49f8ef828f2f0455593400968cf4 +%global commit0 df6ab0815338f6fbfda971e95cd6e3a9c626f91c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) #global vlc_rc -rc2 %global vlc_setup vlc-%{?commit0} @@ -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} +Release: 0.4%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -602,6 +602,9 @@ fi || : %changelog +* 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 From 443c8e6219dfa4ec3c7726983348c04663d8eae2 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 13 Jun 2023 17:56:36 +0200 Subject: [PATCH 20/33] Switch to current 3.x branch --- sources | 2 +- vlc.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index f974dd1..5787eb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vlc-df6ab08.tar.gz) = c1bb77f89c413a9e8d90e96abdc2f1825caa27c68c843875ebaf36aea26ae8011cfc9a016a79d73f9bb1da4eb164bfa54387c8e4fae72a778b7e462455f98cf1 +SHA512 (vlc-26fb05e.tar.gz) = fc7c06f06eb8fe1af6a10103a7842590519c28c39388bbfea6611902aeaa152a9bbfd9a2e6fb9ab17af47aad5fdbd93b93175999bbf4713b3185304a58c1ef83 diff --git a/vlc.spec b/vlc.spec index b78b983..ed47a01 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,4 +1,4 @@ -%global commit0 df6ab0815338f6fbfda971e95cd6e3a9c626f91c +%global commit0 26fb05e95724bd19f9a144c51bc11f79c609f3bc %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) #global vlc_rc -rc2 %global vlc_setup vlc-%{?commit0} From 8df13f605bc126353ee508bdcf3afeb8e0f7125b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 28 Jul 2023 08:47:40 +0200 Subject: [PATCH 21/33] Drop libplacebo for rawhide --- vlc.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vlc.spec b/vlc.spec index ed47a01..a4c24e2 100644 --- a/vlc.spec +++ b/vlc.spec @@ -150,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) From 1d74fc70ac61fe9604089207e746ddad1e9fb7f6 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 28 Jul 2023 08:51:46 +0200 Subject: [PATCH 22/33] Update snapshot --- sources | 2 +- vlc.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 5787eb7..7f9995e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vlc-26fb05e.tar.gz) = fc7c06f06eb8fe1af6a10103a7842590519c28c39388bbfea6611902aeaa152a9bbfd9a2e6fb9ab17af47aad5fdbd93b93175999bbf4713b3185304a58c1ef83 +SHA512 (vlc-dfdc90c.tar.gz) = 67f55465fa3a410baad10d85deb56d2c08e92298e7d25d87352f61ba7c05f4c187adb2dbbd2d944171487d9f4492682ff69258a11ef9b76b245e592352f58afe diff --git a/vlc.spec b/vlc.spec index a4c24e2..6be513c 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,4 +1,4 @@ -%global commit0 26fb05e95724bd19f9a144c51bc11f79c609f3bc +%global commit0 dfdc90c30a50a7e4fbdddeac2c06d51ade7ab385 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) #global vlc_rc -rc2 %global vlc_setup vlc-%{?commit0} @@ -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.4%{?dist} +Release: 0.5%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -603,6 +603,9 @@ fi || : %changelog +* Fri Jul 28 2023 Nicolas Chauvet - 1:3.0.19-0.5 +- Update snapshot + * Tue Jun 13 2023 Nicolas Chauvet - 1:3.0.19-0.4 - Update snapshot From b9132e4faf0bda9a751457031b4ed8d39e40adc0 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 28 Jul 2023 11:58:40 +0200 Subject: [PATCH 23/33] Add vlc-onevpl.patch --- vlc-onevpl.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 vlc-onevpl.patch diff --git a/vlc-onevpl.patch b/vlc-onevpl.patch new file mode 100644 index 0000000..3475fef --- /dev/null +++ b/vlc-onevpl.patch @@ -0,0 +1,24 @@ +diff -up vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/configure.ac.vpl vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/configure.ac +--- vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/configure.ac.vpl 2023-06-17 17:19:28.954540887 +0200 ++++ vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/configure.ac 2023-06-17 17:19:28.956540899 +0200 +@@ -2925,7 +2925,7 @@ fi + dnl + dnl Intel QuickSync (aka MediaSDK) H264/H262 encoder + dnl +-PKG_ENABLE_MODULES_VLC([MFX], [qsv], [libmfx], [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto]) ++PKG_ENABLE_MODULES_VLC([MFX], [qsv], [vpl], [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto]) + + dnl + dnl libfluidsynth (MIDI synthetizer) plugin +diff -up vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/modules/codec/qsv.c.vpl vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/modules/codec/qsv.c +--- vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/modules/codec/qsv.c.vpl 2023-06-09 17:29:29.000000000 +0200 ++++ vlc-26fb05e95724bd19f9a144c51bc11f79c609f3bc/modules/codec/qsv.c 2023-06-17 17:22:05.468382540 +0200 +@@ -33,7 +33,7 @@ + #include + #include + +-#include ++#include + + #define SOUT_CFG_PREFIX "sout-qsv-" + From adb509bfbdca1a1fc32fb181a40b2e984e02957d Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 28 Jul 2023 12:01:09 +0200 Subject: [PATCH 24/33] Apply onevpl --- vlc.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vlc.spec b/vlc.spec index 6be513c..dc11143 100644 --- a/vlc.spec +++ b/vlc.spec @@ -64,6 +64,7 @@ License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz Patch3: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch +Patch4: vlc-onevpl.patch Patch5: Lower-libgcrypt-to-1.5.3.patch Patch6: Restore-support-for-thread-callbacks-for-older-gcryp.patch # lua-5.1 is used by default for vlc build @@ -322,6 +323,9 @@ VLC media player extras modules. %prep %setup -q -n %{vlc_setup} %patch -P3 -p1 +%if 0%{?fedora} > 37 || 0%{?rhel} > 8 +%patch -P4 -p1 +%endif %if 0%{?el7} %patch -P5 -p1 %patch -P6 -p1 From 6a23f87ef081a452dfaee2c143a0c7b99d5af031 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 28 Jul 2023 12:01:45 +0200 Subject: [PATCH 25/33] Update changelog --- vlc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vlc.spec b/vlc.spec index dc11143..90973c9 100644 --- a/vlc.spec +++ b/vlc.spec @@ -609,6 +609,7 @@ fi || : %changelog * 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 From ceb392cafa0709a477b79179a954fa4468f3eb7d Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 28 Jul 2023 12:29:02 +0200 Subject: [PATCH 26/33] Add patch --- 0001-po-Fixup-invalid-format-string.patch | 45 +++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 0001-po-Fixup-invalid-format-string.patch diff --git a/0001-po-Fixup-invalid-format-string.patch b/0001-po-Fixup-invalid-format-string.patch new file mode 100644 index 0000000..2fd7609 --- /dev/null +++ b/0001-po-Fixup-invalid-format-string.patch @@ -0,0 +1,45 @@ +From 982f44d09bb61490194baf371d52c12016e0c5c9 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Fri, 28 Jul 2023 12:25:44 +0200 +Subject: [PATCH] po: Fixup invalid format string + +Will fix the following errors + +oc.po:5301: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 1, the argument size specifier is invalid. +oc.po:5306: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 1, the argument size specifier is invalid. +oc.po:5312: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 1, the argument size specifier is invalid. + +Signed-off-by: Nicolas Chauvet +--- + po/oc.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/po/oc.po b/po/oc.po +index 667696cfe785..ddb1677d8a53 100644 +--- a/po/oc.po ++++ b/po/oc.po +@@ -5298,18 +5298,18 @@ msgstr "Comanda+" + #: src/misc/update.c:482 + #, c-format + msgid "%.1f GiB" +-msgstr "%.lf Gio" ++msgstr "%.1f Gio" + + #: src/misc/update.c:484 + #, c-format + msgid "%.1f MiB" +-msgstr "%.lf Mio" ++msgstr "%.1f Mio" + + #: src/misc/update.c:486 modules/gui/macosx/VLCPlaylistInfo.m:138 + #: modules/gui/macosx/VLCPlaylistInfo.m:140 + #, c-format + msgid "%.1f KiB" +-msgstr "%.lf Kio" ++msgstr "%.1f Kio" + + #: src/misc/update.c:488 + #, c-format +-- +2.41.0 + From 1a0b4fb3576f69e9bf12fcd348281d92bc7fd98b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 28 Jul 2023 12:29:13 +0200 Subject: [PATCH 27/33] apply patch --- vlc.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vlc.spec b/vlc.spec index 90973c9..51426e3 100644 --- a/vlc.spec +++ b/vlc.spec @@ -63,6 +63,7 @@ Release: 0.5%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz +Patch2: 0001-po-Fixup-invalid-format-string.patch Patch3: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch Patch4: vlc-onevpl.patch Patch5: Lower-libgcrypt-to-1.5.3.patch @@ -322,6 +323,7 @@ VLC media player extras modules. %prep %setup -q -n %{vlc_setup} +%patch -P2 -p1 %patch -P3 -p1 %if 0%{?fedora} > 37 || 0%{?rhel} > 8 %patch -P4 -p1 From c44daa81c52a62d1c0ed1d322666632bebb281bd Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 28 Jul 2023 17:16:09 +0200 Subject: [PATCH 28/33] Revert "Apply onevpl" This reverts commit adb509bfbdca1a1fc32fb181a40b2e984e02957d. --- vlc.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vlc.spec b/vlc.spec index 51426e3..e40a134 100644 --- a/vlc.spec +++ b/vlc.spec @@ -65,7 +65,6 @@ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz Patch2: 0001-po-Fixup-invalid-format-string.patch Patch3: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch -Patch4: vlc-onevpl.patch Patch5: Lower-libgcrypt-to-1.5.3.patch Patch6: Restore-support-for-thread-callbacks-for-older-gcryp.patch # lua-5.1 is used by default for vlc build @@ -325,9 +324,6 @@ VLC media player extras modules. %setup -q -n %{vlc_setup} %patch -P2 -p1 %patch -P3 -p1 -%if 0%{?fedora} > 37 || 0%{?rhel} > 8 -%patch -P4 -p1 -%endif %if 0%{?el7} %patch -P5 -p1 %patch -P6 -p1 From 1a3be5f5f40e8769e0a58c2b0e4e7c0f5d7e68cc Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 28 Jul 2023 17:19:31 +0200 Subject: [PATCH 29/33] Update changelog --- vlc.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vlc.spec b/vlc.spec index e40a134..491ed0b 100644 --- a/vlc.spec +++ b/vlc.spec @@ -605,6 +605,9 @@ fi || : %changelog +* 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+ From 725e2fb748415ff35d74a40b38a9b95962828960 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 28 Jul 2023 17:20:11 +0200 Subject: [PATCH 30/33] bump --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 491ed0b..c7217b9 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.19 -Release: 0.5%{?dist} +Release: 0.6%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz From a3d1f690d99aaf1528d4ec3874015b23d22d0e6d Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 6 Aug 2023 15:09:41 +0100 Subject: [PATCH 31/33] Rebuild --- vlc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index c7217b9..c15cc74 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.19 -Release: 0.6%{?dist} +Release: 0.7%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -605,6 +605,9 @@ fi || : %changelog +* 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) From 3d8fcb06bf0f590c17768a3c41a55b65f0210b84 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 12 Oct 2023 11:34:21 +0200 Subject: [PATCH 32/33] Update to 3.0.19 --- sources | 2 +- vlc.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 7f9995e..88897f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vlc-dfdc90c.tar.gz) = 67f55465fa3a410baad10d85deb56d2c08e92298e7d25d87352f61ba7c05f4c187adb2dbbd2d944171487d9f4492682ff69258a11ef9b76b245e592352f58afe +SHA512 (vlc-32b50de.tar.gz) = 6a2b393cd45704528f9ef4aa894f552b93c0831f81dd54fa29ad877c0e5bc8bda836f830bf2d0bf049d482d4dad46135dddc73d28c5365bd15c1c33e460e72ed diff --git a/vlc.spec b/vlc.spec index c15cc74..857fbae 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,4 +1,4 @@ -%global commit0 dfdc90c30a50a7e4fbdddeac2c06d51ade7ab385 +%global commit0 32b50de2a28418ca9e843e91383dd09b4cd1c529 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) #global vlc_rc -rc2 %global vlc_setup vlc-%{?commit0} @@ -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.7%{?dist} +Release: 1%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz @@ -605,6 +605,9 @@ fi || : %changelog +* 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 From 5618e1ba0bc73c0fa6830e3794b3e6a8b9be4ed4 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 12 Oct 2023 11:44:30 +0200 Subject: [PATCH 33/33] Drop merged patch --- vlc.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/vlc.spec b/vlc.spec index 857fbae..b5b4d25 100644 --- a/vlc.spec +++ b/vlc.spec @@ -63,7 +63,6 @@ Release: 1%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortcommit0}.tar.gz -Patch2: 0001-po-Fixup-invalid-format-string.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 @@ -322,7 +321,6 @@ VLC media player extras modules. %prep %setup -q -n %{vlc_setup} -%patch -P2 -p1 %patch -P3 -p1 %if 0%{?el7} %patch -P5 -p1