diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2015-02-18 10:44:06 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2015-02-18 10:44:06 +0000 |
| commit | d706135c319630a15a8ee1090e78adf9e4a54329 (patch) | |
| tree | d8ccdd1dfe1c2cb5ee795d57998856889750d996 /media-video | |
| parent | Add gpl & postproc useflags so that ffmpeg can be built in LGPL mode. (diff) | |
| download | historical-d706135c319630a15a8ee1090e78adf9e4a54329.tar.gz historical-d706135c319630a15a8ee1090e78adf9e4a54329.tar.bz2 historical-d706135c319630a15a8ee1090e78adf9e4a54329.zip | |
Do not enable old xlib based x11grab when xcb is used. xcb based grabber is LGPL.
Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/Manifest | 10 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 11 |
3 files changed, 16 insertions, 11 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 4ebe18f9ef9f..7a6661a6c9d3 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.830 2015/02/18 10:36:21 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.831 2015/02/18 10:44:02 aballier Exp $ + + 18 Feb 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: + Do not enable old xlib based x11grab when xcb is used. xcb based grabber is + LGPL. 18 Feb 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild, metadata.xml: diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index fb7088542df8..5f6f59e21044 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -22,14 +22,14 @@ EBUILD ffmpeg-1.2.6-r1.ebuild 11090 SHA256 04e0bd9aac8037358acbcbdfde2f50ec13a3d EBUILD ffmpeg-2.2.12.ebuild 12745 SHA256 b50acebb37c7d031c4b089a5321dd8b2a8e8bab93a7066bf10145b2e0aaf247a SHA512 2b421d0c856c6fcefc5b5be0ec68cc3ea32fb3d85ec1582d047a8a027bd71d903ca689f419e97e42002f8516f97b0c036212a8de18b7cf0c83884a3a2ccbf603 WHIRLPOOL edc9c1f64789606ab09c0e59bcae412568317704c2eb60e60be38eec5f011cb3bbb69849237e5979bc2fd6e30e8646feb76cafde3f0a8daf0ebe8c8c4bd06e97 EBUILD ffmpeg-2.5.3.ebuild 13170 SHA256 2a15f3059c17573de22426f05d4ac92816f74b58609c015bbe048713bc554a3c SHA512 e2942192a9fc9d9f56f7ee67140b68443fce54897b2a9803953d0754d186a4c743151a9dc6fca2dc829e471061caa6ecd56636e5a104399a327b054e983eef1e WHIRLPOOL b04fcb70986854c6f96c4cef296d207f49a8019c88ab5186db9ea25604c109acc0b3e565adc81a15eac7a0e9c840b15c53fca15709f0ca9991af1b20f379f22e EBUILD ffmpeg-2.5.4.ebuild 13172 SHA256 5d21a09da72c7105ca378a41866da07d6d16e0a31b18820c5fb64cec090839a2 SHA512 8e666d2b6c60d5c00c2756b40884212ab4956ef2eb58c52066c4e896abf63d7353ed7002b3bc12319cc1df99fb32011253b80b94209fad05eb613148b68e559d WHIRLPOOL 72bf0020aec52fd1fea88f11505845a6916f8708fbd647782c4df22df4b9d9be9dae40c0b83023aa1f8a17290a4e795d47fe7de0e78d159a48e3fda5fcee3953 -EBUILD ffmpeg-9999.ebuild 14347 SHA256 ee198f175980d8bac8de26c6e165c801592d252d6ac5a952685510735e1552d1 SHA512 4ff659da36940038a56e5aa1e13b5fd65b21f58ee4bf76dab7baebecc8b14ce85595f6c4b8d86d8dae10e985eecd72229b3daa0ae02047dcd1c989e98b3702b8 WHIRLPOOL 710776bbf2f6454bfa0c824d2838304d76de25f85ec753209ba1d7b4a0d493dbb682152ebcaa5e3075efa4cc132cc2d8fe80c34fc3ce53d5ac8e1a29e80a3d2c -MISC ChangeLog 1909 SHA256 7f6c5b346b4fac9a30a771d7286c0f828c6fbdea2f6929b03b73120d7c5453c7 SHA512 96ab9e964445b34c0fadab82db1c532bf6758e7be3287820a5796d6374dccd4dc585a2be0c17b161ec61ebd6b4d5d791eecbc960afe67acf745c47932179d7ef WHIRLPOOL a9197d07da94b05f4e3c7ac226a13c2db2940eae46532dcd00b6238fc05f84506100c6024c0b421665eef99e14d7f81595c4d4565c07dcc2e7289b9458525f9e +EBUILD ffmpeg-9999.ebuild 14396 SHA256 8f8c774750b198105aff96d1c0a07dc5da01107743dda99c281c8cc0b4f804bc SHA512 f0a98c615df68cfe8e0320879ecde9b791e6dd6f6323e95d3ed8021df753604e78c980089e7b1115345480250831080bd742e9b217e55a1378b3c0ebcffaf345 WHIRLPOOL 5192bc7b191da934cfe62081d422da49a0d66073a199908cda6163951bc4a7426295a913fbf5a98e845fe2212708b26aef7c88d3d66760348e5850ec2408885a +MISC ChangeLog 2068 SHA256 adb94783a677375fc9e46e903dc6fb39750a7d4b80ab8caf70665bdf9d347772 SHA512 e28a6c343d694d6b00b269439b8ddd563f156ce3ac353ed8218b175a3601c1935d7ed7519eaa04f3cbf135841bc89361d55cfa8dee916b4fa7d6947b2fd04022 WHIRLPOOL 84706a1d4298fd6f2ad8ef5fb711ec62d6fe30747dde5bba10800c69115f1d58fdc27fede4e6be6b185c4656ec0b0f60211f2b5ae9b886e44b7a84b78868ba24 MISC ChangeLog-2014 113291 SHA256 4c06c33d7ce130dbe891dac8bbed5394756966a4317815651276b5354aa943ca SHA512 1bd9eb77e715e26a406bf58a543987caf24051dec4f7fd928f6d03af41bf4d952dcdda7c6237cb2ffb9517f04adb9f8fcaac91087fcc758c0836c754050c5ae9 WHIRLPOOL 99024abbc682eee208a9086d0a5450a8855b18a6e20e51e0a19403c0669420e8448b1fd20d5d7558c51c1cc661eb6d3d18623b1dfc42cba9c5fed64f7822b701 MISC metadata.xml 4422 SHA256 2284bee6bb2e082a84e31f78adc599ecd9bd560476a4d236ad5c3e4b018a0b48 SHA512 e4eab5b9d72b45de9e9d7ff201e38b9177c0ac4bb6862bc9efade3196964c24690279838cfbd7e3df6072bc82d82de262dec6a4228ae0232d79462b9f282ccee WHIRLPOOL df4b8d518bcec2f9de5f65c7e79444edb63ae700b9f36917692c20085c3b326e34d7e50a1fbefc0c0a87412e87cc7a556b3859d6f3817cd6ea1d8bbaed572ff5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlTkayYACgkQvFcC4BYPU0rAiwCfdcPDpk0J/MxO/VYEbgS91yX2 -v+AAoLJPOX3el5Z/uYxg8o49UEz6SrVo -=4ulh +iEYEAREIAAYFAlTkbPMACgkQvFcC4BYPU0owQACfYv1e5bsIY5UzI5TZLXmdvX7A +8wQAoKU+jcxA5U5kDD1N7Vceeyz8ANlB +=cIr0 -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 9fc0eb827c1c..8511efb3e704 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.179 2015/02/18 10:36:21 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.180 2015/02/18 10:44:02 aballier Exp $ EAPI="5" @@ -184,10 +184,10 @@ RDEPEND=" X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] + !xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] ) >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] ) - xcb? ( x11-libs/libxcb[${MULTILIB_USEDEP}] ) + xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] ) !media-video/qt-faststart @@ -224,7 +224,7 @@ GPL_REQUIRED_USE=" x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) - X? ( gpl ) + X? ( !xcb? ( gpl ) ) ) " # faac is license-incompatible with ffmpeg @@ -293,7 +293,8 @@ multilib_src_configure() { for i in alsa oss jack ; do use ${i} || myconf+=( --disable-indev=${i} ) done - ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab ) + ffuse+=( libv4l:libv4l2 pulseaudio:libpulse ) + use xcb || ffuse+=( X:x11grab ) # Outdevs for i in alsa oss sdl ; do |