From a3d726f79ef716618e444526e757498d1807ce18 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 10 Jan 2025 00:58:48 -0500 Subject: [PATCH] Avoid "stale plugin cache" warnings in flatpaks flatpak (and ostree) report an st_mtime of 0 (or 1 in past versions) for all files it controls, which does not match the real time recorded when installing the plugins in the mock buildroot. Therefore, check this only when it appears to be real. --- flatpak-cache.patch | 23 +++++++++++++++++++++++ vlc.spec | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 flatpak-cache.patch diff --git a/flatpak-cache.patch b/flatpak-cache.patch new file mode 100644 index 0000000..3b04eab --- /dev/null +++ b/flatpak-cache.patch @@ -0,0 +1,23 @@ +Based on the Flathub patch but only skip the mtime test when in an ostree +(different versions have used 0 or 1 as the mtime for all files). + +https://github.com/flathub/org.videolan.VLC/blob/master/vlc-ignore-time-for-cache.patch + +diff --git a/src/modules/bank.c b/src/modules/bank.c +index 2e67a0d07e..ab2915fbb7 100644 +--- a/src/modules/bank.c ++++ b/src/modules/bank.c +@@ -275,7 +275,8 @@ static int AllocatePluginFile (module_bank_t *bank, const char *abspath, + plugin = vlc_cache_lookup(&bank->cache, relpath); + + if (plugin != NULL +- && (plugin->mtime != (int64_t)st->st_mtime ++ && (((int64_t)st->st_mtime > (int64_t)1 ++ && plugin->mtime != (int64_t)st->st_mtime) + || plugin->size != (uint64_t)st->st_size)) + { + msg_Err(bank->obj, "stale plugins cache: modified %s", + plugin->abspath); +-- +2.21.0 + diff --git a/vlc.spec b/vlc.spec index 2dcf017..b694009 100644 --- a/vlc.spec +++ b/vlc.spec @@ -65,6 +65,8 @@ Patch: lua-math.patch Patch: freerdp2.patch # fix build with live555-2024.11.28 Patch: live555.patch +# avoid "stale plugin cache" warnings in flatpaks +Patch: flatpak-cache.patch %{load:%{S:1}} %global __provides_exclude_from ^%{vlc_plugindir}/.*$