public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Simone Caronni <negativo17@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ffmpeg] rawhide: Adjust for vapoursynth renamed library
Date: Mon, 10 Aug 2026 10:00:28 GMT	[thread overview]
Message-ID: <178635602810.1.12573707579127776959.rpms-ffmpeg-92bc35fb532e@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/ffmpeg
Branch : rawhide
Commit : 92bc35fb532ef850b4bffc131dd65809d357d75b
Author : Simone Caronni <negativo17@gmail.com>
Date   : 2026-08-10T11:44:28+02:00
Stats  : +40/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ffmpeg/c/92bc35fb532ef850b4bffc131dd65809d357d75b?branch=rawhide

Log:
Adjust for vapoursynth renamed library

---
diff --git a/ffmpeg-vapoursynth-lib-rename.patch b/ffmpeg-vapoursynth-lib-rename.patch
new file mode 100644
index 0000000..adaa06d
--- /dev/null
+++ b/ffmpeg-vapoursynth-lib-rename.patch
@@ -0,0 +1,37 @@
+From 9013e697a56294a2a50e287c9a9c204f2aff6254 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 10 Aug 2026 11:37:39 +0200
+Subject: [PATCH] vapoursynth: load the library under its current name and
+ soname
+
+VapourSynth R79 renamed libvapoursynth-script to libvsscript, so the
+demuxer fails at runtime with "Could not open libvapoursynth-script.so"
+on any installation from R79 onwards.
+
+Load the versioned soname rather than the unversioned linker name while
+touching this. The unversioned .so is shipped in the development package
+on most distributions, so dlopen() of it only succeeded when that package
+happened to be installed; the runtime package is the one that carries the
+soname.
+---
+ libavformat/vapoursynth.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libavformat/vapoursynth.c b/libavformat/vapoursynth.c
+index 0fa5aff..765fada 100644
+--- a/libavformat/vapoursynth.c
++++ b/libavformat/vapoursynth.c
+@@ -48,8 +48,8 @@
+   #define VSSCRIPT_LIB "VSScript.dll"
+ #else
+   #include <dlfcn.h>
+-  #define VSSCRIPT_NAME "libvapoursynth-script"
+-  #define VSSCRIPT_LIB VSSCRIPT_NAME SLIBSUF
++  #define VSSCRIPT_NAME "libvsscript"
++  #define VSSCRIPT_LIB VSSCRIPT_NAME SLIBSUF ".0"
+ #endif
+ 
+ struct VSState {
+-- 
+2.55.0
+

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 0c3680d..0a93d6f 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -127,6 +127,8 @@ Patch1:         ffmpeg-codec-choice.patch
 Patch2:         ffmpeg-allow-fdk-aac-free.patch
 # Allow to build with decklink
 Patch3:         ffmpeg-allow-decklink.patch
+# VapourSynth R79 renamed libvapoursynth-script to libvsscript
+Patch4:         ffmpeg-vapoursynth-lib-rename.patch
 
 # Backport fix for CVE-2026-30998
 Patch10:        https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/18b83f2d0a0f9bcbafb0001a2911327c4b8df056#/ffmpeg-CVE-2026-30998.patch
@@ -248,7 +250,7 @@ BuildRequires:  pkgconfig(SvtAv1Enc) >= 0.9.0
 BuildRequires:  pkgconfig(tesseract)
 BuildRequires:  pkgconfig(theora)
 BuildRequires:  pkgconfig(twolame)
-BuildRequires:  pkgconfig(vapoursynth)
+BuildRequires:  pkgconfig(vapoursynth) >= 79
 BuildRequires:  pkgconfig(vdpau)
 BuildRequires:  pkgconfig(vidstab)
 BuildRequires:  pkgconfig(vorbis)

                 reply	other threads:[~2026-08-10 10:00 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178635602810.1.12573707579127776959.rpms-ffmpeg-92bc35fb532e@fedoraproject.org \
    --to=negativo17@gmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox