[rpms/vlc] epel9-next: 3.0.22-rc2

[rpms/vlc] epel9-next: 3.0.22-rc2

[Yaakov Selkowitz]

A new commit has been pushed.

Repo   : rpms/vlc
Branch : epel9-next
Commit : f9c0b66715f46af15778bc6a25e72906d07550ab
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date   : 2025-12-02T18:22:12-05:00
Stats  : +19/-41 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/vlc/c/f9c0b66715f46af15778bc6a25e72906d07550ab?branch=epel9-next

Log:
3.0.22-rc2

---
diff --git a/appdata.patch b/appdata.patch
index 2002a13..4cc09c3 100644
--- a/appdata.patch
+++ b/appdata.patch
@@ -1,19 +1,15 @@
-diff --git a/share/vlc.appdata.xml.in.in b/share/vlc.appdata.xml.in.in
+diff --git a/share/org.videolan.vlc.appdata.xml.in.in b/share/org.videolan.vlc.appdata.xml.in.in
 index cc9c39a..3c55620 100644
---- a/share/vlc.appdata.xml.in.in
-+++ b/share/vlc.appdata.xml.in.in
-@@ -18,7 +18,7 @@
+--- 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>
      <releases>
 -        <release version="@VERSION@" />
 +        <release version="@VERSION@" date="@DATE@" />
      </releases>
++    <replaces><id>org.videolan.VLC</id></replaces>
      <provides>
          <library>libvlc.so.5</library>
-@@ -38,4 +38,5 @@
-             <image>http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-debian.jpg</image>
-         </screenshot>
-     </screenshots>
-+    <content_rating type="oars-1.1" />
- </component>
+     </provides>

diff --git a/live555.patch b/live555.patch
deleted file mode 100644
index b2f35db..0000000
--- a/live555.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up vlc-3.0.21/modules/access/live555.cpp.orig vlc-3.0.21/modules/access/live555.cpp
---- 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	2024-12-06 11:41:08.633053039 +0100
-@@ -236,8 +236,13 @@ struct demux_sys_t
-     bool             b_no_data;     /* if we never received any data */
-     int              i_no_data_ti;  /* consecutive number of TaskInterrupt */
- 
-+#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1732752000
-+    std::atomic_char event_rtsp;
-+    std::atomic_char event_data;
-+#else
-     char             event_rtsp;
-     char             event_data;
-+#endif
- 
-     bool             b_get_param;   /* Does the server support GET_PARAMETER */
-     bool             b_paused;      /* Are we paused? */

diff --git a/sources b/sources
index b6ecc86..09cd6a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vlc-76d714c3df6e4e0eeb0bbbb13fb23f7eb1aa7014.tar.bz2) = 1b9513e78b80560eeaafc4a10a07472b436f6c045f6e59ccf8efca326324f3a8eb60496a3c8ad8fbd5d39835bbb438ab05c215fb6cfb21f6d9e2eb5744bbdbf7
+SHA512 (vlc-a9d5a66e458565305d21831b5061baf19543170a.tar.bz2) = 8fc6e55edd1f0ac2d641b8703b62ebe54809194a1ad4e5596a5943b76ef6b3556f1a2b5875c53cd9f17ff7ad4148f2706cc5da65f3ab92ae093fc1a9e1afa021

diff --git a/vlc.spec b/vlc.spec
index 029517f..27fa618 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -32,12 +32,14 @@
 %bcond vpl 1
 %endif
 
-%global commit 76d714c3df6e4e0eeb0bbbb13fb23f7eb1aa7014
-%global gitdate 20250911
+%global commit a9d5a66e458565305d21831b5061baf19543170a
+%global gitdate 20251113
+
+%global app_id  org.videolan.vlc
 
 Name:		vlc
 Epoch:		1
-Version:	3.0.22~rc1
+Version:	3.0.22~rc2
 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
@@ -54,8 +56,6 @@ Source:		macros.vlc
 ## backported patches from master
 # freerdp: update to freerdp 2.0 api (#2278)
 Patch:		freerdp2.patch
-# live555: fix build with versions >= 2024.11.28 (#6972)
-Patch:		live555.patch
 # port to FFmpeg 8
 # https://code.videolan.org/videolan/vlc/-/merge_requests/6659
 # https://code.videolan.org/videolan/vlc/-/issues/29278
@@ -583,18 +583,16 @@ rm -f aclocal.m4 m4/lib*.m4 m4/lt*.m4
 # switch "Allow automatic icon change" to opt-in
 sed -i -e 's|\("qt-icon-change",\) true|\1 false|' modules/gui/qt/qt.cpp
 
-# sync appstream app-id with Flathub
 # fill in release date from appstream.patch
 # https: https://code.videolan.org/videolan/vlc/-/merge_requests/1555 (4.0)
-sed -e 's|org\.videolan\.vlc|org.videolan.VLC|' \
-    -e 's|@DATE@|%(date +%F -r %{S:0})|' \
+sed -e 's|@DATE@|%(date +%F -r %{S:0})|' \
     -e 's|http:|https:|g' \
-    -i share/vlc.appdata.xml.in.in
+    -i share/%{app_id}.appdata.xml.in.in
 
 %if 0%{?flatpak}
 # icons are renamed in order to be exported
-sed -i -e '/icon_theme_load/s|"vlc"|"org.videolan.VLC"|' modules/notify/notify.c
-sed -i -e '/fromTheme/s|"vlc"|"org.videolan.VLC"|' \
+sed -i -e '/icon_theme_load/s|"vlc"|"%{app_id}"|' modules/notify/notify.c
+sed -i -e '/fromTheme/s|"vlc"|"%{app_id}"|' \
 	modules/gui/qt/main_interface.cpp modules/gui/qt/qt.cpp
 %endif
 
@@ -794,7 +792,7 @@ rm -rf %{buildroot}%{_docdir}/vlc
 
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/vlc.desktop
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/vlc.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{app_id}.appdata.xml
 
 # chroma_copy_test fails on s390x (big endian?)
 %ifnarch s390x
@@ -816,7 +814,7 @@ make check
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/solid/actions/%{name}-*.desktop
 %{_datadir}/vlc/utils/
-%{_metainfodir}/%{name}.appdata.xml
+%{_metainfodir}/%{app_id}.appdata.xml
 
 %files libs -f %{name}.lang
 %license COPYING.LIB
@@ -1001,6 +999,7 @@ make check
 %{vlc_plugindir}/demux/libdemuxdump_plugin.so
 %{vlc_plugindir}/demux/libdiracsys_plugin.so
 %{vlc_plugindir}/demux/libdirectory_demux_plugin.so
+%{vlc_plugindir}/demux/libdmxmus_plugin.so
 %{vlc_plugindir}/demux/libes_plugin.so
 %{vlc_plugindir}/demux/libflacsys_plugin.so
 %{vlc_plugindir}/demux/libh26x_plugin.so