[packages/vlc] up to 3.0.23
atler
atler at pld-linux.org
Fri Jan 16 01:29:54 CET 2026
commit 189e52ada36588c095be827fa9601e435f568f9a
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Jan 16 01:29:18 2026 +0100
up to 3.0.23
ffmpeg6.patch | 11 ------
libnfs.patch | 41 ----------------------
vlc-live555-update.patch | 13 -------
vlc-taglib2.patch | 90 ------------------------------------------------
vlc-x265.patch | 45 ------------------------
vlc.spec | 32 +++++++----------
6 files changed, 12 insertions(+), 220 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 9f61582..126a569 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -67,12 +67,12 @@
Summary: VLC - a multimedia player and stream server
Summary(pl.UTF-8): VLC - odtwarzacz multimedialny oraz serwer strumieni
Name: vlc
-Version: 3.0.21
-Release: 15
+Version: 3.0.23
+Release: 1
License: GPL v2+
Group: X11/Applications/Multimedia
Source0: https://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: cde72f38943c685a1a39acc82da2339f
+# Source0-md5: ebc3f0d0a94785fd2b2df4087516938e
Patch0: %{name}-buildflags.patch
Patch1: %{name}-tremor.patch
Patch2: %{name}-mpc.patch
@@ -85,12 +85,7 @@ Patch8: qt-5.15.patch
Patch9: x32.patch
Patch10: %{name}-libplacebo-5.patch
Patch11: opencv4.patch
-Patch12: ffmpeg6.patch
-Patch13: %{name}-taglib2.patch
-Patch14: %{name}-x265.patch
-Patch15: %{name}-live555-update.patch
-Patch16: libsmb2.patch
-Patch17: libnfs.patch
+Patch12: libsmb2.patch
URL: http://www.videolan.org/vlc/
%{?with_decklink:BuildRequires: Blackmagic_DeckLink_SDK}
# 1.0 for X11 or GLESv1, 1.1 for GLESv2
@@ -187,7 +182,6 @@ BuildRequires: libsidplay2-devel
%{?with_smb:BuildRequires: libsmbclient-devel >= 3.6.13}
%{?with_sftp:BuildRequires: libssh2-devel}
BuildRequires: libstdc++-devel >= 6:4.7
-BuildRequires: libtar-devel
BuildRequires: libtheora-devel >= 1.0
BuildRequires: libtiger-devel >= 0.3.1
BuildRequires: libtool >= 2:2
@@ -430,11 +424,6 @@ Akcje klienta VLC dla Solid.
%{?with_libplacebo:%patch -P10 -p1}
%patch -P11 -p1
%patch -P12 -p1
-%patch -P13 -p1
-%patch -P14 -p1
-%patch -P15 -p1
-%patch -P16 -p1
-%patch -P17 -p1
%build
%{__libtoolize}
@@ -459,6 +448,7 @@ Akcje klienta VLC dla Solid.
%ifarch ppc
--disable-altivec \
%endif
+ --enable-a52 \
--enable-aa%{!?with_aalib:=no} \
%{?with_alsa:--enable-alsa} \
--enable-aom \
@@ -469,6 +459,7 @@ Akcje klienta VLC dla Solid.
--enable-crystalhd%{!?with_crystalhd:=no} \
%{?with_daala:--enable-daala} \
--enable-dbus \
+ --enable-dca \
--enable-decklink%{!?with_decklink:=no} \
--enable-dv1394%{!?with_dv:=no} \
--enable-dvbpsi \
@@ -490,6 +481,7 @@ Akcje klienta VLC dla Solid.
%{!?with_gnutls:--disable-gnutls} \
--enable-goom%{!?with_goom:=no} \
%{?with_jack:--enable-jack} \
+ --enable-libmpeg2 \
%{__enable_disable libplacebo} \
--enable-lirc%{!?with_lirc:=no} \
--enable-mad \
@@ -551,7 +543,6 @@ ln -sf %{_libdir}/vlc $RPM_BUILD_ROOT%{_prefix}/lib
# rm -f *.{a,la}
find $RPM_BUILD_ROOT%{_libdir} -type f -regex '.*\.l?a$' | xargs %{__rm}
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{as_IN,as}
%{__mv} $RPM_BUILD_ROOT%{_localedir}/{ks_IN,ks}
%{__mv} $RPM_BUILD_ROOT%{_localedir}/{or_IN,or}
%{__mv} $RPM_BUILD_ROOT%{_localedir}/{pt_PT,pt}
@@ -869,8 +860,8 @@ rm -rf $RPM_BUILD_ROOT
# R: twolame-libs
%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libtwolame_plugin.so
%endif
-#%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libvaapi_plugin.so
-#%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libvaapi_drm_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libvaapi_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libvaapi_drm_plugin.so
# R: libvorbis >= 1.1
%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libvorbis_plugin.so
# R: libvpx >= 1.5.0
@@ -912,6 +903,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/vlc/plugins/demux/libdemuxdump_plugin.so
%attr(755,root,root) %{_libdir}/vlc/plugins/demux/libdiracsys_plugin.so
%attr(755,root,root) %{_libdir}/vlc/plugins/demux/libdirectory_demux_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/demux/libdmxmus_plugin.so
%attr(755,root,root) %{_libdir}/vlc/plugins/demux/libes_plugin.so
%attr(755,root,root) %{_libdir}/vlc/plugins/demux/libflacsys_plugin.so
# R: game-music-emu
@@ -1234,7 +1226,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/vlc
%dir %{_datadir}/vlc/utils
%attr(755,root,root) %{_datadir}/vlc/utils/*.sh
-%{_datadir}/metainfo/vlc.appdata.xml
+%{_datadir}/metainfo/org.videolan.vlc.appdata.xml
%{_mandir}/man1/vlc.1*
%{_mandir}/man1/vlc-wrapper.1*
@@ -1256,7 +1248,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/svlc
# R: QtCore QtGui >= %{qt_ver}
%attr(755,root,root) %{_libdir}/vlc/plugins/gui/libqt_plugin.so
-# R: freetype libtar xorg-lib-lib{Xext,Xinerama,Xpm} QtCore QtGui
+# R: freetype xorg-lib-lib{Xext,Xinerama,Xpm} QtCore QtGui
%attr(755,root,root) %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
%if %{with aalib}
# R: aalib
diff --git a/ffmpeg6.patch b/ffmpeg6.patch
deleted file mode 100644
index b3dd815..0000000
--- a/ffmpeg6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vlc-3.0.18/configure.ac~ 2023-10-19 14:28:37.000000000 +0200
-+++ vlc-3.0.18/configure.ac 2023-10-19 14:31:22.113579556 +0200
-@@ -2450,7 +2450,7 @@
- have_avcodec_vaapi="yes"
- ],[
- AS_IF([test -n "${enable_libva}"], [
-- AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])
-+ AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing])
- ], [
- AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])
- ])
diff --git a/libnfs.patch b/libnfs.patch
deleted file mode 100644
index bd45e23..0000000
--- a/libnfs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit a945944c2d50cacfacdd5b16d4ea5e7b4766a9fc
-Author: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Mon Dec 16 09:28:55 2024 +0100
-
- nfs: fix libnfs API v2 support
-
- Introduced in libnfs 6.0.0.
-
- Co-authored-by: ronnie sahlberg <ronniesahlberg at gmail.com>
- Co-authored-by: Thomas Guillem <thomas at gllm.fr>
-
-diff --git a/modules/access/nfs.c b/modules/access/nfs.c
-index f164cda864..3510c3fe1f 100644
---- a/modules/access/nfs.c
-+++ b/modules/access/nfs.c
-@@ -188,7 +188,8 @@ nfs_read_cb(int i_status, struct nfs_context *p_nfs, void *p_data,
- else
- {
- p_sys->res.read.i_len = i_status;
-- memcpy(p_sys->res.read.p_buf, p_data, i_status);
-+ if (p_sys->res.read.p_buf != NULL && p_data != NULL)
-+ memcpy(p_sys->res.read.p_buf, p_data, i_status);
- }
- }
-
-@@ -208,9 +209,15 @@ FileRead(stream_t *p_access, void *p_buf, size_t i_len)
- return 0;
-
- p_sys->res.read.i_len = 0;
-+#ifdef LIBNFS_API_V2
-+ p_sys->res.read.p_buf = NULL;
-+ if (nfs_read_async(p_sys->p_nfs, p_sys->p_nfsfh, p_buf, i_len, nfs_read_cb,
-+ p_access) < 0)
-+#else
- p_sys->res.read.p_buf = p_buf;
- if (nfs_read_async(p_sys->p_nfs, p_sys->p_nfsfh, i_len, nfs_read_cb,
- p_access) < 0)
-+#endif
- {
- msg_Err(p_access, "nfs_read_async failed");
- return 0;
diff --git a/vlc-live555-update.patch b/vlc-live555-update.patch
deleted file mode 100644
index 90b899f..0000000
--- a/vlc-live555-update.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- vlc-3.0.21/modules/access/live555.cpp.orig 2024-06-05 17:56:07.000000000 +0200
-+++ vlc-3.0.21/modules/access/live555.cpp 2025-05-23 17:44:24.242213581 +0200
-@@ -236,8 +236,8 @@ struct demux_sys_t
- bool b_no_data; /* if we never received any data */
- int i_no_data_ti; /* consecutive number of TaskInterrupt */
-
-- char event_rtsp;
-- char event_data;
-+ EventLoopWatchVariable event_rtsp;
-+ EventLoopWatchVariable event_data;
-
- bool b_get_param; /* Does the server support GET_PARAMETER */
- bool b_paused; /* Are we paused? */
diff --git a/vlc-taglib2.patch b/vlc-taglib2.patch
deleted file mode 100644
index 29290ea..0000000
--- a/vlc-taglib2.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- vlc-3.0.20/modules/meta_engine/taglib.cpp.orig 2023-04-23 01:27:28.000000000 +0200
-+++ vlc-3.0.20/modules/meta_engine/taglib.cpp 2024-05-28 20:53:38.455427736 +0200
-@@ -57,6 +57,7 @@
- TAGLIB_PATCH_VERSION)
-
- #define TAGLIB_VERSION_1_11 VERSION_INT(1,11,0)
-+#define TAGLIB_VERSION_2 VERSION_INT(2,0,0)
-
- #if TAGLIB_VERSION >= TAGLIB_VERSION_1_11
- #include <tfilestream.h>
-@@ -185,7 +186,7 @@ public:
- ByteVector res(length, 0);
- ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
- if (i_read < 0)
-- return ByteVector::null;
-+ return ByteVector();
- else if ((size_t)i_read != length)
- res.resize(i_read);
- return res;
-@@ -237,12 +238,20 @@ public:
- return;
- }
-
-+#if TAGLIB_VERSION >= TAGLIB_VERSION_2
-+ offset_t tell() const
-+#else
- long tell() const
-+#endif
- {
- return m_previousPos;
- }
-
-+#if TAGLIB_VERSION >= TAGLIB_VERSION_2
-+ offset_t length()
-+#else
- long length()
-+#endif
- {
- uint64_t i_size;
- if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
-@@ -465,7 +474,7 @@ static void ReadMetaFromASF( ASF::Tag* t
- static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
- {
- #define SET( accessor, meta ) \
-- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
-+ if( !tag->accessor().isEmpty() ) \
- vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
- #define SETINT( accessor, meta ) \
- if( tag->accessor() ) \
-@@ -806,15 +815,15 @@ static void ReadMetaFromMP4( MP4::Tag* t
- {
- MP4::Item list;
- #define SET( keyName, metaName ) \
-- if( tag->itemListMap().contains(keyName) ) \
-+ if( tag->contains(keyName) ) \
- { \
-- list = tag->itemListMap()[keyName]; \
-+ list = tag->item(keyName); \
- vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
- }
- #define SET_EXTRA( keyName, metaName ) \
-- if( tag->itemListMap().contains(keyName) ) \
-+ if( tag->contains(keyName) ) \
- { \
-- list = tag->itemListMap()[keyName]; \
-+ list = tag->item(keyName); \
- vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
- }
-
-@@ -824,9 +833,9 @@ static void ReadMetaFromMP4( MP4::Tag* t
- #undef SET
- #undef SET_EXTRA
-
-- if( tag->itemListMap().contains("covr") )
-+ if( tag->contains("covr") )
- {
-- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
-+ MP4::CoverArtList list = tag->item("covr").toCoverArtList();
- const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
-
- msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
-@@ -1337,7 +1346,7 @@ static int WriteMeta( vlc_object_t *p_th
- if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
- WriteMetaToId3v2( riff_aiff->tag(), p_item );
- else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
-- WriteMetaToId3v2( riff_wav->tag(), p_item );
-+ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
- }
- else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
- {
diff --git a/vlc-x265.patch b/vlc-x265.patch
deleted file mode 100644
index ba66583..0000000
--- a/vlc-x265.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- vlc-3.0.21/modules/codec/x265.c.orig 2024-06-05 17:56:07.000000000 +0200
-+++ vlc-3.0.21/modules/codec/x265.c 2024-09-16 21:05:07.038413367 +0200
-@@ -67,7 +67,12 @@ struct encoder_sys_t
- static block_t *Encode(encoder_t *p_enc, picture_t *p_pict)
- {
- encoder_sys_t *p_sys = p_enc->p_sys;
-- x265_picture pic;
-+ x265_picture pic, *pic_out;
-+#if X265_BUILD >= 210 && X265_BUILD < 213
-+ x265_picture pic_l[MAX_SCALABLE_LAYERS];
-+ x265_picture *pic_lp[MAX_SCALABLE_LAYERS];
-+ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++) pic_lp[i] = &pic_l[i];
-+#endif
-
- x265_picture_init(&p_sys->param, &pic);
-
-@@ -88,8 +93,15 @@ static block_t *Encode(encoder_t *p_enc,
-
- x265_nal *nal;
- uint32_t i_nal = 0;
-+#if X265_BUILD >= 210 && X265_BUILD < 213
-+ x265_encoder_encode(p_sys->h, &nal, &i_nal,
-+ likely(p_pict) ? &pic : NULL, pic_lp);
-+ pic_out = pic_lp[0];
-+#else
- x265_encoder_encode(p_sys->h, &nal, &i_nal,
- likely(p_pict) ? &pic : NULL, &pic);
-+ pic_out = &pic;
-+#endif
-
- if (!i_nal)
- return NULL;
-@@ -110,10 +122,10 @@ static block_t *Encode(encoder_t *p_enc,
- p_enc->fmt_in.video.i_frame_rate_base /
- p_enc->fmt_in.video.i_frame_rate;
-
-- p_block->i_pts = p_sys->initial_date + pic.poc * p_block->i_length;
-+ p_block->i_pts = p_sys->initial_date + pic_out->poc * p_block->i_length;
- p_block->i_dts = p_sys->initial_date + p_sys->dts++ * p_block->i_length;
-
-- switch (pic.sliceType)
-+ switch (pic_out->sliceType)
- {
- case X265_TYPE_I:
- case X265_TYPE_IDR:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vlc.git/commitdiff/189e52ada36588c095be827fa9601e435f568f9a
More information about the pld-cvs-commit
mailing list