commit:     8a6a5557f973bc63809f47da1da5a23e2a7e2c0a
Author:     matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Tue May  3 02:54:12 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  3 03:20:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a6a5557

media-video/ffmpeg: ia64 ICE mitigations

Closes: https://bugs.gentoo.org/842201
Signed-off-by: matoro <matoro <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/25292
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild | 9 +++++++++
 media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild | 9 +++++++++
 media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild | 9 +++++++++
 media-video/ffmpeg/ffmpeg-4.4.2.ebuild    | 9 +++++++++
 media-video/ffmpeg/ffmpeg-5.0.1.ebuild    | 9 +++++++++
 5 files changed, 45 insertions(+)

diff --git a/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild 
b/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild
index 4646abcd5728..82599993e2d5 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild
@@ -342,6 +342,15 @@ src_prepare() {
 multilib_src_configure() {
        local myconf=( ${EXTRA_FFMPEG_CONF} )
 
+       # bug 842201
+       use ia64 && tc-is-gcc && append-flags \
+               -fno-tree-ccp \
+               -fno-tree-dominator-opts \
+               -fno-tree-fre \
+               -fno-code-hoisting \
+               -fno-tree-pre \
+               -fno-tree-vrp
+
        local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
        use openssl && myconf+=( --enable-nonfree )
        use samba && myconf+=( --enable-version3 )

diff --git a/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild 
b/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild
index 398b9df600b8..297bd22c24ca 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild
@@ -342,6 +342,15 @@ src_prepare() {
 multilib_src_configure() {
        local myconf=( )
 
+       # bug 842201
+       use ia64 && tc-is-gcc && append-flags \
+               -fno-tree-ccp \
+               -fno-tree-dominator-opts \
+               -fno-tree-fre \
+               -fno-code-hoisting \
+               -fno-tree-pre \
+               -fno-tree-vrp
+
        local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
        use openssl && myconf+=( --enable-nonfree )
        use samba && myconf+=( --enable-version3 )

diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild 
b/media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild
index c6fc34c5e8c3..6a6818ddac25 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild
@@ -355,6 +355,15 @@ src_prepare() {
 multilib_src_configure() {
        local myconf=( )
 
+       # bug 842201
+       use ia64 && tc-is-gcc && append-flags \
+               -fno-tree-ccp \
+               -fno-tree-dominator-opts \
+               -fno-tree-fre \
+               -fno-code-hoisting \
+               -fno-tree-pre \
+               -fno-tree-vrp
+
        local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
        use openssl && myconf+=( --enable-nonfree )
        use samba && myconf+=( --enable-version3 )

diff --git a/media-video/ffmpeg/ffmpeg-4.4.2.ebuild 
b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
index 63e94173555a..5d9c4833feb2 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
@@ -362,6 +362,15 @@ src_prepare() {
 multilib_src_configure() {
        local myconf=( )
 
+       # bug 842201
+       use ia64 && tc-is-gcc && append-flags \
+               -fno-tree-ccp \
+               -fno-tree-dominator-opts \
+               -fno-tree-fre \
+               -fno-code-hoisting \
+               -fno-tree-pre \
+               -fno-tree-vrp
+
        local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
        use openssl && myconf+=( --enable-nonfree )
        use samba && myconf+=( --enable-version3 )

diff --git a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild 
b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
index ed3c25df3c42..22a2b8e62697 100644
--- a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
@@ -362,6 +362,15 @@ src_prepare() {
 multilib_src_configure() {
        local myconf=( )
 
+       # bug 842201
+       use ia64 && tc-is-gcc && append-flags \
+               -fno-tree-ccp \
+               -fno-tree-dominator-opts \
+               -fno-tree-fre \
+               -fno-code-hoisting \
+               -fno-tree-pre \
+               -fno-tree-vrp
+
        local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
        use openssl && myconf+=( --enable-nonfree )
        use samba && myconf+=( --enable-version3 )

Reply via email to