diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-10-26 00:10:07 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-26 00:10:07 +0100 |
| commit | 95461df035e3867364495f065e5e805bf629b2d7 (patch) | |
| tree | 867dce371a84a696e91be255d89f282975aa0480 /media-video/ffmpeg | |
| parent | 46eedbedafdb0040c37884982d4c775ce277fb7b (diff) | |
gentoo resync : 25.10.2021
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/Manifest | 4 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-4.4-r1.ebuild | 2 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 10 |
3 files changed, 12 insertions, 4 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index f9cdea0a7f2c..d82d1ee03651 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -11,6 +11,6 @@ DIST ffmpeg-4.4.tar.bz2 11489948 BLAKE2B a8dc007e260896228789d27339402e846cd2175 EBUILD ffmpeg-4.2.4-r1.ebuild 17663 BLAKE2B c984c43f5f7d3298b7f9d577a62e9babe9003dcf4a5c6114005488f79e82a7e4a983cad7c05574773ca05cc425743fd5c74d42cc747989589d46527c1f0f73d6 SHA512 7d1bc4483da9b15fe9ecb83392f3010f5fec7c9e252d51416f1fd4d62291893c7f6ffb32a76a2ec528a8a0449a8d8c93d2f05cb1596d30b67a4cd2d1c9878dae EBUILD ffmpeg-4.3.1-r1.ebuild 17767 BLAKE2B 633604edd9a395d2fb03c7fa5145e4781a52c65ff53d7f2f7fbe6c2f4ae0e4df9ec5f308cb06fbfa197475e9514e961ff01afd1098881605ae5b1013587c9adc SHA512 17eed1b0ab7ecc1fea5b91e02acf686c4239b7bdb5a94777944d08c35889c22046665f8a0f7e7c40aa7946727f0bbbb4a6c9a9c043302419a83a5fbb8c7b1668 EBUILD ffmpeg-4.3.2-r1.ebuild 17750 BLAKE2B 7d8a0ca3154efebe7192bde4953fc680eb91a2cca4abf771ca4a29ef2b5162504f0e27857d4d54b7ab8148538acbb79131f8d29b6ac775160786981d763dea49 SHA512 f6ec1e3e150f644063c241b52bdd607de12b6f87515f98581ad412ce6ab8b0e1864b6c045887b21702743980b9ac0eded342bb49e81883c22a389127dabbe221 -EBUILD ffmpeg-4.4-r1.ebuild 17799 BLAKE2B cc7c5ceba76077f1de30988497eba966081d2f79a112a8c322b6c78467ac95ed7aa4ed8c10edc7dae3b4aef6e946eecf5dc2ebadb252229d0fc7843333c8f56e SHA512 1c34f377abc5206b5b8e8c845648d0ba9d9ae7d8b610cde0ca8421511cd7418224b6976c271e82c47b9b9e4f47754d906c21c4fc080f8287e7e3d89bdd6afb0c -EBUILD ffmpeg-9999.ebuild 17606 BLAKE2B 8089c420a6dba573766c12f343778c56d55dc83198514801329b79d466051d6e957b6ae1967ae0a827340803576f4e3c3682494ed46614a6965893f49b957753 SHA512 f6597bb038c6940541b4cea0267734ea0080c872b155d9e12b92e1f845f3fd44cc906cd75a6d043ac330a3605176916df70610d4ae4dc4ad9dd2d7c44c84e7e3 +EBUILD ffmpeg-4.4-r1.ebuild 17818 BLAKE2B 87e0944f0e72a80daf75867fad31224bf41af5fd769ef468734cdb5cc1827f077336596b66eee7e9fab0a44d12de65c28a6f03a5180e43312b965826200846fc SHA512 0373d1564a9ddce54022b204bb47c46c219000880607d4e33fae0c7adc02d1e530396eac7d28b794a18c7583c1a668880253856f21c24c926b45dce9237e7164 +EBUILD ffmpeg-9999.ebuild 17776 BLAKE2B 2f41cd9417090ea5badfb24cdad7b09d8cc6166be18045ae8d74853f8873b12f5777c6afdda5c7f58a88f92bc62dacd612844dccd93ac4b5dcf7315ac6957905 SHA512 65f28bcd2f03a3b55e72c6c9c0355e411aecc3bd78b72623d87533b7da6c411b3904921b661ca8109c273bee7c2158bf26e8c8bcc256f9f1bb4df473baa6f890 MISC metadata.xml 5956 BLAKE2B bf1e10c3a081c721dbaccc7389d1b35c3fdb844be0d5a9b674b154e7cbcef10c00a21fc38401819dbc0d66d6f1c5755dbf482ecdf43e1a43f2c76217af4d4ee3 SHA512 1fc8eee61c9b2d4108cacf52f64173d72e55797e0d87201f71fd35d873256aa0944361305f4c47e3bea39dde0007319643e60adbc64b984de56f3251b2ffc5a8 diff --git a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild index 9dfdeaccd48a..4f4969b77333 100644 --- a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild @@ -455,7 +455,7 @@ multilib_src_configure() { if use arm || use ppc ; then # bug #782811 # bug #790590 - extra_libs+="-latomic " + extra_libs+="$(test-flags-CCLD -latomic) " fi set -- "${S}/configure" \ diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 21212b25c0a4..442b6f27b0f3 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -59,7 +59,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" fi # Options to use as use_enable in the foo[:bar] form. @@ -450,6 +450,13 @@ multilib_src_configure() { $(multilib_native_enable manpages) ) + local extra_libs + if use arm || use ppc ; then + # bug #782811 + # bug #790590 + extra_libs+="$(test-flags-CCLD -latomic) " + fi + set -- "${S}/configure" \ --prefix="${EPREFIX}/usr" \ --libdir="${EPREFIX}/usr/$(get_libdir)" \ @@ -464,6 +471,7 @@ multilib_src_configure() { --ranlib="$(tc-getRANLIB)" \ --pkg-config="$(tc-getPKG_CONFIG)" \ --optflags="${CFLAGS}" \ + --extra-libs="${extra_libs}" \ $(use_enable static-libs static) \ "${myconf[@]}" \ ${EXTRA_FFMPEG_CONF} |