diff options
author | Alexis Ballier <aballier@gentoo.org> | 2014-03-12 20:50:29 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2014-03-12 20:50:29 +0000 |
commit | cc8533432ce18714016205ec9252bca3b78f1b60 (patch) | |
tree | 45d0d3c947a1bf4bca55af65bbc5c619af6feef7 /media-video | |
parent | arm stable, bug #503630 (diff) | |
download | historical-cc8533432ce18714016205ec9252bca3b78f1b60.tar.gz historical-cc8533432ce18714016205ec9252bca3b78f1b60.tar.bz2 historical-cc8533432ce18714016205ec9252bca3b78f1b60.zip |
add x265 support, bug #502068 by Michal Feix
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
-rw-r--r-- | media-video/ffmpeg/Manifest | 12 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 7 | ||||
-rw-r--r-- | media-video/ffmpeg/metadata.xml | 1 |
4 files changed, 15 insertions, 10 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 0ca30e5d6df5..8ae99ddbdc92 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.720 2014/03/11 19:01:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.721 2014/03/12 20:50:25 aballier Exp $ + + 12 Mar 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: + add x265 support, bug #502068 by Michal Feix 11 Mar 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: disable xlib with USE=-X diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 2b9cf6204500..639a69bc8813 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -15,13 +15,13 @@ EBUILD ffmpeg-1.0.8.ebuild 9650 SHA256 84d1ef638cfe3c7fe5106e9c3d3ec7905cb5288b6 EBUILD ffmpeg-1.0.9.ebuild 9663 SHA256 555f55ea849c1696b1101c8b88bf3013c90e66355083a41294ae1149088e0278 SHA512 3b6eec2aed3ce504a59bfb7d6bc65a1e7ec96fd180e438d5a2ec729855f91d99970a2435dbf4c447c9d092649f4c7b33bf9de7f544341bfb19d5f32cf08a5e07 WHIRLPOOL dd73000403bc8b748c0818385c89990b922e114c5c7310a18f9483e4010220f09bee4db3e716b08e0beab364e0cc6d659ea90a62c85f69033b87cf18f605eb29 EBUILD ffmpeg-1.2.6.ebuild 8939 SHA256 0eb74cc40aab27a0b9031957e59fcddba75190ead03d00987d828dffcf4b32fa SHA512 614c8f588e6be9cc081225b3e05313273ec1e6394f05126e5ef8d2f0f0d3970f2f5e4b1d57f4ea868954a29428137611e13a29e1bca8bafb78f71fd68d8dafe6 WHIRLPOOL 8705bd3dd8cb6095b8970f0bae98f73c9b0243ea2c5b3cc8139c12410b7a0298412a821015461a401abaee0f79279ac3f572237c8468732e826fc876b4f49f0e EBUILD ffmpeg-2.1.4.ebuild 10244 SHA256 367938fd42fbe4fc6eba0dc63b18ab97eb8ece9e626bb736a26bca5aa08be8c5 SHA512 066c4d17588d95642235114057f8a486471b886cc78e791a4c10994dff717ec7120510d5894303ffb9b74ff4e8822a7a1d83b66abf83308c406cc1a8e3d094c8 WHIRLPOOL 8ff8507f4b88f78992083d08dad73f43dfcf3fc8e06202e9192938aebf25d2cc3f5a78d0399f6833047b68d1515f794a53a03228d79d0a71c30ceb5ff5960917 -EBUILD ffmpeg-9999.ebuild 10312 SHA256 f7fd379c9debf380227a53c9f33d7966adcea4f7fa5296b75cb8f54348006306 SHA512 3850def2f74e22ed5b6db6805e7dbcd52bf8349c50f5de02b6852ad400f0b6d9966dd2b2ddaef98c3acd07c4191cb68c823a0105acab7cd2bb2d02c2719ed76f WHIRLPOOL 81adec8a04bb0bfa0b24598a1f596542566d43f55e432c2708acb278250ea6650f59207be81478db05e41406795f8a5af81e7c18c66b9e489ecbc150fdc514c2 -MISC ChangeLog 100303 SHA256 846a64bef99974d0da8c3e547086ecdcb1497690b7c902597601aeccb9f8f59e SHA512 b973eba299fcdeb7022f0dc8d7ae4cb04bdebd3bca143c0f1a972c381decbe58ef8fd2381bf2219f28b66289198aa95f3a40f511302ba8b3d2cf0305c59f72e3 WHIRLPOOL fe367f980a995fee54d610c17e12fbe47ac4da6e0840bc860c752d61fdee532ad0f5f8509972fa01e46346ca8b16cdab1e4b725961f1de7f5d6387c8faa51416 -MISC metadata.xml 5175 SHA256 272f5c0872fdb00bf4c99e43fc01a2bdf3d62a5f1110ab8c684bee01087f2327 SHA512 40f072741d089598f010813021f89e62a9fd2ccebe0a0e48e43314ac3601568b75cc533cad0c3f139a02a4a70391cbf33bb7ddf1d50088a131acad394c007f71 WHIRLPOOL 998ee505287b62d225fdc3b9a255d18c9ef37d59ada1eefa7af2be96179bcfc6f5d7dfa9465e54a263310a2e6fb2a211cd1f087d6b8b0b7aa97b6f7e2855d1fd +EBUILD ffmpeg-9999.ebuild 10358 SHA256 42d2ebefdb5344786c424209e246be5857094a5ae43b208c977e7b0f5b5ad935 SHA512 3beaede3c93bf05b4ce5a2803bb87fbc233afcbd39091cc82016d9848bc1e65d3e8a2b7d36757562dae0a1765bc667023ef8c0cccc19f9baa0fa6a6f05e3f900 WHIRLPOOL 656bd706df539741db08e2492142187a4a0c2c169904afbbcb5fc10da25d3956180c0908efba8d1e9157355a7fdda8e9f311086c68fe89db78a4294d938ea2f0 +MISC ChangeLog 100423 SHA256 ebb7f73ef83a2e52b477eb80cc3811e13a19fca26921ef19d5ba6032dd41d15b SHA512 177d49690ff61e5e3882636bc14d0c3def49a585c07e74912d4526e1dd4991174c7843d50406b93b80255bd0f3048b0676ec0ca0b93367e34d1765b4678718f0 WHIRLPOOL 5b0e33b93fc5efc546fea73aaf0cd32d2b619c9a8de745df03650950675a1b3aa41928baf30d4751e4694e35b0b02ab42b9c9ac1ff289a7d0d9602f970d73687 +MISC metadata.xml 5256 SHA256 d92837a3019bf56fb1730c6af2587dc3843129e0628aba4626fbadf421602f86 SHA512 81963b64573402ccefc98be163b00c01f73eaebf03118ca20de745ee88be9db53d83eeb1e67ab048200db5da9af5fa9fe62de9731f525675ed5bb76eaa531d69 WHIRLPOOL 09b776a641335e117520451c93b4d7b3937c8b429a55d259028493a2637be4483f304a0da2486762b6427cd23df01afab04326adf0233bfe1d7675b23b4c36eb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlMfXXgACgkQvFcC4BYPU0q7RACgmdPGdh2McPD/+wlf+r0tk6iW -QF4AoKMB5AWu/CHrQIE2qUm6U3OOnSvL -=InLb +iEYEAREIAAYFAlMgyJMACgkQvFcC4BYPU0qORQCeIGrNUf4dCjjSvI/ShZFj6/v7 +SvsAnR2c7NPniXmTVMknuDtzHdk/tel2 +=tY38 -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 11f05546dfc1..cbd4d19f8e68 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.149 2014/03/11 19:01:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.150 2014/03/12 20:50:25 aballier Exp $ EAPI="5" @@ -46,7 +46,7 @@ IUSE=" ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal opengl openssl opus oss pic pulseaudio quvi rtmp schroedinger sdl speex ssh static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx - wavpack X x264 xvid +zlib zvbi + wavpack X x264 x265 xvid +zlib zvbi " ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp" @@ -92,6 +92,7 @@ RDEPEND=" twolame? ( media-sound/twolame ) wavpack? ( media-sound/wavpack ) x264? ( >=media-libs/x264-0.0.20111017:= ) + x265? ( >=media-libs/x265-0.9:= ) xvid? ( >=media-libs/xvid-1.1.0 ) ) fdk? ( >=media-libs/fdk-aac-0.1.3 ) @@ -183,7 +184,7 @@ src_configure() { if use encode then ffuse="${ffuse} aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame" - for i in aacplus faac theora twolame wavpack x264 xvid; do + for i in aacplus faac theora twolame wavpack x264 x265 xvid; do ffuse="${ffuse} ${i}:lib${i}" done diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index fd9fe5d23e28..cc93e339d0a3 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -57,6 +57,7 @@ <flag name="vaapi">Enables VAAPI (Video Acceleration API) for hardware decoding</flag> <flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag> <flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag> + <flag name="x265">Enables HEVC encoding with <pkg>media-libs/x265</pkg>.</flag> <flag name="zvbi">Enables <pkg>media-libs/zvbi</pkg> based teletext decoder.</flag> </use> </pkgmetadata> |