media-video/ffmpeg-{1.2.6-r1,2.2.3-r1}: revbump/merge, fix some typos

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 9 insertions, 9 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 3441f76..2c3422b 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -6,7 +6,7 @@ AUX freiordl.patch 611 SHA256 4857bbf856e2014f41d89d0ed0744f7bb3277e5600a877f2b8
 AUX ladspadl.patch 723 SHA256 b660bef2bdd4ecba5c3ec04fccee16f4ed3eab0dc7f125f19ab004274df7d17a SHA512 fa2022e2ac73cdf63a7ebdcc71672123adf223b4eca4ee027974a3de380f54378d063166c7048c243ccfb2a95b8ebbd1115f010fe9e491bbdcee7896c523d790 WHIRLPOOL c2d175d1e953117365a929ba85d75b0fc5e60ae4e23a00a2998c6f62c00084a3d78becf027ef2710f8768cd7528b333dfad9dbfea049a7d2f45b5b66751e16a4
 DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88af7880f733525de12bde70999c SHA512 bc3aa640549e7f17f3a24a7d866a89ab23e9920c2d655a1a03bb4b85b8bdc33500bce3ba6fb570376453c158291a6f4bd2953f258d5a3f989cbdcb30e9a25ee4 WHIRLPOOL 6959a0e72b98dfb56381010f06f98d387a6389037d214f8d600d868d41baddd73417b5df7b00c8b160f6a59778c20c27708d2cc115dde76d6c94dcfbf307b51e
 DIST ffmpeg-2.2.3.tar.bz2 7025230 SHA256 670dd41511be0ebd0e5d1706b92da0b69abaa4df8ece3ed90ebc78acf199d2b8 SHA512 cd07480760455cd4b2173a5630abfedcb939eea0c169c98ed42ef04b93644406bc7599933e593af53fc8fb7ba536ca526a59fef25e301ef839d62aecfbb41348 WHIRLPOOL ca06f44dd5450829c9ff499436ac8df7ae77dea28c542d443a26fd3cfbc43470c106f8e0f27b71838c5b1dec9669d7c53a7845254b4f9d67f2d4c8bc786c10b5
-EBUILD ffmpeg-1.2.6-r1.ebuild 10217 SHA256 f85ca2f99162bbe47409acaa18759d51d5720dba06fcbc59755e4e52d8619330 SHA512 338226a6a695e55d8e47308781f898c4d18f618a9da8109fada123797e7b95c24f32a7439c49d074b93a91176dcac80024ca4a07d74e422bafd1c261627da1f2 WHIRLPOOL 812d794ec82b30388171889996e8bda05699e2a3342a5d4a20d0e1ee523c7c8b07972ae2505c7b11331a2cfbcd9fd597ced8fcdee674d7c7abf968df2d7c99e9
-EBUILD ffmpeg-2.2.3-r1.ebuild 11766 SHA256 d520dee2386d7ec034c0b8d45e75f2e6385e1a3abfbf21566766409db6810ee3 SHA512 0822f00067b0d7d27791f57b15d0624bb5ce868ce32e4afc64f5159d29ef3e49d5f2c19b4076153eefd8b08b151bd80538951b72434978dfa9909381996fde86 WHIRLPOOL f6b19fa54a90372380679913c649885ff546c04ee6ece987d1bf5da7e0841cfd3171b55ce2051b7bdf46df045613d31cd084df47b30548fa2bf21ac29b29cd99
+EBUILD ffmpeg-1.2.6-r1.ebuild 10265 SHA256 02d147a7ec17bf2533175e5cefb7cd74421cd3d0ee046fb33e02a8130ada22a8 SHA512 bfb7a0e26fc03457bd9aa1483e546ad6e63b05b075443e799d549e2a559969059a9aaed4f934f01c8d1246d9111e5f5a1d6ec58559b3f22901790a3e8e1cfeff WHIRLPOOL a04c6960395d3905df5b57ff6775f251b74f79dd72d6f2128d0b0a179c5d7b80203f9d8cac072162501276e417e7f006d3fab6d30857ddca248a629f674db0d3
+EBUILD ffmpeg-2.2.3-r1.ebuild 11791 SHA256 5b2c3cbfa9648f0ff17040d4eb8fab18b4f2439d406b1d5d2d5d0c3202b1cb0c SHA512 1abc189ae92e55ee641593f78ee65d7ac0c9b9ddf9662f35efe2804fa2291ea02471679216381558a9dc794c0a9ff0df34ae4b99883b3a48d3c53b7ccb19e266 WHIRLPOOL 0e56852943d85aa293b41633312039cbaf1fca70fb96a866e54c193740cad6baf482820c7abfad7090e45ae20a7a24cec8345e06b4b79ea372c03e2d923b5f9f
 MISC ChangeLog 102751 SHA256 707f2ee4fe845aecf180193ba329096ac2f449b45b7d578cc3611aabba3603c7 SHA512 3e7995bffbb15ad33dfeed39ae0b2823bc9e8f54b354bf0a5c37c14d1d498737c4d952ba03c502b616ad69d57a8b68acd1d8898d192c78bf082cb67125742db8 WHIRLPOOL 12d0abc705e84cd9251949a940c05e497f9af021f82686aa08f02105b6b93529336a36d9808eca5e4450ef01eecc5d3709b05b2c6ea51b3fc656ab05daa6782c
 MISC metadata.xml 5340 SHA256 010fe23d4fce67e3ebfdba2d3d0e4c4ecf7cb12885397c2058096955733f19a3 SHA512 8b1e55fa5896382e700ff61be266b635b2f3873ac7e29f331cc3a31be683cf9b2e24d93b52cd109149dab2d98ae58f5151dccdc8e6f48f2abe56382a11a471db WHIRLPOOL 420bfe98b7d0b58cdc56f76cdcf74fb1fe69df2ec6501d1444202786465ad63d255ca1a63340d52bb4586b19b1f14fb1ca859f8798071644c95f1d200cd281cc
diff --git a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
index 6636870..90ab40a 100644
--- a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
@@ -95,7 +95,7 @@ RDEPEND="
 	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
 	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
 	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video,${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )
 	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
 	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
@@ -111,7 +111,7 @@ RDEPEND="
 	!media-video/qt-faststart
 	!media-libs/libpostproc
 	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-medialibs-20131008-r1
+		!<=app-emulation/emul-linux-x86-medialibs-20140508-r1
 		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
 	)
 "
@@ -148,6 +148,7 @@ src_prepare() {
 		export revision=git-N-${FFMPEG_REVISION}
 	fi
 
+	epatch "${FILESDIR}/dirac_arith_hardened.patch"
 	epatch_user
 }
 
@@ -159,7 +160,6 @@ multilib_src_configure() {
 	# or $(use_enable foo foo) if no :bar is set.
 	local ffuse="bzip2:bzlib cpudetection:runtime-cpudetect debug doc
 			     gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi vdpau zlib"
-
 	use openssl && myconf="${myconf} --enable-nonfree"
 
 	# Encoders
diff --git a/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild b/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild
index 0384126..78f4882 100644
--- a/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild
@@ -92,11 +92,11 @@ RDEPEND="
 		twolame? ( media-sound/twolame[${MULTILIB_USEDEP}] )
 		wavpack? ( media-sound/wavpack[${MULTILIB_USEDEP}] )
 		webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20111017[${MULTILIB_USEDEP}] )
-		x265? ( <media-libs/x265-0.9:=[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )
+		x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )
 		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )
 	)
-	fdk? ( media-libs/fdk-aac )
+	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
 	flite? ( app-accessibility/flite[${MULTILIB_USEDEP}] )
 	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
 	frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )
@@ -141,7 +141,7 @@ RDEPEND="
 	!media-video/qt-faststart
 	!media-libs/libpostproc
 	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-medialibs-20131008-r1
+		!<=app-emulation/emul-linux-x86-medialibs-20140508-r1
 		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
 	)
 "