commit: bacf6a5a453132f8d7ea9629a4d2d9084af2596e Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Thu Nov 30 13:24:05 2017 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Thu Nov 30 13:56:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bacf6a5a
media-video/ffmpeg: Disable gnutls if openssl is requested. Closes: https://bugs.gentoo.org/636696 Package-Manager: Portage-2.3.16, Repoman-2.3.6 media-video/ffmpeg/Manifest | 12 ++++++------ media-video/ffmpeg/ffmpeg-9999.ebuild | 10 +++++++++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index b5f4d3c91dd..edbfb34a175 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,6 +1,6 @@ -DIST ffmpeg-3.2.6.tar.bz2 9623111 SHA256 602b1a8c91bbc87f6e8897c0918d2bf1c7d4820d3888712f0ff0c1198a3f1e8f SHA512 eca75524374003eac78033bd2a744b459a4dc631c59150b6c9291e06a693bdd14e0b11cae9c800446f0648edccc066480c2b869bcb456a74eeabb91ab41f8285 WHIRLPOOL b2b5b78ae0a1ad0c44387e1241825a79cfe87234f1470d9095757b25ed724e04fe42ae96287e3242a80f6f74f380c5167b5388ddc6abf4d6738a1bc4af1ebe4d -DIST ffmpeg-3.2.7.tar.bz2 9622391 SHA256 d5a0f891ed7764876e3c2fd541adcab90641eefe9103ab4d8269a346b10ebc8a SHA512 a5b6df77d2d4ede0cc2f398b763d7405f43f43e37c11a596ec1a2a8921714875fd8fa9ffbcff84355854780872ab7313c859a4a19bf419298b4d3bc797ad8ac4 WHIRLPOOL 8c3f36cd1d254ce5ed3917d498124860bb9620a65add1a3461844565fddb6d315914d38cc9760b7e45ebe4e1818e1872eeaebe65a040dd738a5bcc6508233f7d -DIST ffmpeg-3.3.3.tar.bz2 9940959 SHA256 1069ac8fc7f52e566bea28b41b9c437246aeb5096f82fb26fa96dc7d5a10a473 SHA512 1cc63bf73356f4e618c0d3572a216bdf5689f10deff56b4262f6d740b0bee5a4b3eac234f45fca3d4d2da77903a507b4fba725b76d2d2070f31b6dae9e7a2dab WHIRLPOOL c90d2cc0d3fa7c3635a00c8039f94ff9e7b8413bd14400ddd6f1cccdc9cbbbfd2254ca2a209cefccd7e6c2f750b4594053d4c664eb2867ee208fe5657e95330b -DIST ffmpeg-3.3.4.tar.bz2 9944256 SHA256 5ef5e9276c311c74ab2e9d301c2d7ee10e1f2cbd758c6f13d6cb9514dffbac7e SHA512 d2257a71f9ae7856390b807d70bf643d4360fe4f2ad7c76af3ac5332cda353a1a543cdcdea0c510dbb6141f7a3a36ffbf26ae87b0ffc9ce4b3b7641814a40e3a WHIRLPOOL b28e0c37a70f7dba8af2599861bc748b2c7f0e56ff6e7eca86f45e94b4f9318c48a1ad8d2c3c5c9446f71f5fc1f20fadd240a9e638d39337158010c2ae00ad41 -DIST ffmpeg-3.3.5.tar.bz2 9945243 SHA256 1b434cff8a327e54fd0f611420996e3419c58b795d51a5b588ace2a674f1060a SHA512 b97eb61f1c8f8ee95d79c6c28b37a0a99ad7752605714bfe8827366d319aed8bcaf2403cefb856604e8d61bca54573838c2ea0d38fa89ab453ccdd46b104725a WHIRLPOOL d58c5df3fc3df25173a1a719f663d2821bbf283e346ddc289640cacd804e5cbc8359539f4b5931677aacb2c9e8a31d036b79492b00dbe2717c0c5563f2a2857a -DIST ffmpeg-3.4.tar.bz2 10171702 SHA256 5d8911fe6017d00c98a359d7c8e7818e48f2c0cc2c9086a986ea8cb4d478c85e SHA512 43a8825140efdd41e2dd53fb0475adeb74e003842690cbc189aea0f1af696eec675951db30f9742d063f4e31ae6883256bdceaf2cc73d1dab0d144f72a0741e0 WHIRLPOOL a283b2167d3f1ef88bf853ceb5bf87e889dcf61a0af69b610c601edb10ffd88fe6bce69a4cff88cc873440923f58a26f8ecdc43cbd3ca5d790e4950d53f9e7cd +DIST ffmpeg-3.2.6.tar.bz2 9623111 BLAKE2B 76ed10d969ec5e85c0ad23fee1118ccfd66689b07062dc51526fca5427507124751d957b57b1a002ba585b9d35afc80cc6f3113c559b160b2751fc526b3d304f SHA512 eca75524374003eac78033bd2a744b459a4dc631c59150b6c9291e06a693bdd14e0b11cae9c800446f0648edccc066480c2b869bcb456a74eeabb91ab41f8285 +DIST ffmpeg-3.2.7.tar.bz2 9622391 BLAKE2B 7d6f094ca0bd5e2cab02e051acc8e554873bca2d165fc9326de0b12e145ec939567aed95c01589c47291970a89fb3462c75d32db1c4c2c8cf6d4a14956cd8a79 SHA512 a5b6df77d2d4ede0cc2f398b763d7405f43f43e37c11a596ec1a2a8921714875fd8fa9ffbcff84355854780872ab7313c859a4a19bf419298b4d3bc797ad8ac4 +DIST ffmpeg-3.3.3.tar.bz2 9940959 BLAKE2B 0f12aedca08df05478b6bae8b6a0e5dca85cc2bb2a462713533e73964e709f07b84164bba81d29f2f739b81b4d5dbb86abb17ee8d7fccfb7f57305e3cbc35be7 SHA512 1cc63bf73356f4e618c0d3572a216bdf5689f10deff56b4262f6d740b0bee5a4b3eac234f45fca3d4d2da77903a507b4fba725b76d2d2070f31b6dae9e7a2dab +DIST ffmpeg-3.3.4.tar.bz2 9944256 BLAKE2B 72d42a16396882b30641fb057bb597f8e98ecfa482a087ece48189acba8a80a72e931e70ad961db8c01c93a556f619ebdecb39bae9d4559cc504d0f7eabf15a7 SHA512 d2257a71f9ae7856390b807d70bf643d4360fe4f2ad7c76af3ac5332cda353a1a543cdcdea0c510dbb6141f7a3a36ffbf26ae87b0ffc9ce4b3b7641814a40e3a +DIST ffmpeg-3.3.5.tar.bz2 9945243 BLAKE2B 0fb9aad3d35f6173085e5a790e84c3a45c2051b656e9fb12b13af372778861121d6595e1f929144c32c77861d101fdb2a67c4411907147bd5534ce09d0fae3b9 SHA512 b97eb61f1c8f8ee95d79c6c28b37a0a99ad7752605714bfe8827366d319aed8bcaf2403cefb856604e8d61bca54573838c2ea0d38fa89ab453ccdd46b104725a +DIST ffmpeg-3.4.tar.bz2 10171702 BLAKE2B 72af48359db365cf366c618e861571849f038a06da1da1ed0b232e02e423bb906e2b2b99a80aa56c276713344e37811bffdeff861d1c4745d6d28eb6d6fcbff5 SHA512 43a8825140efdd41e2dd53fb0475adeb74e003842690cbc189aea0f1af696eec675951db30f9742d063f4e31ae6883256bdceaf2cc73d1dab0d144f72a0741e0 diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index fa68683f56f..fee27cfb833 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -194,7 +194,7 @@ RDEPEND=" gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] ) gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] ) gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] ) - gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) + gnutls? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) iec61883? ( @@ -344,6 +344,14 @@ multilib_src_configure() { myconf+=( $(use_enable ${i%:*} ${i#*:}) ) done + # Incompatible features: openssl and gnutls + # openssl support provides a (strict) superset of gnutls support as of 2017.11.30 + # So, we warn the user and disable gnutls + if use openssl && use gnutls; then + ewarn "openssl and gnutls are mutually exclusive in ${PN}, disabling gnutls since openssl provides more features" + myconf+=( --disable-gnutls ) + fi + # (temporarily) disable non-multilib deps if ! multilib_is_native_abi; then for i in frei0r libzmq ; do
