public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/vlc] epel10: 3.0.24
@ 2026-09-23 14:56 Yaakov Selkowitz
0 siblings, 0 replies; only message in thread
From: Yaakov Selkowitz @ 2026-09-23 14:56 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/vlc
Branch : epel10
Commit : 830b2d4a8e848b91fd03708cb627478c38c49dfc
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date : 2026-09-23T10:30:46-04:00
Stats : +45/-215 in 8 file(s)
URL : https://src.fedoraproject.org/rpms/vlc/c/830b2d4a8e848b91fd03708cb627478c38c49dfc?branch=epel10
Log:
3.0.24
---
diff --git a/8921.patch b/8921.patch
deleted file mode 100644
index 13baafd..0000000
--- a/8921.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 62b5f87ed9af884298fe6e637d5fa55d0fe246a5 Mon Sep 17 00:00:00 2001
-From: Marvin Scholz <epirat07@gmail.com>
-Date: Thu, 5 Feb 2026 16:33:37 +0100
-Subject: [PATCH 1/2] buildsystem: detect new libspatialaudio
-
-We can use the presence of the version header to detect libspatialaudio
-0.4.0 or higher. (For more granular checks in the future, the defines
-from the version header can be checked)
-
-(cherry picked from commit 93c2e6ec320016a3b3a3764db44fc7434d37d031) (edited)
-edited:
-- VLC 3 doesn't have meson
-Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
----
- configure.ac | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index e3d5fc62790..ed8274f7c61 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2895,6 +2895,15 @@ dnl Ambisonic channel mixer and binauralizer plugin
- dnl
- PKG_ENABLE_MODULES_VLC([SPATIALAUDIO], [], [spatialaudio], [Ambisonic channel mixer and binauralizer], [auto])
-
-+AS_IF([test -n ${SPATIALAUDIO_CFLAGS+set}], [
-+ VLC_SAVE_FLAGS
-+ AX_APPEND_FLAG([$SPATIALAUDIO_CFLAGS], [CFLAGS])
-+ AC_CHECK_HEADER([spatialaudio/SpatialaudioVersion.h], [
-+ AX_APPEND_FLAG([-DHAVE_SPATIALAUDIOVERSION_H=1], [SPATIALAUDIO_CFLAGS])
-+ ])
-+ VLC_RESTORE_FLAGS
-+])
-+
- dnl
- dnl theora decoder plugin
- dnl
---
-GitLab
-
-
-From ea82edcc10c2daad60fa4be8013eac25b7ed8f0f Mon Sep 17 00:00:00 2001
-From: Marvin Scholz <epirat07@gmail.com>
-Date: Thu, 5 Feb 2026 16:34:35 +0100
-Subject: [PATCH 2/2] modules: spatialaudio: compat with new API
-
-This merely makes it build with the new API and doesn't yet migrate
-to newer APIs.
-
-(cherry picked from commit a41efcaf1d0b799f0d85d2ca0c59a9c677153cc4) (rebased)
-rebased:
-- VLC 3 still has the spatialaudio-headphones option
-Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
----
- .../channel_mixer/spatialaudio.cpp | 39 +++++++++++++++++--
- 1 file changed, 35 insertions(+), 4 deletions(-)
-
-diff --git a/modules/audio_filter/channel_mixer/spatialaudio.cpp b/modules/audio_filter/channel_mixer/spatialaudio.cpp
-index ec3b0e7489c..311ab0c462e 100644
---- a/modules/audio_filter/channel_mixer/spatialaudio.cpp
-+++ b/modules/audio_filter/channel_mixer/spatialaudio.cpp
-@@ -43,6 +43,23 @@
- #include <spatialaudio/Ambisonics.h>
- #include <spatialaudio/SpeakersBinauralizer.h>
-
-+#ifdef HAVE_SPATIALAUDIOVERSION_H
-+# include <spatialaudio/SpatialaudioVersion.h>
-+#else
-+# define SPATIALAUDIO_API_VERSION_MAJOR 0
-+#endif
-+
-+#if SPATIALAUDIO_API_VERSION_MAJOR >= 2
-+ using namespace spaudio;
-+ using CAmbisonicBinauralizer = spaudio::AmbisonicBinauralizer;
-+ using CAmbisonicDecoder = spaudio::AmbisonicDecoder;
-+ using CAmbisonicProcessor = spaudio::AmbisonicProcessor;
-+ using CAmbisonicZoomer = spaudio::AmbisonicZoomer;
-+ using CAmbisonicSpeaker = spaudio::AmbisonicSpeaker;
-+ using CBFormat = spaudio::BFormat;
-+ #define kAmblib_CustomSpeakerSetUp Amblib_SpeakerSetUps::kAmblib_CustomSpeakerSetUp
-+#endif
-+
- #define CFG_PREFIX "spatialaudio-"
-
- #define DEFAULT_HRTF_PATH "hrtfs" DIR_SEP "dodeca_and_7channel_3DSL_HRTF.sofa"
-@@ -460,10 +477,18 @@ static int Open(vlc_object_t *p_this)
- p_sys->mode = filter_spatialaudio::AMBISONICS_DECODER;
-
- unsigned i_nbChannels = aout_FormatNbChannels(&p_filter->fmt_out.audio);
-- if (i_nbChannels == 1
-- || !p_sys->speakerDecoder.Configure(p_sys->i_order, true,
-- kAmblib_CustomSpeakerSetUp,
-- i_nbChannels))
-+ bool ok = false;
-+ if (i_nbChannels > 1) {
-+#if SPATIALAUDIO_API_VERSION_MAJOR >= 2
-+ ok = p_sys->speakerDecoder.Configure(p_sys->i_order, true,
-+ AMB_BLOCK_TIME_LEN, p_filter->fmt_in.audio.i_rate,
-+ kAmblib_CustomSpeakerSetUp, i_nbChannels);
-+#else
-+ ok = p_sys->speakerDecoder.Configure(p_sys->i_order, true,
-+ kAmblib_CustomSpeakerSetUp, i_nbChannels);
-+#endif
-+ }
-+ if (!ok)
- {
- msg_Err(p_filter, "Error creating the Ambisonics decoder.");
- delete p_sys;
-@@ -509,7 +534,13 @@ static int Open(vlc_object_t *p_this)
- return VLC_EGENERIC;
- }
-
-+#if SPATIALAUDIO_API_VERSION_MAJOR >= 2
-+ if (!p_sys->zoomer.Configure(p_sys->i_order, true,
-+ AMB_BLOCK_TIME_LEN,
-+ p_filter->fmt_in.audio.i_rate))
-+#else
- if (!p_sys->zoomer.Configure(p_sys->i_order, true, 0))
-+#endif
- {
- msg_Err(p_filter, "Error creating the ambisonic zoomer.");
- delete p_sys;
---
-GitLab
-
diff --git a/appdata.patch b/appdata.patch
index 4cc09c3..730396d 100644
--- a/appdata.patch
+++ b/appdata.patch
@@ -2,12 +2,9 @@ diff --git a/share/org.videolan.vlc.appdata.xml.in.in b/share/org.videolan.vlc.a
index cc9c39a..3c55620 100644
--- a/share/org.videolan.vlc.appdata.xml.in.in
+++ b/share/org.videolan.vlc.appdata.xml.in.in
-@@ -18,8 +18,9 @@
- <url type="bugtracker">https://trac.videolan.org/vlc/</url>
- <url type="donation">https://www.videolan.org/contribute.html</url>
+@@ -20,6 +20,7 @@
<releases>
-- <release version="@VERSION@" />
-+ <release version="@VERSION@" date="@DATE@" />
+ <release version="@VERSION@" date="@VERSION_DATE@" />
</releases>
+ <replaces><id>org.videolan.VLC</id></replaces>
<provides>
diff --git a/gstreamer128.patch b/gstreamer128.patch
deleted file mode 100644
index 66bdd8b..0000000
--- a/gstreamer128.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-The addition of gstvideodmabufpool.h, which depends on gstvideopool.h,
-causes this include to pull things in the wrong order.
-
-https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/10411
-
-diff -up ./modules/codec/gstreamer/gstvlcvideopool.h.orig ./modules/codec/gstreamer/gstvlcvideopool.h
---- ./modules/codec/gstreamer/gstvlcvideopool.h.orig 2025-12-23 05:49:20.000000000 -0500
-+++ ./modules/codec/gstreamer/gstvlcvideopool.h 2026-02-10 01:45:40.557003527 -0500
-@@ -28,7 +28,7 @@
- #define VLC_GST_VIDEO_POOL_H
-
- #include <gst/gstbufferpool.h>
--#include <gst/video/gstvideopool.h>
-+#include <gst/video/video.h>
-
- #include "gstvlcpictureplaneallocator.h"
-
diff --git a/librist.patch b/librist.patch
new file mode 100644
index 0000000..6026299
--- /dev/null
+++ b/librist.patch
@@ -0,0 +1,17 @@
+This typo was fixed in librist 0.2.8:
+
+https://code.videolan.org/rist/librist/-/commit/116d160c900154d0fbb9faf58d8c136c7922c499
+
+diff -up ./modules/access_output/rist.c.orig ./modules/access_output/rist.c
+--- ./modules/access_output/rist.c.orig 2026-09-17 07:01:48.000000000 -0400
++++ ./modules/access_output/rist.c 2026-09-17 16:42:18.382293564 -0400
+@@ -316,6 +316,9 @@ vlc_module_begin()
+ add_integer( RIST_CFG_PREFIX RIST_URL_PARAM_VERBOSE_LEVEL, RIST_DEFAULT_VERBOSE_LEVEL,
+ RIST_VERBOSE_LEVEL_TEXT, RIST_VERBOSE_LEVEL_LONGTEXT, true )
+ change_integer_list( verbose_level_type, verbose_level_type_names )
++#ifndef RIST_DEFAULT_RECOVERY_LENGTH_MIN
++#define RIST_DEFAULT_RECOVERY_LENGTH_MIN RIST_DEFAULT_RECOVERY_LENGHT_MIN
++#endif
+ add_integer( RIST_CFG_PREFIX RIST_CFG_LATENCY, RIST_DEFAULT_RECOVERY_LENGTH_MIN,
+ BUFFER_TEXT, BUFFER_LONGTEXT, true )
+ add_string( RIST_CFG_PREFIX RIST_URL_PARAM_CNAME, NULL, RIST_CNAME_TEXT,
diff --git a/libupnp118.patch b/libupnp118.patch
index fcbbf65..12d7679 100644
--- a/libupnp118.patch
+++ b/libupnp118.patch
@@ -3,8 +3,8 @@ index b90e3cf..bc17189 100644
--- a/modules/services_discovery/upnp.hpp
+++ b/modules/services_discovery/upnp.hpp
@@ -37,7 +37,7 @@
+
#include <vlc_common.h>
- #include <vlc_url.h>
-#if UPNP_VERSION < 10800
+#if (UPNP_VERSION < 10800) || (UPNP_VERSION >= 11800)
diff --git a/oneVPL.patch b/oneVPL.patch
deleted file mode 100644
index 849a565..0000000
--- a/oneVPL.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Backport of https://code.videolan.org/videolan/vlc/-/merge_requests/3843
-"Switch from deprecated MFX to VPL" for 3.0, as direct use of intel-mediasdk
-is deprecated in favour of oneVPL.
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -2923,9 +2923,9 @@ fi
-
-
- dnl
--dnl Intel QuickSync (aka MediaSDK) H264/H262 encoder
-+dnl Intel oneAPI Video Processing Library
- dnl
--PKG_ENABLE_MODULES_VLC([MFX], [qsv], [libmfx], [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto])
-+PKG_ENABLE_MODULES_VLC([VPL], [qsv], [vpl], [Intel oneAPI Video Processing Library encoder], [auto])
-
- dnl
- dnl libfluidsynth (MIDI synthetizer) plugin
-diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
---- a/modules/codec/Makefile.am
-+++ b/modules/codec/Makefile.am
-@@ -610,9 +610,9 @@ codec_LTLIBRARIES += $(LTLIBdav1d)
- codec_LTLIBRARIES += $(LTLIBcrystalhd)
-
- libqsv_plugin_la_SOURCES = codec/qsv.c
--libqsv_plugin_la_CFLAGS = $(AM_CFLAGS) $(MFX_CFLAGS)
-+libqsv_plugin_la_CFLAGS = $(AM_CFLAGS) $(VPL_CFLAGS)
- libqsv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
--libqsv_plugin_la_LIBADD = $(MFX_LIBS)
-+libqsv_plugin_la_LIBADD = $(VPL_LIBS)
- EXTRA_LTLIBRARIES += libqsv_plugin.la
- codec_LTLIBRARIES += $(LTLIBqsv)
-
-diff --git a/modules/codec/qsv.c b/modules/codec/qsv.c
---- a/modules/codec/qsv.c
-+++ b/modules/codec/qsv.c
-@@ -33,7 +33,7 @@
- #include <vlc_picture.h>
- #include <vlc_codec.h>
-
--#include <mfx/mfxvideo.h>
-+#include <vpl/mfxvideo.h>
-
- #define SOUT_CFG_PREFIX "sout-qsv-"
-
---
-GitLab
diff --git a/sources b/sources
index 574b40a..696f55c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (vlc-3.0.23.tar.xz) = 557e4ac76a17158877a4a86f27c9a5bc189b7ac559687552117dc8b44961d1172cf93bf8e1eb70fecb05999bdfc3f69ab79b55126c71486fe3a8cdfbf92e6df6
+SHA512 (vlc-6de05adcbaf2e8b85fe86aad4169393098628119.tar.bz2) = 770a3621360e3ddac5195346d5395dff47e2717582d1dee3b32367e25d3c8ba5e2dee384e531315425911b93610480ecf2222a2c1ff6081e5b4935734a13532c
+SHA512 (vlc-3.0.24.tar.xz) = 3654e6b6205932e6389d0a7a58dfdd014ae24212ec192f11625b92b41b18d57b4afc4e72ccdfd6b402f31bafd71fd82e976dc7697c58f07a10be848047335265
diff --git a/vlc.spec b/vlc.spec
index fde48e7..1e3928d 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -6,8 +6,10 @@
# use Qt6 where available
%bcond qt6 %[(0%{?fedora} || 0%{?rhel} >= 10)]
-# not compatible with asdcplib-2.12
-%bcond asdcp %[!(0%{?fedora} >= 38 || 0%{?rhel} >= 10)]
+# freerdp3 not yet supported upstream
+%bcond freerdp 0
+# requires libmpcdec 1.3.0
+%bcond mpc %[(0%{?fedora} || 0%{?rhel} >= 10)]
# not compatible with opencv 3.4 or 4.0
# https://code.videolan.org/videolan/vlc/-/issues/22016
%bcond opencv 0
@@ -18,14 +20,17 @@
%bcond postproc %[!(0%{?fedora} >= 44 || 0%{?rhel} >= 11)]
# disabled due to various issues
%bcond projectm 0
-# freerdp3 not yet supported upstream
-%bcond freerdp 0
# some dependencies are not yet in EPEL 10
%bcond daala 1
%bcond lirc 1
%bcond sdl %[!(0%{?rhel} >= 10)]
+%ifnarch %{ix86}
+# now compatible with asdcplib-2.12
+%bcond asdcp 1
+%endif
+
%ifnarch s390x
# retired from F43, was never in EPEL 9+
%bcond crystalhd 0
@@ -36,14 +41,14 @@
%bcond vpl 1
%endif
-#global commit f9020c4df073c861a28f0cda5c6c5dccb58a49ef
-#global gitdate 20251124
+#global commit 6de05adcbaf2e8b85fe86aad4169393098628119
+#global gitdate 20260917
%global app_id org.videolan.vlc
Name: vlc
Epoch: 1
-Version: 3.0.23
+Version: 3.0.24
Release: %autorelease
Summary: The cross-platform open-source multimedia framework, player and server
License: GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND BSD-3-Clause
@@ -56,8 +61,6 @@ Source: https://get.videolan.org/vlc/%{version}/vlc-%{version}.tar.xz
Source: macros.vlc
## upstream patches
-# spatialaudio: fix compilation with libspatialaudio 4.0
-Patch: 8921.patch
## backported patches from master
# freerdp: update to freerdp 2.0 api (#2278)
@@ -70,8 +73,6 @@ Patch: freerdp2.patch
Patch: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch
# Fix building with fdk-aac-2.0; backport for 3.0 from flathub
Patch: fdk-aac2.patch
-# port from intel-mediasdk to oneVPL
-Patch: oneVPL.patch
# fix appstreamcli validate to show in Software (rhbz#2258611)
Patch: appdata.patch
# port from libidn to libidn2
@@ -80,10 +81,10 @@ Patch: libidn2.patch
Patch: lua-math.patch
# avoid "stale plugin cache" warnings in flatpaks
Patch: flatpak-cache.patch
-# fix build with gstreamer-1.28
-Patch: gstreamer128.patch
# fix build with libupnp-1.18
Patch: libupnp118.patch
+# fix build with librist < 0.2.8 (EPEL 9, 10)
+Patch: librist.patch
%{load:%{S:1}}
%global __provides_exclude_from ^%{vlc_plugindir}/.*$
@@ -107,7 +108,9 @@ BuildRequires: libcrystalhd-devel
BuildRequires: libgcrypt-devel
BuildRequires: libjpeg-devel
BuildRequires: libmad-devel
+%if %{with mpc}
BuildRequires: libmpcdec-devel
+%endif
BuildRequires: libpng-devel
%if %{with lirc}
BuildRequires: lirc-devel
@@ -190,6 +193,7 @@ BuildRequires: pkgconfig(libpulse) >= 1.0
%if %{with ieee1394}
BuildRequires: pkgconfig(libraw1394) >= 2.0.1 pkgconfig(libavc1394) >= 0.5.3
%endif
+BuildRequires: pkgconfig(librist) >= 0.2.1
BuildRequires: pkgconfig(librsvg-2.0) >= 2.9.0
BuildRequires: pkgconfig(libsecret-1) >= 0.18
#BuildRequires: pkgconfig(libsidplay2)
@@ -332,7 +336,6 @@ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-plugins-base%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-plugins-video-out%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-plugin-lua%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: (%{name}-plugin-pipewire%{?_isa} if pipewire)
Requires: (%{name}-plugin-pulseaudio%{?_isa} = %{epoch}:%{version}-%{release} if (pipewire-pulseaudio or pulseaudio))
Recommends: %{name}-plugins-extra%{?_isa} = %{epoch}:%{version}-%{release}
Recommends: %{name}-plugin-ffmpeg%{?_isa} = %{epoch}:%{version}-%{release}
@@ -652,7 +655,7 @@ export LIVE555_PREFIX=%{_prefix}
--enable-screen \
--enable-vnc \
--enable-freerdp%{!?with_freerdp:=no} \
- --enable-realrtsp \
+ --disable-realrtsp \
--enable-asdcp%{!?with_asdcp:=no} \
\
--enable-dvbpsi \
@@ -662,7 +665,7 @@ export LIVE555_PREFIX=%{_prefix}
--enable-shout \
--enable-matroska \
--enable-mod \
- --enable-mpc \
+ --enable-mpc%{!?with_mpc:=no} \
\
--disable-shine \
--disable-omxil \
@@ -744,6 +747,7 @@ export LIVE555_PREFIX=%{_prefix}
--disable-libtar \
--enable-lirc%{!?with_lirc:=no} \
--enable-srt \
+ --enable-librist \
\
--disable-goom \
--enable-projectm%{!?with_projectm:=no} \
@@ -828,7 +832,7 @@ make check
%files
%doc AUTHORS NEWS README THANKS
%license COPYING COPYING.LIB
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{name}*.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/solid/actions/%{name}-*.desktop
%{_datadir}/vlc/utils/
@@ -903,7 +907,6 @@ make check
%{vlc_plugindir}/access/libaccess_concat_plugin.so
%{vlc_plugindir}/access/libaccess_imem_plugin.so
%{vlc_plugindir}/access/libaccess_mms_plugin.so
-%{vlc_plugindir}/access/libaccess_realrtsp_plugin.so
%{vlc_plugindir}/access/libattachment_plugin.so
%{vlc_plugindir}/access/libdtv_plugin.so
%{vlc_plugindir}/access/libfilesystem_plugin.so
@@ -1183,7 +1186,9 @@ make check
%{vlc_plugindir}/control/liblirc_plugin.so
%endif
%{vlc_plugindir}/demux/libgme_plugin.so
+%if %{with mpc}
%{vlc_plugindir}/demux/libmpc_plugin.so
+%endif
%{vlc_plugindir}/demux/libmkv_plugin.so
%{vlc_plugindir}/demux/libmod_plugin.so
%{vlc_plugindir}/demux/libts_plugin.so
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-23 14:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-23 14:56 [rpms/vlc] epel10: 3.0.24 Yaakov Selkowitz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox