commit:     088d1cd3dd668d0460b42632306fc612e13422e2
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Mar 13 09:47:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 22:51:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=088d1cd3

sci-libs/opencascade: backport fixes from v7.6.1

Package is not yet compatible with ffmpeg-5, so we restrict to
<media-video/ffmpeg-5. Reported upstream.
Not compatible with musl libc implementation, so we explicitly
DEPEND on sys-libs/glibc.

Closes: https://bugs.gentoo.org/832742
Closes: https://bugs.gentoo.org/834422
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24525
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{opencascade-7.6.0-r2.ebuild => opencascade-7.6.0-r3.ebuild}      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/opencascade-7.6.0-r2.ebuild 
b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.6.0-r2.ebuild
rename to sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
index bc1c5b551fbb..fe70db843047 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( optimize tbb )"
 # properly set up.
 RESTRICT="test"
 
+# sys-libs/glibc see bug #832742
 RDEPEND="
        !app-eselect/eselect-opencascade
        dev-lang/tcl:=
@@ -34,6 +35,7 @@ RDEPEND="
        media-libs/fontconfig
        media-libs/freetype:2
        media-libs/ftgl
+       sys-libs/glibc
        virtual/glu
        virtual/opengl
        x11-libs/libXmu
@@ -44,7 +46,7 @@ RDEPEND="
                dev-qt/qtwidgets:5
                dev-qt/qtxml:5
        )
-       ffmpeg? ( media-video/ffmpeg:= )
+       ffmpeg? ( <media-video/ffmpeg-5:= )
        freeimage? ( media-libs/freeimage )
        tbb? ( <dev-cpp/tbb-2021.4 )
        vtk? ( sci-libs/vtk:=[rendering] )

Reply via email to