[rpms/vlc] epel9-next: Merge branch 'rawhide' into epel9

[Yaakov Selkowitz <yselkowi@redhat.com>]

A new commit has been pushed.

Repo   : rpms/vlc
Branch : epel9-next
Commit : d012f807f5698a1be66a85b11e01cda59f24a4a0
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date   : 2026-01-18T19:43:01-05:00
Stats  : +4/-89 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/vlc/c/d012f807f5698a1be66a85b11e01cda59f24a4a0?branch=epel9-next

Log:
Merge branch 'rawhide' into epel9

---
diff --git a/ffmpeg8.patch b/ffmpeg8.patch
deleted file mode 100644
index 08608cf..0000000
--- a/ffmpeg8.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -up vlc-3.0.21/modules/codec/avcodec/video.c.orig vlc-3.0.21/modules/codec/avcodec/video.c
---- vlc-3.0.21/modules/codec/avcodec/video.c.orig	2024-06-05 17:56:07.000000000 +0200
-+++ vlc-3.0.21/modules/codec/avcodec/video.c	2025-09-29 18:11:31.100313450 +0200
-@@ -1429,8 +1429,13 @@ static picture_t *DecodeBlock( decoder_t
-         /* Hack to force display of still pictures */
-         p_pic->b_force = p_sys->b_first_frame;
-         p_pic->i_nb_fields = 2 + frame->repeat_pict;
-+#if LIBAVUTIL_VERSION_CHECK( 58, 7, 100 )
-+        p_pic->b_progressive = !(frame->flags & AV_FRAME_FLAG_INTERLACED);
-+        p_pic->b_top_field_first = !!(frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST);
-+#else
-         p_pic->b_progressive = !frame->interlaced_frame;
-         p_pic->b_top_field_first = frame->top_field_first;
-+#endif
- 
-         if (DecodeSidedata(p_dec, frame, p_pic))
-             i_pts = VLC_TICK_INVALID;
-diff -up vlc-3.0.21/modules/codec/avcodec/avcommon_compat.h.orig vlc-3.0.21/modules/codec/avcodec/avcommon_compat.h
---- vlc-3.0.21/modules/codec/avcodec/avcommon_compat.h.orig	2025-09-29 18:15:41.268452578 +0200
-+++ vlc-3.0.21/modules/codec/avcodec/avcommon_compat.h	2025-09-29 20:44:02.254440841 +0200
-@@ -75,9 +75,12 @@
- #ifndef AV_CODEC_CAP_SMALL_LAST_FRAME
- # define AV_CODEC_CAP_SMALL_LAST_FRAME CODEC_CAP_SMALL_LAST_FRAME
- #endif
--#ifndef AV_INPUT_BUFFER_MIN_SIZE
-+#if !defined(AV_INPUT_BUFFER_MIN_SIZE) && defined(FF_MIN_BUFFER_SIZE)
- # define AV_INPUT_BUFFER_MIN_SIZE FF_MIN_BUFFER_SIZE
- #endif
-+#ifndef AV_INPUT_BUFFER_MIN_SIZE
-+# define AV_INPUT_BUFFER_MIN_SIZE 16384
-+#endif
- #ifndef  FF_MAX_B_FRAMES
- # define  FF_MAX_B_FRAMES 16 // FIXME: remove this
- #endif
-@@ -87,6 +87,48 @@
- #ifndef FF_API_STRUCT_VAAPI_CONTEXT
- # define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59)
- #endif
-+#ifndef FF_PROFILE_UNKNOWN // removed in ffmpeg 8
-+# define FF_PROFILE_UNKNOWN AV_PROFILE_UNKNOWN
-+#endif
-+#ifndef FF_LEVEL_UNKNOWN
-+# define FF_LEVEL_UNKNOWN AV_LEVEL_UNKNOWN
-+#endif
-+#ifndef FF_PROFILE_HEVC_MAIN
-+# define FF_PROFILE_HEVC_MAIN AV_PROFILE_HEVC_MAIN
-+#endif
-+#ifndef FF_PROFILE_HEVC_MAIN_10
-+# define FF_PROFILE_HEVC_MAIN_10 AV_PROFILE_HEVC_MAIN_10
-+#endif
-+#ifndef FF_PROFILE_VP9_0
-+# define FF_PROFILE_VP9_0 AV_PROFILE_VP9_0
-+#endif
-+#ifndef FF_PROFILE_VP9_2
-+# define FF_PROFILE_VP9_2 AV_PROFILE_VP9_2
-+#endif
-+#ifndef FF_PROFILE_AAC_LOW
-+# define FF_PROFILE_AAC_LOW AV_PROFILE_AAC_LOW
-+#endif
-+#ifndef FF_PROFILE_AAC_MAIN
-+# define FF_PROFILE_AAC_MAIN AV_PROFILE_AAC_MAIN
-+#endif
-+#ifndef FF_PROFILE_AAC_SSR
-+# define FF_PROFILE_AAC_SSR AV_PROFILE_AAC_SSR
-+#endif
-+#ifndef FF_PROFILE_AAC_LTP
-+# define FF_PROFILE_AAC_LTP AV_PROFILE_AAC_LTP
-+#endif
-+#ifndef FF_PROFILE_AAC_HE_V2
-+# define FF_PROFILE_AAC_HE_V2 AV_PROFILE_AAC_HE_V2
-+#endif
-+#ifndef FF_PROFILE_AAC_HE
-+# define FF_PROFILE_AAC_HE AV_PROFILE_AAC_HE
-+#endif
-+#ifndef FF_PROFILE_AAC_LD
-+# define FF_PROFILE_AAC_LD AV_PROFILE_AAC_LD
-+#endif
-+#ifndef FF_PROFILE_AAC_ELD
-+# define FF_PROFILE_AAC_ELD AV_PROFILE_AAC_ELD
-+#endif
- 
- #endif /* HAVE_LIBAVCODEC_AVCODEC_H */
- 

diff --git a/sources b/sources
index 25b8759..574b40a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vlc-3.0.22.tar.xz) = f60926fae508cb5b3b99d32910ea0f83372dd46497c60aa0c601dfd3b5b467c9c6cc628ab0a3a8541559739f77fc8a00de909a2c9b92d700d5b48830e8b3e409
+SHA512 (vlc-3.0.23.tar.xz) = 557e4ac76a17158877a4a86f27c9a5bc189b7ac559687552117dc8b44961d1172cf93bf8e1eb70fecb05999bdfc3f69ab79b55126c71486fe3a8cdfbf92e6df6

diff --git a/vlc.spec b/vlc.spec
index d7b305b..f4e95c6 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -39,7 +39,7 @@
 
 Name:		vlc
 Epoch:		1
-Version:	3.0.22
+Version:	3.0.23
 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,10 +56,6 @@ Source:		macros.vlc
 ## backported patches from master
 # freerdp: update to freerdp 2.0 api (#2278)
 Patch:		freerdp2.patch
-# port to FFmpeg 8
-# https://code.videolan.org/videolan/vlc/-/merge_requests/6659
-# https://code.videolan.org/videolan/vlc/-/issues/29278
-Patch:		ffmpeg8.patch
 
 ## upstreamable patches
 
@@ -1114,7 +1110,9 @@ make check
 %if %{with postproc}
 %exclude %{vlc_plugindir}/video_filter/libpostproc_plugin.so
 %endif
+%if %{with opencv}
 %exclude %{vlc_plugindir}/video_filter/libopencv_*.so
+%endif
 %{vlc_plugindir}/video_filter/*.so
 %{vlc_plugindir}/video_output/libfb_plugin.so
 %{vlc_plugindir}/video_output/libvdummy_plugin.so