diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-06-05 00:07:53 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-05 00:07:53 +0100 |
| commit | 9d1e33edaf09cde926d589461f40e378d4124be9 (patch) | |
| tree | b0a5a85acd92ce912a95245121dde9cebcf76b71 /media-video/ffmpeg | |
| parent | dafa6f367240d1f5329ca89fb6f78985dbdc025b (diff) | |
gentoo auto-resync : 05:06:2024 - 00:07:52
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/Manifest | 4 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild | 15 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 15 |
3 files changed, 22 insertions, 12 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index aee07db06d86..589aaf84c80e 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -39,6 +39,6 @@ EBUILD ffmpeg-4.4.4-r9.ebuild 20312 BLAKE2B 50dd3e95cf6277261dc983dc3d807a4a5ed1 EBUILD ffmpeg-6.0-r12.ebuild 20022 BLAKE2B 1d27958625368f9748d5a2a4a06bad7042795fd7cc0080285ee07ec98bef187ede3f0a327ce442a2c61d2f60adf84de014a916acd405ae4455ab2acfcf25cb6b SHA512 9469da9701053831748314d4a3ef750e260106113197384ecabca51cdfbacab79018e26096b3b5ea96080f849de9ec032462f093bd41eb57e73064185e40df06 EBUILD ffmpeg-6.0.1-r4.ebuild 20020 BLAKE2B c19d2af1c04d2c202fc84efda51da246f265b472ab414a3f613542cbc845e8d6e3e78d02ea4ef448866d6a711534ef181c4850bb75fc04c6c499755c0c4046ca SHA512 2f7e5866ce0f1d47332a1d8233b436a6d3680a75e5e406519387f177e3574cb9b7181169d8eb51273cf5fc5695f410ad12e1062ed3fc2d05fbdfa80c37d0a15e EBUILD ffmpeg-6.1.1-r5.ebuild 20309 BLAKE2B 724f6222ac5999f1aa80296dcb90390fd854688d76acf9981eaed04652e41dbe6c982907f26d8d02b1240d220ac0c43c365ec0eda2bc8f52d50641762d2d7f7b SHA512 8dc0b5537bb702bf08a71103c5a38a004790432b6865f8f4e657d6f7d1b32152532fbd0bc717a4a2b237a48f80805b26f11674f2bd533f23110194ffde906140 -EBUILD ffmpeg-6.1.1-r6.ebuild 20359 BLAKE2B 8df188ef17fd791580f8b99260d9df5d5292756a3a1391d6f856c3ead1e0005d4a6db3522a144720aec1ee4f0034255fe6bebe4334727ee07be2ce79879ec19d SHA512 242dbdda98204543379bf6bf3786b3143330a33010389cc4758a30b33f5821c0669ab577e80b72a56d286d5e0437fe6676b16d51c9c62adf2ff84133da9ac96b -EBUILD ffmpeg-9999.ebuild 20059 BLAKE2B 10591fc6ed5448828a2208c6e3950aecd007c901844fd7b6b7894c51ec301adcd07935617eba3f975dc9397d226303ccd761b1a0c40edf068cf8729ed10c5981 SHA512 44694bb25edc1fa33657d3da3affa04e682a5336d399d93585c27ae63ac33c26dc0f102e29151621de07727478b836667b8b12e4921ffc4a53a2cc65e141623a +EBUILD ffmpeg-6.1.1-r6.ebuild 20510 BLAKE2B 924d8763c95647138ef578a0a912c54f35d3b6c16281c17d7e46ba82546c13905b0e2fdb1d757b324832204e657845e77b4d9a802559bda65e3b7c17c8124630 SHA512 9653f6bf8dd6b69b11ad8b0cb3cf3446edeffd55625f923fd65023cd3189bf3505250d81f06d2c6dd354eaa8bc687256f32c4068c3187752cfb5f8e1632f8239 +EBUILD ffmpeg-9999.ebuild 20210 BLAKE2B 69ac39a6e5ce8615ff5da9c10f8d6c52fb0f1763382f6b4ad99cda8481741e99c9f61b2df9364735cb095de0fa7f29b8f76aa7c933deccd16c40accd9cbc597d SHA512 8be262aa0ca6865ced6d914b55f02e69add1b78b0a6628d37712045d256242bf77965c0d09b41736456a728b68aa916ffb62eb80a6195d7819f3e6eeaa6cac10 MISC metadata.xml 7897 BLAKE2B 3ca144eac26a80cd6bd85c51c72e65a879e50ef810bcfc926dabacbcf1e1b217973934488c75f32b9e2a872f3a9f2a1c5e075d01fe048d1076997792fab383a9 SHA512 aa06791277e42ada2f1c3af3f360939f289012f7a1283471b4490c584f88f3f82eb6552218c4bead5d3c85b4514536dd63860fff57f635b189bc78d22a84c43a diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild index 9f5bd8424035..78278c02f240 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild @@ -419,6 +419,14 @@ src_prepare() { ln -snf "${FILESDIR}"/chromium.c chromium.c || die echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die + + # We need to detect LTO usage before multilib stuff and filter-lto is called (bug #923491) + if tc-is-lto ; then + # Respect -flto value, e.g -flto=thin + local v="$(get-flag flto)" + [[ ${v} != -flto ]] && LTO_FLAG="--enable-lto=${v}" || LTO_FLAG="--enable-lto" + fi + filter-lto } multilib_src_configure() { @@ -510,12 +518,9 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && tc-is-lto; then - # Respect -flto value, e.g -flto=thin - local v="$(get-flag flto)" - [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) + if [[ ${ABI} != x86 && ! -z ${LTO_FLAG} ]]; then + myconf+=( ${LTO_FLAG} ) fi - filter-lto # Mandatory configuration myconf=( diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 867a4147d174..e6491c785ef4 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -414,6 +414,14 @@ src_prepare() { ln -snf "${FILESDIR}"/chromium.c chromium.c || die echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die + + # We need to detect LTO usage before multilib stuff and filter-lto is called (bug #923491) + if tc-is-lto ; then + # Respect -flto value, e.g -flto=thin + local v="$(get-flag flto)" + [[ ${v} != -flto ]] && LTO_FLAG="--enable-lto=${v}" || LTO_FLAG="--enable-lto" + fi + filter-lto } multilib_src_configure() { @@ -505,12 +513,9 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && tc-is-lto; then - # Respect -flto value, e.g -flto=thin - local v="$(get-flag flto)" - [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) + if [[ ${ABI} != x86 && ! -z ${LTO_FLAG} ]]; then + myconf+=( ${LTO_FLAG} ) fi - filter-lto # Mandatory configuration myconf=( |