commit: df647d7dc1a73e0f4fc5d59eef4d18201e9f24eb
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 3 08:04:13 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Dec 3 08:17:23 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df647d7d
net-misc/icaclient: switch to ffmpeg-compat:6
Not the maintainer nor know this application, but blocking ffmpeg-7
is rather nasty so going ahead with changing this.
Normally it'd use its bundled libav* inside ${ICAROOT}/lib but the
ebuild does `doexe *.so` which excludes libav's *.so.{60,58}.
Arguably using bundled would be fair if it's going to use some ancient
ffmpeg and potentially block future cleanups, but not going to impose
this change myself.
Given ffmpeg-compat:6 is not in LDPATH to avoid conflicts/mismatch, do
symlinks inside that directory which matches how it'd normally be used.
Not tried runtime but it seems to find them fine:
$ ldd libctxVideoDecoder.so
libavcodec.so.60 => /opt/Citrix/ICAClient/lib/libavcodec.so.60
libavutil.so.58 => /opt/Citrix/ICAClient/lib/libavutil.so.58
Closes: https://bugs.gentoo.org/967025
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
...{icaclient-25.05.0.44.ebuild => icaclient-25.05.0.44-r1.ebuild} | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net-misc/icaclient/icaclient-25.05.0.44.ebuild
b/net-misc/icaclient/icaclient-25.05.0.44-r1.ebuild
similarity index 97%
rename from net-misc/icaclient/icaclient-25.05.0.44.ebuild
rename to net-misc/icaclient/icaclient-25.05.0.44-r1.ebuild
index 9343f385cdcc..fc9f017c1083 100644
--- a/net-misc/icaclient/icaclient-25.05.0.44.ebuild
+++ b/net-misc/icaclient/icaclient-25.05.0.44-r1.ebuild
@@ -66,8 +66,6 @@ RDEPEND="
media-libs/alsa-lib
media-libs/fontconfig
media-libs/freetype
- >=media-video/ffmpeg-6.0
- <media-video/ffmpeg-7
media-libs/gst-plugins-base:1.0
media-libs/gstreamer:1.0
media-libs/libogg
@@ -78,6 +76,7 @@ RDEPEND="
media-libs/mesa
media-libs/speex
media-libs/speexdsp
+ media-video/ffmpeg-compat:6
sys-apps/util-linux
llvm-runtimes/libcxx
llvm-runtimes/libcxxabi
@@ -173,6 +172,10 @@ src_install() {
exeinto "${ICAROOT}"/lib
doexe lib/*.so
+ # ffmpeg-compat libraries are not in LDPATH, symlink them (bug #967025)
+ dosym -r
{/usr/lib/ffmpeg6/$(get_libdir),"${ICAROOT}"/lib}/libavutil.so.58
+ dosym -r
{/usr/lib/ffmpeg6/$(get_libdir),"${ICAROOT}"/lib}/libavcodec.so.60
+
for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
insinto "${dest}"
doins nls/en.UTF-8/eula.txt
