Remove old.

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

17 files changed, 21 insertions, 1184 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 96c918df5afb..8edb604a4bdd 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.186 2011/08/24 02:44:23 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.187 2011/11/12 08:10:33 radhermit Exp $
+
+  12 Nov 2011; Tim Harder <radhermit@gentoo.org>
+  -files/2.5.3_field_asm_fix.diff, -files/avidemux-2.4-cmake264.patch,
+  -files/avidemux-2.4.4-gcc-4.4.patch, -files/avidemux-2.4-i18n.patch,
+  -files/avidemux-2.4-ts-cmake.patch, -avidemux-2.5.1_p5428.ebuild,
+  -files/avidemux-2.5.1-build-plugins-fix.patch, -avidemux-2.5.2.ebuild,
+  -files/avidemux-2.5.2-altivec-bool.patch, -avidemux-2.5.3-r3.ebuild,
+  -files/avidemux-2.5.3-build-plugins-fix.patch,
+  -files/avidemux-2.5.3-fix-fgets-fortify.patch, -avidemux-2.5.4-r1.ebuild,
+  -files/avidemux-pulseaudiosimple.patch,
+  -files/lavcodec-mpegvideo_mmx-asm-fix.patch:
+  Remove old.
 
 *avidemux-2.5.5 (24 Aug 2011)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index fa8df7d430a6..c384f175dfa0 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,15 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX 2.5.3_field_asm_fix.diff 4377 RMD160 d7f90a7086ac1a1112681832eb9af9d6d0ea73dd SHA1 bfd66b5a5cc98f2f1eedf2f3a9b67a11cdb973df SHA256 6f8093983b0bd53ef50e2f7aa22beb85147c2a4566c0faa9416fb90f282aa6b5
-AUX avidemux-2.4-cmake264.patch 820 RMD160 e02c32891a257dd6e14e2b6aa464232cea222429 SHA1 387804ad24a816a24a036b57692cee9ff13e728f SHA256 693958df6c16d467e3c4a0b9dc56861c2c1bf8eed051de5cd7422b274d5d68af
-AUX avidemux-2.4-i18n.patch 1676 RMD160 5cc06702f8a4d96a12630d4f543035baa5ccac0f SHA1 32557519caeed3b236f48b40d5ee8953b2d03197 SHA256 ab978ed96a2689af2e01ad8b9a08ed9bd4b2f8e4c6721d9598964f1fd8a5e6d2
-AUX avidemux-2.4-ts-cmake.patch 517 RMD160 10796376d71b67ed7881db397679ea1888b868b1 SHA1 a05f8853bbcc55c28f1aa957335b90fd0e655b1d SHA256 980fd8a1404e66fbc33ffe4161c8018313e32ad06eee28d80e978842d49c6d12
-AUX avidemux-2.4.4-gcc-4.4.patch 3946 RMD160 1be6fb90f05befb0399ef38ccb6358d082f27b0a SHA1 63de9ce7999af1b9f94c01b14ccd049c2b27f32a SHA256 d8e2392b4eb4a0e5573fe5bac10a9ac57ae0f16207e613543d8e61d7527914af
-AUX avidemux-2.5.1-build-plugins-fix.patch 438 RMD160 4ddd7d69679940efbb783149e5c994e2036e65ea SHA1 5988536e2d74fe3b050026fee6a22ba0a85d037b SHA256 4316a65d59a3eedd482ae845d586d50e67311cb4a7c8680aca3d67c575c53a1f
-AUX avidemux-2.5.2-altivec-bool.patch 330 RMD160 694d756e3ea022b95833cbf988d363950787358d SHA1 437a342b63d66eb817e46a0a67ea3a4e4069aef8 SHA256 4fe3455a9e7441e19160814147385d98106e69ea21e7172f87c429bfca9e5744
-AUX avidemux-2.5.3-build-plugins-fix.patch 469 RMD160 9788ca88e4016b90e7e4fd2a17db0dd7abdcd324 SHA1 833d977f6ea873d611f01111de8f6e4abf43cc17 SHA256 579fd684d271e4858b35187603065e03a1fb6f2309e9d4e76ae2c30719c78d4c
-AUX avidemux-2.5.3-fix-fgets-fortify.patch 1313 RMD160 8f0d81b331ad6f28f3e989f11a07a7d9b3fae4d7 SHA1 c41b1116970660a051c87c7e536ad36e1ca5a3e6 SHA256 f75bf00058715479d4e1d531e81aefc6db8375de509b3001bdba0332a6bb09fd
 AUX avidemux-2.5.4-build-plugins-fix.patch 497 RMD160 5099949dfb00bfcda59cfc00d9bd25c0ecd60807 SHA1 df33b52bedcce4db40b4f85f2238e2dfd3e973a6 SHA256 a470bfa50d86082f4e9ad31c5be630efe9a237f8dd504058278968770635ecef
 AUX avidemux-2.5.4-dummy-sound-fix.patch 476 RMD160 6c784197aa444a1722f0b540d1da02bd4b5d7aa3 SHA1 1ac354248a653d42f87820a1911a4f35888ec7ca SHA256 652c5403b93fa2b4f400d2790dbe75c36b8f98ce1a7d4d0647307e67888683d3
 AUX avidemux-2.5.4-openfileqt.patch 1285 RMD160 3958f97459b093daf297a5d85b199b2b565202f7 SHA1 acbe1c6504c37f6273b046ec79ac9306a15265d1 SHA256 0862ffa672d9b8d9f48d9b07b384e70be304edde080280cbfc8f3b2fc60bda13
@@ -17,30 +8,20 @@ AUX avidemux-2.5.4-x264-build115.patch 1924 RMD160 44b0a75844f8236e7f2363b3e4dd0
 AUX avidemux-2.5.4-x264-version-fix.patch 4001 RMD160 9644a443bf6b9ab31c02ff628525504291bd7f03 SHA1 a75529d04ea9fb1ebf21d9c9d19c332389bda3a7 SHA256 cce9317b111ff08bd47aee52bf417abeadac90f8bd8076461ed5abcbc20ce213
 AUX avidemux-2.5.4-x264.patch 1248 RMD160 9f797ef1e22931088c19ef336d26c64d003446a1 SHA1 02f0e48332f679cddc3f52d95b6d36b1ac2fb9e7 SHA256 d7358d15c84132893f4509f46a887c8749cfb22bac42601f2afbbec1340b422a
 AUX avidemux-2.5.4-xvid.patch 1250 RMD160 8be1d4553a02a20a1ab14471adb46ebe4c5bf362 SHA1 0128d046cb78e52d6fab4e2c4098cb2db2434959 SHA256 679b6d9d2ac05fa74a29ff2fa74b3d9a425e841b39426c84a2203e308b66b85b
-AUX avidemux-pulseaudiosimple.patch 840 RMD160 7ac4ec7030524c94400cefc3eaf7b9cc55b65958 SHA1 4cff8353b11008c7da880357ef32c4c59fdcbe50 SHA256 1fa35c31f95e7276e816c47ba46977e4ad102ccf70652f95196df1bf9a1587b1
-AUX lavcodec-mpegvideo_mmx-asm-fix.patch 2443 RMD160 3b1b315ef1e5083f95807ce5419196c832a66aad SHA1 0bd5ca05d373f7fd63cafb03d5514cfc86d8504c SHA256 c6cfcf06da8a254e542077a7ac728be220d41fc0ad3c4b7001ac63de5f36bc6c
-DIST avidemux-2.5-r5428.tar.bz2 11433656 RMD160 ae72e5d03f2c12b1a9e64ed9cd57a00c84eac841 SHA1 d29d7a2d1054108bc20b4371be9c5ab29816a2e6 SHA256 42e3d596d8ac106120f88a77442a5a916fd34c64b09940f70d3156221cd7e50c
-DIST avidemux-2.5.1-patches-1.tar.bz2 3700 RMD160 6150cef25c8411c76816f800bc1d688e2771bebe SHA1 bdc6aab3f19c1ef71f3e04c23435f22452651fd9 SHA256 bcd472ea7c5f96c8bf8f48c2c93d53804912e94c77120dc8739e2c0ab122d69c
-DIST avidemux_2.5.2.tar.gz 13593297 RMD160 133df6676d6ac608c31d130897b54a47c54c7055 SHA1 7fbec6f832b31b45a979184b8d1cf32c61a71e5f SHA256 685e37b936f646de6fe65973c95ca9708959e7b6e66d0f6b17a6cc988e2ef8aa
-DIST avidemux_2.5.3.tar.gz 14309500 RMD160 680963060cdb959d1791a4c0d481eed0e426214d SHA1 073e20007ba5097790cf84cf94b6002c54953395 SHA256 4bcebbb3543250053b784414bca1c22d1313107bf3909444d6026e470aecc2cf
 DIST avidemux_2.5.4.tar.gz 18154965 RMD160 e20454a558210d5f7ab1418ae4013b618d1001d9 SHA1 83d6f6d87442ce4fc4e4806735ec27ef5e90364c SHA256 355bd3d235f6b3d0af65cbed535f51a1a7213c8abf8794af8b8d2cf88c1d720d
 DIST avidemux_2.5.5.tar.gz 15738941 RMD160 0303642d97dcbc165f27273d451b92804227a5a5 SHA1 bb4271390f2fad4eaf212b620622a11c084f0dd9 SHA256 c5bf45298911e00b06cf48ae4a936525d28cc2dddd4f41ee22e689b023b4923a
-EBUILD avidemux-2.5.1_p5428.ebuild 4857 RMD160 4fd54ea871c0d7538dc912cfa41df99de09f5f93 SHA1 d0e2b7698da69c2dccb36dd4955e4f2ffe341185 SHA256 6015b26c03e792621e3ad3b517e3b10452b1fda0c4e691190db9beb0ef93da0f
-EBUILD avidemux-2.5.2.ebuild 5052 RMD160 ca2ca7915983430614dbcca64945491a8f7eac07 SHA1 3218e147678317326c8fa88657a175f800d22d79 SHA256 97e2f83b5cbdaf3f41551814193ebe4f1e99c4dd03d174428a00bacb1a1449f5
-EBUILD avidemux-2.5.3-r3.ebuild 5165 RMD160 99a00e99f0f186bb0c18728ba66d83467daaf680 SHA1 cf6f88c8454ff8b5142ad26465fa12e0c8a66486 SHA256 80e79c241eb193d6b9761dbdd157bc0005e4641884407d36eedb6f08eea91723
-EBUILD avidemux-2.5.4-r1.ebuild 4354 RMD160 acaf65aacd80de3f8b1d6f7c32bc15058030c2a7 SHA1 a9b7ba0ff81fc126aad8e54c32a48563985a4608 SHA256 dd399bc2064d9e51e1f96e03de6fde8e2e02d3cbf897f5044c419383f9f03e4f
 EBUILD avidemux-2.5.4-r2.ebuild 4573 RMD160 476437402af4f5197d3e535de5423c58a181893e SHA1 f7e65945685fa3cd833f4db2d244ddeb57f6406a SHA256 d22be01176cf95574715a88437896d739416aa61ae14fcbd0687984d532a3a1b
 EBUILD avidemux-2.5.5.ebuild 4261 RMD160 1bae29c6ef5e642a47c8be819fca336aff8aa5f1 SHA1 ee6df02ffb1e875099bd4a6db17ef6fb62a72bb0 SHA256 156e82f0309f1d9ef316204b60f64f1cde991df2f7e0f5f5000494cafbe522f1
-MISC ChangeLog 33819 RMD160 da9a2b4360a15db581e0099199cbeca3b765383b SHA1 fee13a69685c88ec5c5d1594f0b86724682e852d SHA256 30402931e6b8f9fc320879e4a629c40656f8cf61ca801301011498a5f2becece
+MISC ChangeLog 34451 RMD160 a2fcc082bd82cdc07649f8112a74098a8fd669a4 SHA1 bca3b578f25fbc9d45f85de4f09da654d9213743 SHA256 7e7ec9e7d4648c14189d4f1658a650a68697d29a6c5b8fabe70834ac7c4abc1b
 MISC metadata.xml 385 RMD160 c434ac5525d87786bfb7109a81bee4a5eb36f24a SHA1 473eae98f7fc44b8a373e15e18a86ea63c47d1bc SHA256 827ca0bd67c11039bbd1beb06b5219771b37e617319b83db46be716e40b6f7b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOVGWeAAoJEEqz6FtPBkyjObUH/3TWOymUXQ3E5T5wiQu9zf2K
-BO5AVjrd8MeS0BS/MLwejMdV1ir3NYYhYOf+Q5/um2tAd0uIR4Xpde5gGKcBBxiv
-O7FugDJuGn00I4kP/KYd2lUi6rPw4jNGOrK77953EcoaV2hgD36HJpeEp9yNki5u
-ghODtSzAq/N2JFUSo8i8WCJa1vIbbeV7rD1C07DTod5VlZ7ETd7sx3MF8ZBlHHvG
-Blkg15STfnI8PZSPqlfIPRZmIDqOBLHxV+fgpxug+NpGDsoRd9/ZmoxY58ZkZyo/
-bQzUih7kDQyOBskQXNWexvMm7ik4nBWZZDWWVOZpf7j7YaGCzPP66SJvOxrzxRQ=
-=YfFC
+iQEcBAEBCgAGBQJOvin/AAoJEEqz6FtPBkyjkKEH/iwIfrE6hAB6nWWhpQbRag+K
+hPt5knuJmJ0KJ2L1TlmZC4ujyjBypEEnGXXBaF6N87ckHdo1m+vvvVLJdggu6McS
+otQgAwrySOdQpOnnAKj7ArkNYLKy808BUAXK9jXgIINFH0MubNLDXTzLW+SB6nDh
+RUpfSMaGwp27KJ0sR3lJKQ/ZJpuo/DXiuX8m39AuGiVJsWVj7NG0oba95A9Cucc3
+DgFUBGD0W5IQz7ce2WMciT6EpV0Sn4dfHXV2R0sOZfxs98vapNrH8myL9WR+5Jkb
+mNkQ2IXl6eFAGBRXm7waqMvDHUYX0FHCy5N0N+M/wCwmMV7EI0uCMN8aqrWecOU=
+=qbFi
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.5.1_p5428.ebuild b/media-video/avidemux/avidemux-2.5.1_p5428.ebuild
deleted file mode 100644
index a6560514a95d..000000000000
--- a/media-video/avidemux/avidemux-2.5.1_p5428.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.1_p5428.ebuild,v 1.5 2010/10/24 10:00:27 ssuominen Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-MY_P=${PN}-2.5-r${PV##*_p}
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	mirror://gentoo/${P%_*}-patches-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+aac +aften +alsa amr +dts esd jack libsamplerate +mp3 nls oss
-	pulseaudio +sdl +truetype +vorbis +x264 +xv +xvid gtk +qt4"
-
-RDEPEND="dev-libs/libxml2
-	aac? ( media-libs/faac
-		media-libs/faad2 )
-	aften? ( media-libs/aften )
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	dts? ( media-libs/libdca )
-	mp3? ( media-sound/lame )
-	esd? ( media-sound/esound )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	truetype? ( media-libs/freetype:2
-		media-libs/fontconfig )
-	vorbis? ( media-libs/libvorbis )
-	x264? ( media-libs/x264 )
-	xv? ( x11-libs/libXv )
-	xvid? ( media-libs/xvid )
-	gtk? ( x11-libs/gtk+:2 )
-	qt4? ( >=x11-libs/qt-gui-4.5.1:4 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-util/pkgconfig
-	>=dev-util/cmake-2.6.4"
-
-S=${WORKDIR}/${MY_P}
-BUILD_S=${WORKDIR}/${P}_build
-
-AVIDEMUX_LANGS="bg ca cs de el es fr it ja pt_BR ru sr sr@latin tr zh_TW"
-for L in ${AVIDEMUX_LANGS}; do
-	IUSE="${IUSE} linguas_${L}"
-done
-
-PATCHES=( "${WORKDIR}/patches/${PV%_*}-i18n.patch"
-	"${WORKDIR}/patches/${PV%_*}-coreImage-parallel-build.patch"
-	"${FILESDIR}/avidemux-2.5.1-build-plugins-fix.patch" )
-
-src_prepare() {
-	base_src_prepare
-
-	local po_files=
-	local qt_ts_files=
-	local avidemux_ts_files=
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} ${AVIDEMUX_LANGS}; then
-			if [[ -e ${S}/po/${lingua}.po ]]; then
-				po_files="${po_files} \${po_subdir}/${lingua}.po"
-			fi
-			if [[ -e ${S}/po/qt_${lingua}.ts ]]; then
-				qt_ts_files="${qt_ts_files} \${ts_subdir}/qt_${lingua}.ts"
-			fi
-			if [[ -e ${S}/po/${PN}_${lingua}.ts ]]; then
-				avidemux_ts_files="${avidemux_ts_files} \${ts_subdir}/${PN}_${lingua}.ts"
-			fi
-		fi
-	done
-
-	sed -i -e "s!FILE(GLOB po_files .*)!SET(po_files ${po_files})!" \
-		"${S}/cmake/Po.cmake" || die "sed failed"
-	sed -i -e "s!FILE(GLOB.*qt.*)!SET(ts_files ${qt_ts_files})!" \
-	    -e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \
-		"${S}/cmake/Ts.cmake" || die "sed failed"
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DAVIDEMUX_INSTALL_PREFIX='${BUILD_S}'
-		-DAVIDEMUX_CORECONFIG_DIR='${BUILD_S}/config'"
-
-	# CMakeLists.txt
-	use gtk || mycmakeargs="${mycmakeargs} -DGTK=0"
-	use qt4 || mycmakeargs="${mycmakeargs} -DQT4=0"
-
-	# cmake/admCheckMiscLibs.cmake
-	use nls || mycmakeargs="${mycmakeargs} -DGETTEXT=0"
-	use sdl || mycmakeargs="${mycmakeargs} -DSDL=0"
-	use xv || mycmakeargs="${mycmakeargs} -DXVIDEO=0"
-
-	# cmake/admCheckAudioDeviceLibs.cmake
-	use alsa || mycmakeargs="${mycmakeargs} -DALSA=0"
-	use esd || mycmakeargs="${mycmakeargs} -DESD=0"
-	use jack || mycmakeargs="${mycmakeargs} -DJACK=0"
-	use oss || mycmakeargs="${mycmakeargs} -DOSS=0"
-	use pulseaudio || mycmakeargs="${mycmakeargs} -DPULSEAUDIOSIMPLE=0"
-
-	# cmake/admCheckAudioEncoderLibs.cmake
-	use aften || mycmakeargs="${mycmakeargs} -DAFTEN=0"
-	use mp3 || mycmakeargs="${mycmakeargs} -DLAME=0"
-	use aac || mycmakeargs="${mycmakeargs} -DFAAC=0"
-	use vorbis || mycmakeargs="${mycmakeargs} -DVORBIS=0"
-
-	# plugins/ADM_audioDecoders
-	use aac || mycmakeargs="${mycmakeargs} -DFAAD=0"
-	use dts || mycmakeargs="${mycmakeargs} -DLIBDCA=0"
-
-	# opencore
-	use amr || mycmakeargs="${mycmakeargs} -DOPENCORE_AMRNB=0 -DOPENCORE_AMRWB=0"
-
-	# plugins/ADM_videoFilters
-	use truetype || mycmakeargs="${mycmakeargs} -DFREETYPE2=0 -DFONTCONFIG=0"
-
-	# plugins/ADM_videoEncoder
-	use xvid || mycmakeargs="${mycmakeargs} -DXVID=0"
-	use x264 || mycmakeargs="${mycmakeargs} -DX264=0"
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# first build the application
-	cmake-utils_src_compile
-	# and then go on with plugins
-	emake -C "${CMAKE_BUILD_DIR}/plugins" || die "building plugins failed"
-}
-
-src_install() {
-	# install the application
-	cmake-utils_src_install
-	# install plugins
-	emake -C "${CMAKE_BUILD_DIR}/plugins" DESTDIR="${D}" install \
-		|| die "installing plugins failed"
-
-	dodoc AUTHORS || die "dodoc failed"
-	newicon ${PN}_icon.png ${PN}.png || die "installing icon failed"
-
-	if use qt4; then
-		sed -i "s/\(${PN}2_\)gtk/\1qt4/" ${PN}2.desktop || die "sed failed"
-		domenu ${PN}2.desktop || die "installing desktop file failed"
-	fi
-
-	if use gtk; then
-		domenu ${PN}2-gtk.desktop || die "installing desktop file failed"
-	fi
-}
diff --git a/media-video/avidemux/avidemux-2.5.2.ebuild b/media-video/avidemux/avidemux-2.5.2.ebuild
deleted file mode 100644
index a0a1192d49ca..000000000000
--- a/media-video/avidemux/avidemux-2.5.2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.2.ebuild,v 1.6 2010/10/24 10:00:27 ssuominen Exp $
-
-EAPI="2"
-
-inherit cmake-utils flag-o-matic
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	mirror://gentoo/avidemux-2.5.1-patches-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+aac +aften +alsa amr +dts esd jack libsamplerate +mp3 nls oss
-	pulseaudio +sdl +truetype +vorbis +x264 +xv +xvid gtk +qt4"
-
-RDEPEND="dev-libs/libxml2
-	aac? ( media-libs/faac
-		media-libs/faad2 )
-	aften? ( media-libs/aften )
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	dts? ( media-libs/libdca )
-	mp3? ( media-sound/lame )
-	esd? ( media-sound/esound )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	truetype? ( media-libs/freetype:2
-		media-libs/fontconfig )
-	vorbis? ( media-libs/libvorbis )
-	x264? ( media-libs/x264 )
-	xv? ( x11-libs/libXv )
-	xvid? ( media-libs/xvid )
-	gtk? ( x11-libs/gtk+:2 )
-	qt4? ( x11-libs/qt-gui:4 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-util/pkgconfig
-	dev-util/cmake"
-
-S=${WORKDIR}/${MY_P}
-BUILD_S=${WORKDIR}/${P}
-
-AVIDEMUX_LANGS="bg ca cs de el es fr it ja pt_BR ru sr sr@latin tr zh_TW"
-for L in ${AVIDEMUX_LANGS}; do
-	IUSE="${IUSE} linguas_${L}"
-done
-
-PATCHES=( "${WORKDIR}/patches/2.5.1-i18n.patch"
-	"${WORKDIR}/patches/2.5.1-coreImage-parallel-build.patch"
-	"${FILESDIR}/avidemux-2.5.1-build-plugins-fix.patch"
-	"${FILESDIR}/avidemux-2.5.2-altivec-bool.patch"
-	"${FILESDIR}/2.5.3_field_asm_fix.diff" )
-
-src_prepare() {
-	base_src_prepare
-
-	local po_files=
-	local qt_ts_files=
-	local avidemux_ts_files=
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} ${AVIDEMUX_LANGS}; then
-			if [[ -e ${S}/po/${lingua}.po ]]; then
-				po_files="${po_files} \${po_subdir}/${lingua}.po"
-			fi
-			if [[ -e ${S}/po/qt_${lingua}.ts ]]; then
-				qt_ts_files="${qt_ts_files} \${ts_subdir}/qt_${lingua}.ts"
-			fi
-			if [[ -e ${S}/po/${PN}_${lingua}.ts ]]; then
-				avidemux_ts_files="${avidemux_ts_files} \${ts_subdir}/${PN}_${lingua}.ts"
-			fi
-		fi
-	done
-
-	sed -i -e "s!FILE(GLOB po_files .*)!SET(po_files ${po_files})!" \
-		"${S}/cmake/Po.cmake" || die "sed failed"
-	sed -i -e "s!FILE(GLOB.*qt.*)!SET(ts_files ${qt_ts_files})!" \
-	    -e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \
-		"${S}/cmake/Ts.cmake" || die "sed failed"
-}
-
-src_configure() {
-	### Add lax vector typing for PowerPC
-	if use ppc || use ppc64; then
-		append-cflags "-flax-vector-conversions"
-	fi
-
-	mycmakeargs="${mycmakeargs}
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DAVIDEMUX_INSTALL_PREFIX='${BUILD_S}'
-		-DAVIDEMUX_CORECONFIG_DIR='${BUILD_S}/config'"
-
-	# CMakeLists.txt
-	use gtk || mycmakeargs="${mycmakeargs} -DGTK=0"
-	use qt4 || mycmakeargs="${mycmakeargs} -DQT4=0"
-
-	# cmake/admCheckMiscLibs.cmake
-	use nls || mycmakeargs="${mycmakeargs} -DGETTEXT=0"
-	use sdl || mycmakeargs="${mycmakeargs} -DSDL=0"
-	use xv || mycmakeargs="${mycmakeargs} -DXVIDEO=0"
-
-	# cmake/admCheckAudioDeviceLibs.cmake
-	use alsa || mycmakeargs="${mycmakeargs} -DALSA=0"
-	use esd || mycmakeargs="${mycmakeargs} -DESD=0"
-	use jack || mycmakeargs="${mycmakeargs} -DJACK=0"
-	use oss || mycmakeargs="${mycmakeargs} -DOSS=0"
-	use pulseaudio || mycmakeargs="${mycmakeargs} -DPULSEAUDIOSIMPLE=0"
-
-	# cmake/admCheckAudioEncoderLibs.cmake
-	use aften || mycmakeargs="${mycmakeargs} -DAFTEN=0"
-	use mp3 || mycmakeargs="${mycmakeargs} -DLAME=0"
-	use aac || mycmakeargs="${mycmakeargs} -DFAAC=0"
-	use vorbis || mycmakeargs="${mycmakeargs} -DVORBIS=0"
-
-	# plugins/ADM_audioDecoders
-	use aac || mycmakeargs="${mycmakeargs} -DFAAD=0"
-	use dts || mycmakeargs="${mycmakeargs} -DLIBDCA=0"
-
-	# opencore
-	use amr || mycmakeargs="${mycmakeargs} -DOPENCORE_AMRNB=0 -DOPENCORE_AMRWB=0"
-
-	# plugins/ADM_videoFilters
-	use truetype || mycmakeargs="${mycmakeargs} -DFREETYPE2=0 -DFONTCONFIG=0"
-
-	# plugins/ADM_videoEncoder
-	use xvid || mycmakeargs="${mycmakeargs} -DXVID=0"
-	use x264 || mycmakeargs="${mycmakeargs} -DX264=0"
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# first build the application
-	cmake-utils_src_compile
-	# and then go on with plugins
-	emake -C "${CMAKE_BUILD_DIR}/plugins" || die "building plugins failed"
-}
-
-src_install() {
-	# install the application
-	cmake-utils_src_install
-	# install plugins
-	emake -C "${CMAKE_BUILD_DIR}/plugins" DESTDIR="${D}" install \
-		|| die "installing plugins failed"
-
-	dodoc AUTHORS || die "dodoc failed"
-	newicon ${PN}_icon.png ${PN}.png || die "installing icon failed"
-
-	if use qt4; then
-		sed -i "s/\(${PN}2_\)gtk/\1qt4/" ${PN}2.desktop || die "sed failed"
-		domenu ${PN}2.desktop || die "installing desktop file failed"
-	fi
-
-	if use gtk; then
-		domenu ${PN}2-gtk.desktop || die "installing desktop file failed"
-	fi
-}
diff --git a/media-video/avidemux/avidemux-2.5.3-r3.ebuild b/media-video/avidemux/avidemux-2.5.3-r3.ebuild
deleted file mode 100644
index 108e99adaa32..000000000000
--- a/media-video/avidemux/avidemux-2.5.3-r3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.3-r3.ebuild,v 1.2 2010/10/24 10:00:27 ssuominen Exp $
-
-EAPI="2"
-
-inherit cmake-utils flag-o-matic
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+aac +aften +alsa amr +dts esd jack libsamplerate +mp3 nls oss
-	pulseaudio +sdl +truetype +vorbis +x264 +xv +xvid gtk +qt4"
-
-RDEPEND="dev-libs/libxml2
-	aac? ( media-libs/faac
-		media-libs/faad2 )
-	aften? ( media-libs/aften )
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	dts? ( media-libs/libdca )
-	mp3? ( media-sound/lame )
-	esd? ( media-sound/esound )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	truetype? ( media-libs/freetype:2
-		media-libs/fontconfig )
-	vorbis? ( media-libs/libvorbis )
-	x264? ( media-libs/x264 )
-	xv? ( x11-libs/libXv )
-	xvid? ( media-libs/xvid )
-	gtk? ( x11-libs/gtk+:2 )
-	qt4? ( x11-libs/qt-gui:4 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-util/pkgconfig
-	dev-util/cmake"
-
-S=${WORKDIR}/${MY_P}
-BUILD_S=${WORKDIR}/${P}_build
-
-AVIDEMUX_LANGS="bg ca cs de el es fr it ja pt_BR ru sr sr@latin tr zh_TW"
-for L in ${AVIDEMUX_LANGS}; do
-	IUSE="${IUSE} linguas_${L}"
-done
-
-PATCHES=(
-	"${FILESDIR}/${PV}_field_asm_fix.diff"
-	"${FILESDIR}/${P}-build-plugins-fix.patch"
-	#bug 327555. Pulseaudio automagic dependency
-	"${FILESDIR}/${PN}-pulseaudiosimple.patch"
-	#bug #338619. The patch was merged upstream
-	"${FILESDIR}/${P}-fix-fgets-fortify.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	local po_files=
-	local qt_ts_files=
-	local avidemux_ts_files=
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} ${AVIDEMUX_LANGS}; then
-			if [[ -e ${S}/po/${lingua}.po ]]; then
-				po_files="${po_files} \${po_subdir}/${lingua}.po"
-			fi
-			if [[ -e ${S}/po/qt_${lingua}.ts ]]; then
-				qt_ts_files="${qt_ts_files} \${ts_subdir}/qt_${lingua}.ts"
-			fi
-			if [[ -e ${S}/po/${PN}_${lingua}.ts ]]; then
-				avidemux_ts_files="${avidemux_ts_files} \${ts_subdir}/${PN}_${lingua}.ts"
-			fi
-		fi
-	done
-
-	sed -i -e "s!FILE(GLOB po_files .*)!SET(po_files ${po_files})!" \
-		"${S}/cmake/Po.cmake" || die "sed failed"
-	sed -i -e "s!FILE(GLOB.*qt.*)!SET(ts_files ${qt_ts_files})!" \
-	    -e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \
-		"${S}/cmake/Ts.cmake" || die "sed failed"
-	#fix exec command wrt bug #316599 and #291453
-	sed -i "/Exec/s:\[\$e\]::" ${PN}2-gtk.desktop
-}
-
-src_configure() {
-	### Add lax vector typing for PowerPC
-	if use ppc || use ppc64; then
-		append-cflags "-flax-vector-conversions"
-	fi
-
-	mycmakeargs="${mycmakeargs}
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DAVIDEMUX_INSTALL_PREFIX='${BUILD_S}'
-		-DAVIDEMUX_CORECONFIG_DIR='${BUILD_S}/config'"
-
-	# CMakeLists.txt
-	use gtk || mycmakeargs="${mycmakeargs} -DGTK=0"
-	use qt4 || mycmakeargs="${mycmakeargs} -DQT4=0"
-
-	# cmake/admCheckMiscLibs.cmake
-	use nls || mycmakeargs="${mycmakeargs} -DGETTEXT=0"
-	use sdl || mycmakeargs="${mycmakeargs} -DSDL=0"
-	use xv || mycmakeargs="${mycmakeargs} -DXVIDEO=0"
-
-	# cmake/admCheckAudioDeviceLibs.cmake
-	use alsa || mycmakeargs="${mycmakeargs} -DALSA=0"
-	use esd || mycmakeargs="${mycmakeargs} -DESD=0"
-	use jack || mycmakeargs="${mycmakeargs} -DJACK=0"
-	use oss || mycmakeargs="${mycmakeargs} -DOSS=0"
-	use pulseaudio || mycmakeargs="${mycmakeargs} -DPULSEAUDIOSIMPLE=0"
-
-	# cmake/admCheckAudioEncoderLibs.cmake
-	use aften || mycmakeargs="${mycmakeargs} -DAFTEN=0"
-	use mp3 || mycmakeargs="${mycmakeargs} -DLAME=0"
-	use aac || mycmakeargs="${mycmakeargs} -DFAAC=0"
-	use vorbis || mycmakeargs="${mycmakeargs} -DVORBIS=0"
-
-	# plugins/ADM_audioDecoders
-	use aac || mycmakeargs="${mycmakeargs} -DFAAD=0"
-	use dts || mycmakeargs="${mycmakeargs} -DLIBDCA=0"
-
-	# opencore
-	use amr || mycmakeargs="${mycmakeargs} -DOPENCORE_AMRNB=0 -DOPENCORE_AMRWB=0"
-
-	# plugins/ADM_videoFilters
-	use truetype || mycmakeargs="${mycmakeargs} -DFREETYPE2=0 -DFONTCONFIG=0"
-
-	# plugins/ADM_videoEncoder
-	use xvid || mycmakeargs="${mycmakeargs} -DXVID=0"
-	use x264 || mycmakeargs="${mycmakeargs} -DX264=0"
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	append-flags -D__STDC_FORMAT_MACROS
-	# first build the application
-	cmake-utils_src_compile
-	# and then go on with plugins
-	emake -C "${CMAKE_BUILD_DIR}/plugins" || die "building plugins failed"
-}
-
-src_install() {
-	# install the application
-	cmake-utils_src_install
-	# install plugins
-	emake -C "${CMAKE_BUILD_DIR}/plugins" DESTDIR="${D}" install \
-		|| die "installing plugins failed"
-
-	dodoc AUTHORS || die "dodoc failed"
-	newicon ${PN}_icon.png ${PN}.png || die "installing icon failed"
-
-	if use qt4; then
-		sed -i "s/\(${PN}2_\)gtk/\1qt4/" ${PN}2.desktop || die "sed failed"
-		domenu ${PN}2.desktop || die "installing desktop file failed"
-	fi
-
-	if use gtk; then
-		domenu ${PN}2-gtk.desktop || die "installing desktop file failed"
-	fi
-}
diff --git a/media-video/avidemux/avidemux-2.5.4-r1.ebuild b/media-video/avidemux/avidemux-2.5.4-r1.ebuild
deleted file mode 100644
index a9b7f4fe2b23..000000000000
--- a/media-video/avidemux/avidemux-2.5.4-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.4-r1.ebuild,v 1.4 2011/04/13 21:41:44 hwoarang Exp $
-
-EAPI="2"
-
-inherit cmake-utils flag-o-matic
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+aac +aften +alsa amr +dts esd jack libsamplerate +mp3 nls oss
-	pulseaudio +sdl +truetype +vorbis +x264 +xv +xvid gtk +qt4"
-
-RDEPEND="dev-libs/libxml2
-	aac? (
-		media-libs/faac
-		media-libs/faad2
-	)
-	aften? ( media-libs/aften[cxx] )
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	dts? ( media-libs/libdca )
-	mp3? ( media-sound/lame )
-	esd? ( media-sound/esound )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	truetype? (
-		media-libs/freetype:2
-		media-libs/fontconfig
-	)
-	vorbis? ( media-libs/libvorbis )
-	x264? ( media-libs/x264 )
-	xv? ( x11-libs/libXv )
-	xvid? ( media-libs/xvid )
-	gtk? ( x11-libs/gtk+:2 )
-	qt4? ( x11-libs/qt-gui:4 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-lang/yasm
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-BUILD_S=${WORKDIR}/${P}_build
-
-AVIDEMUX_LANGS="bg ca cs de el es fr it ja pt_BR ru sr sr@latin tr zh_TW"
-for L in ${AVIDEMUX_LANGS}; do
-	IUSE="${IUSE} linguas_${L}"
-done
-
-PATCHES=(
-	"${FILESDIR}/${P}-build-plugins-fix.patch"
-	#bug 342909
-	"${FILESDIR}/${P}-dummy-sound-fix.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	local po_files=
-	local qt_ts_files=
-	local avidemux_ts_files=
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} ${AVIDEMUX_LANGS}; then
-			if [[ -e ${S}/po/${lingua}.po ]]; then
-				po_files="${po_files} \${po_subdir}/${lingua}.po"
-			fi
-			if [[ -e ${S}/po/qt_${lingua}.ts ]]; then
-				qt_ts_files="${qt_ts_files} \${ts_subdir}/qt_${lingua}.ts"
-			fi
-			if [[ -e ${S}/po/${PN}_${lingua}.ts ]]; then
-				avidemux_ts_files="${avidemux_ts_files} \${ts_subdir}/${PN}_${lingua}.ts"
-			fi
-		fi
-	done
-
-	sed -i -e "s!FILE(GLOB po_files .*)!SET(po_files ${po_files})!" \
-		"${S}/cmake/Po.cmake" || die "sed failed"
-	sed -i -e "s!FILE(GLOB.*qt.*)!SET(ts_files ${qt_ts_files})!" \
-	    -e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \
-		"${S}/cmake/Ts.cmake" || die "sed failed"
-	#fix exec command wrt bug #316599 and #291453
-	sed -i "/Exec/s:\[\$e\]::" ${PN}2-gtk.desktop
-}
-
-src_configure() {
-	### Add lax vector typing for PowerPC
-	if use ppc || use ppc64; then
-		append-cflags "-flax-vector-conversions"
-	fi
-
-	mycmakeargs+="
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DAVIDEMUX_INSTALL_PREFIX='${BUILD_S}'
-		-DAVIDEMUX_CORECONFIG_DIR='${BUILD_S}/config'
-		$(cmake-utils_use gtk)
-		$(cmake-utils_use qt4)
-		$(cmake-utils_use nls GETTEXT)
-		$(cmake-utils_use sdl)
-		$(cmake-utils_use xv XVIDEO)
-		$(cmake-utils_use alsa)
-		$(cmake-utils_use esd)
-		$(cmake-utils_use jack)
-		$(cmake-utils_use oss)
-		$(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
-		$(cmake-utils_use aften)
-		$(cmake-utils_use mp3 LAME)
-		$(cmake-utils_use aac FAAC)
-		$(cmake-utils_use aac FAAD)
-		$(cmake-utils_use vorbis)
-		$(cmake-utils_use dts LIBDCA)
-		$(cmake-utils_use amr OPENCORE_AMRNB)
-		$(cmake-utils_use amr OPENCORE_AMRWB)
-		$(cmake-utils_use truetype FREETYPE2)
-		$(cmake-utils_use truetype FONTCONFIG)
-		$(cmake-utils_use xvid)
-		$(cmake-utils_use x264)
-	"
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	append-flags -D__STDC_FORMAT_MACROS
-	# first build the application
-	cmake-utils_src_compile
-	# and then go on with plugins
-	emake -C "${CMAKE_BUILD_DIR}/plugins" || die "building plugins failed"
-}
-
-src_install() {
-	# install the application
-	cmake-utils_src_install
-	# install plugins
-	emake -C "${CMAKE_BUILD_DIR}/plugins" DESTDIR="${D}" install \
-		|| die "installing plugins failed"
-
-	dodoc AUTHORS || die "dodoc failed"
-	newicon ${PN}_icon.png ${PN}.png || die "installing icon failed"
-
-	if use qt4; then
-		sed -i "s/\(${PN}2_\)gtk/\1qt4/" ${PN}2.desktop || die "sed failed"
-		domenu ${PN}2.desktop || die "installing desktop file failed"
-	fi
-
-	if use gtk; then
-		domenu ${PN}2-gtk.desktop || die "installing desktop file failed"
-	fi
-}
diff --git a/media-video/avidemux/files/2.5.3_field_asm_fix.diff b/media-video/avidemux/files/2.5.3_field_asm_fix.diff
deleted file mode 100644
index 989559bf66f9..000000000000
--- a/media-video/avidemux/files/2.5.3_field_asm_fix.diff
+++ /dev/null
@@ -1,135 +0,0 @@
-diff --git a/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp b/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp
-index 33b2a7f..99f0664 100644
---- a/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp
-+++ b/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp
-@@ -30,19 +30,8 @@ Skip factor=2
-  ***************************************************************************/
- 
- #include "ADM_default.h"
--
--//#include "ADM_editor/ADM_edit.hxx"
- #include "ADM_videoFilter.h"
- 
--//#define MMX_TRACE
--#warning remove mmxmacro and debug asm
--//#define ASM_ILACING
--
--
--#include "ADM_mmxMacros.h"
--
--
--
- 
- #define SKIP_FACTOR 2   // 2^SKIPFACTOR=SKIP_LINEAR+1
- #define SKIP_LINEAR   3
-@@ -62,7 +51,7 @@ Skip factor=2
- */
- 
- #if defined(ADM_CPU_X86) && defined(ASM_ILACING)
--
-+#warning REWRITE IN PLAIN ASM
- static uint32_t      ADMVideo_interlaceCount_MMX( uint8_t *src ,uint32_t w, uint32_t h);
- static uint8_t * FUNNY_MANGLE(_l_p)  =NULL;
- static uint8_t * FUNNY_MANGLE(_l_c) =NULL;
-diff --git a/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp b/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp
-index 61d11d4..479731c 100644
---- a/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp
-+++ b/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp
-@@ -20,15 +20,13 @@
-  ***************************************************************************/
- 
- #include "ADM_default.h"
--
- #include "ADM_videoFilter.h"
--
- #include"ADM_vidField.h"
- 
- #ifdef ADM_CPU_X86
- //	#define DEBUG_DEINT 1
- //	#define MMX_TRACE 1
--	#include "ADM_mmxMacros.h"
-+//	#include "ADM_mmxMacros.h"
- 
-  void myDeintASM(void);
- 
-@@ -36,25 +34,27 @@
-  static uint8_t * FUNNY_MANGLE(_l_p) , * FUNNY_MANGLE(_l_c) ,* FUNNY_MANGLE(_l_n);
-  static uint8_t * FUNNY_MANGLE(_l_e) , * FUNNY_MANGLE(_l_e2);
- #define EXPAND(x) (x)+((x)<<16)+((x)<<32) +((x)<<48)
--static mmx_t _mmTHRESH1;
--static mmx_t _mmTHRESH2;
-+static uint64_t  __attribute__((used)) __attribute__ ((__aligned__ (8)))  FUNNY_MANGLE(_mmTHRESH1) ;
-+static uint64_t  __attribute__((used)) __attribute__ ((__aligned__ (8)))  FUNNY_MANGLE(_mmTHRESH2) ;
- 
--#define COMPUTE_MMX \
--punpcklbw_r2r(mm5,mm0);  /*c  expand 4 bytes -> 4 word */ \
--punpcklbw_r2r(mm5,mm1);  /*p*/ \
--punpcklbw_r2r(mm5,mm2); /* n*/ \
--movq_r2r(mm0,mm3);		/* mm3 also c*/ \
--psubw_r2r(mm1,mm0) ; /* mm0=mm0-mm1 =  c-p*/ \
--psubw_r2r(mm2,mm3) ; /* mm3=mm3-mm2 =  c-n*/ \
--psraw_i2r(1,mm0); /* to protect from overflow*/ \
--psraw_i2r(1,mm3);\
--pmullw_r2r(mm0,mm3); /* mm3=(c-p)*(c-n) / 4;*/ \
--movq_r2r(mm3,mm0) ; /* mm0 also c-p*c-n */ \
--pcmpgtw_r2r(mm4,mm3); /* keep only > size*/ \
--pcmpgtw_r2r(mm6,mm0); /* keep only > size*/ \
--packsswb_r2r(mm5,mm0); \
--packsswb_r2r(mm5,mm3);
- 
-+#define COMPUTE_MMX \
-+__asm__ __volatile__(\
-+"punpcklbw %%mm5,%%mm0\n\t" \
-+"punpcklbw %%mm5,%%mm1\n\t" \
-+"punpcklbw %%mm5,%%mm2\n\t" \
-+"movq      %%mm0,%%mm3\n\t" \
-+"psubw     %%mm1,%%mm0\n\t" \
-+"psubw     %%mm2,%%mm3\n\t" \
-+"psraw     $1,%%mm0\n\t" \
-+"psraw     $1,%%mm3\n\t" \
-+"pmullw    %%mm0,%%mm3\n\t" \
-+"movq      %%mm3,%%mm0\n\t" \
-+"pcmpgtw   %%mm4,%%mm3\n\t" \
-+"pcmpgtw   %%mm6,%%mm0\n\t" \
-+"packsswb  %%mm5,%%mm0\n\t" \
-+"packsswb  %%mm5,%%mm3\n\t" \
-+::)
- #endif
- 
- void ADMVideoFields::hasMotion_C(uint8_t *p,uint8_t *c,
-@@ -90,8 +90,8 @@ void ADMVideoFields::hasMotion_MMX(uint8_t *p,uint8_t *c,
- {
- 
- 
--			 	_mmTHRESH1.uq=EXPAND((uint64_t ) ((_param->motion_trigger*_param->motion_trigger)>>2) );
--				_mmTHRESH2.uq=EXPAND((uint64_t ) ((_param->blend_trigger*_param->blend_trigger)>>2) );
-+            _mmTHRESH1=EXPAND((uint64_t ) ((_param->motion_trigger*_param->motion_trigger)>>2) );
-+            _mmTHRESH2=EXPAND((uint64_t ) ((_param->blend_trigger*_param->blend_trigger)>>2) );
- 
- 			_l_h=_info.height-2;
- 			_l_w=_info.width>>2;
-@@ -102,10 +102,11 @@ void ADMVideoFields::hasMotion_MMX(uint8_t *p,uint8_t *c,
- 			_l_e=e;
- 			_l_e2=e2;
- //			printf("\n MMX \n");
--
--			pxor_r2r(mm5,mm5);
--			movq_m2r(_mmTHRESH1,mm4);
--			movq_m2r(_mmTHRESH2,mm6);
-+             __asm__ __volatile__ (
-+			"pxor %%mm5,%%mm5\n\t"
-+			"movq "Mangle(_mmTHRESH1)",%%mm4\n\t"
-+            "movq "Mangle(_mmTHRESH2)",%%mm6\n\t"
-+            ::);
- 			myDeintASM();
- }
- #if !defined(DEBUG_DEINT)
-@@ -149,7 +150,7 @@ void myDeintASM(void)
-                             :
-                             : "eax", "ecx","edx","esi"
-                             );
--	   emms();
-+            __asm__ __volatile__ ("emms");
- 
- }
- #else
diff --git a/media-video/avidemux/files/avidemux-2.4-cmake264.patch b/media-video/avidemux/files/avidemux-2.4-cmake264.patch
deleted file mode 100644
index 80338a8061a5..000000000000
--- a/media-video/avidemux/files/avidemux-2.4-cmake264.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -uNr avidemux_2.4.4.orig/avidemux/CMakeLists.txt avidemux_2.4.4/avidemux/CMakeLists.txt
---- avidemux_2.4.4.orig/avidemux/CMakeLists.txt	2009-05-06 13:00:10.000000000 +0200
-+++ avidemux_2.4.4/avidemux/CMakeLists.txt	2009-05-06 13:00:49.000000000 +0200
-@@ -84,7 +84,6 @@
- ADM_audio

- ADM_script 

- ADM_videoFilter

--ADM_filter

- ADM_video 

- ADM_audiodevice

- ADM_ocr  

-@@ -93,6 +92,24 @@
- 

- FOREACH(_current ${ADM_SUBDIR})

- 	ADD_SUBDIRECTORY(${_current})

-+ENDFOREACH(_current ${ADM_SUBDIR})

-+

-+SET(ADM_SUBDIR 

-+ADM_filter

-+ADM_audiofilter 

-+ADM_editor

-+ADM_audiocodec 

-+ADM_audio

-+ADM_script 

-+ADM_videoFilter

-+ADM_filter

-+ADM_video 

-+ADM_audiodevice

-+ADM_ocr  

-+ADM_colorspace 

-+)

-+

-+FOREACH(_current ${ADM_SUBDIR})

- 	add_libs_all_targets(${_current})

- ENDFOREACH(_current ${ADM_SUBDIR})

- 

diff --git a/media-video/avidemux/files/avidemux-2.4-i18n.patch b/media-video/avidemux/files/avidemux-2.4-i18n.patch
deleted file mode 100644
index 06a789338e04..000000000000
--- a/media-video/avidemux/files/avidemux-2.4-i18n.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur avidemux_2.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux_2.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
---- avidemux_2.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2007-10-16 21:23:21.000000000 +0300
-+++ avidemux_2.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2007-12-28 20:35:30.000000000 +0200
-@@ -53,7 +53,7 @@
- {

- 	printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData());

- 

--	QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";

-+	QString appdir = "/usr/share/avidemux/i18n/";

- 

- 	loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());

- 	loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name());

-diff -ur avidemux_2.4.orig/cmake/Ts.cmake avidemux_2.4/cmake/Ts.cmake
---- avidemux_2.4.orig/cmake/Ts.cmake	2007-10-14 14:58:28.000000000 +0300
-+++ avidemux_2.4/cmake/Ts.cmake	2007-12-28 20:36:05.000000000 +0200
-@@ -63,7 +63,7 @@
-                 

-             SET(qm_files ${qm_files} ${_outXml} ${_out})

- 

--			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")

-+			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")

-         ENDFOREACH(ts_input ${ts_files})

- 

-         SET(${_sources} ${${_sources}} ${qm_files})

-@@ -94,7 +94,7 @@
-                 

-             SET(qm_files ${qm_files} ${_out})

- 

--			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")

-+			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")

-         ENDFOREACH(ts_input ${ts_files})

- 

-         SET(${_sources} ${${_sources}} ${qm_files})

diff --git a/media-video/avidemux/files/avidemux-2.4-ts-cmake.patch b/media-video/avidemux/files/avidemux-2.4-ts-cmake.patch
deleted file mode 100644
index 3edbec0cada8..000000000000
--- a/media-video/avidemux/files/avidemux-2.4-ts-cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: avidemux_2.4.4/cmake/Ts.cmake
-===================================================================
---- avidemux_2.4.4.orig/cmake/Ts.cmake
-+++ avidemux_2.4.4/cmake/Ts.cmake
-@@ -58,7 +58,7 @@ MACRO(COMPILE_AVIDEMUX_TS_FILES ts_subdi
-                 COMMAND ${LRELEASE_EXECUTABLE}

-                     ${_outXml}

-                     -qm ${_out}

--                DEPENDS ${_in}

-+                DEPENDS ${_outXml}

-             )

-                 

-             SET(qm_files ${qm_files} ${_outXml} ${_out})

diff --git a/media-video/avidemux/files/avidemux-2.4.4-gcc-4.4.patch b/media-video/avidemux/files/avidemux-2.4.4-gcc-4.4.patch
deleted file mode 100644
index 9cf5a37ddddd..000000000000
--- a/media-video/avidemux/files/avidemux-2.4.4-gcc-4.4.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- avidemux/ADM_colorspace/ADM_rgb.h
-+++ avidemux/ADM_colorspace/ADM_rgb.h
-@@ -19,6 +19,8 @@
-  #ifndef COLYUVRGB_H

-  #define COLYUVRGB_H

- 

-+#include <inttypes.h>

-+

- #define ADM_COLOR_IS_YUV 0x1000

-  typedef enum 

-  {

---- avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp
-+++ avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp
-@@ -71,7 +71,7 @@
- */
- uint8_t fileParser::open( const char *filename,FP_TYPE *multi )
- {
--        char *dot = NULL;                   // pointer to the last dot in filename
-+        const char *dot = NULL;                   // pointer to the last dot in filename
-         uint8_t decimals = 0;               // number of decimals
-         char *left = NULL, *number = NULL, *right = NULL; // parts of filename (after splitting)
- 
---- avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc
-+++ avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc
-@@ -104,7 +104,7 @@
- 
- int y4m_parse_ratio(y4m_ratio_t *r, const char *s)
- {
--  char *t = strchr(s, ':');
-+  const char *t = strchr(s, ':');
-   if (t == NULL) return Y4M_ERR_RANGE;
-   r->n = atoi(s);
-   r->d = atoi(t+1);
---- avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp
-+++ avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp
-@@ -53,7 +53,7 @@
- 
- bool LPCMStream::Probe(IBitStream &bs )
- {
--    char *last_dot = strrchr( bs.StreamName(), '.' );
-+    const char *last_dot = strrchr( bs.StreamName(), '.' );
-     return 
-         last_dot != NULL 
-         && strcmp( last_dot+1, "lpcm") == 0;
---- avidemux/ADM_osSupport/ADM_fileio.cpp
-+++ avidemux/ADM_osSupport/ADM_fileio.cpp
-@@ -543,7 +543,7 @@
- */

- const char *GetFileName(const char *str)

- {

--	char *filename;

-+	const char *filename;

-         char *filename2;

- #ifndef ADM_WIN32		

- 	filename = strrchr(str, '/');

---- avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp
-+++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp
-@@ -1,6 +1,7 @@
- #include <QtGui>

- 

- #include "../ADM_toolkit/qtToolkit.h"

-+#include <stdint.h>

- 

- int DIA_colorSel(uint8_t *r, uint8_t *g, uint8_t *b)

- {

-@@ -17,4 +18,4 @@
- 	}

- 

- 	return 0;

--}
-\ No newline at end of file
-+}

---- avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_cnr2.cpp
-+++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_cnr2.cpp
-@@ -16,6 +16,7 @@
-  ***************************************************************************/

- 

- #include <math.h>

-+#include <stdint.h>

- 

- #include "config.h"

- #include "ui_cnr2.h"

---- avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_coloryuv.cpp
-+++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_coloryuv.cpp
-@@ -16,6 +16,7 @@
-  ***************************************************************************/

- #include "config.h"

- 

-+#include <stdint.h>

- #include <QtGui/QDialog>

- 

- #include "ui_coloryuv.h"

---- avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp
-+++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp
-@@ -13,7 +13,7 @@
- ***************************************************************************/
- 
- #include "config.h"
--
-+#include <cstdio>
- #include <math.h>
- #include <QPainter>
- #include <QSlider>
---- avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h
-+++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h
-@@ -1,6 +1,6 @@
- #ifndef ADM_Q_SLIDER_H
- #define ADM_Q_SLIDER_H
--
-+#include <inttypes.h>
- class ADM_QSlider : public QSlider
- {
- protected:
---- avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp
-+++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp
-@@ -9,7 +9,7 @@
- //
- 
- #include "config.h"
--
-+#include <inttypes.h>
- #include <QtGui/QApplication>
- #include <QtGui/QDesktopWidget>
- 
---- avidemux/ADM_video/mmx_macros.h
-+++ avidemux/ADM_video/mmx_macros.h
-@@ -353,7 +353,7 @@
- #define	mmx_m2r(op, mem, reg) \
- 	__asm__ __volatile__ (#op " %0, %%" #reg \
- 			      : /* nothing */ \
--			      : "X" (mem))
-+			      : "m" (mem))
- 
- #define	mmx_r2m(op, reg, mem) \
- 	__asm__ __volatile__ (#op " %%" #reg ", %0" \
diff --git a/media-video/avidemux/files/avidemux-2.5.1-build-plugins-fix.patch b/media-video/avidemux/files/avidemux-2.5.1-build-plugins-fix.patch
deleted file mode 100644
index 8d3634006906..000000000000
--- a/media-video/avidemux/files/avidemux-2.5.1-build-plugins-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- avidemux_2.5_branch_gruntster/CMakeLists.txt	2009-10-28 23:22:32.000000000 +0100
-+++ avidemux-2.5-r5428/CMakeLists.txt	2009-10-29 00:16:10.000000000 +0100
-@@ -202,7 +202,7 @@
- ADD_SUBDIRECTORY(avidemux)

- ADD_SUBDIRECTORY(po)

- ADD_SUBDIRECTORY(scripts)

--# MEANX : DOES NOT WORK ADD_SUBDIRECTORY(plugins EXCLUDE_FROM_ALL)

-+ADD_SUBDIRECTORY(plugins EXCLUDE_FROM_ALL)

- 

- ########################################

- # Config Summary

diff --git a/media-video/avidemux/files/avidemux-2.5.2-altivec-bool.patch b/media-video/avidemux/files/avidemux-2.5.2-altivec-bool.patch
deleted file mode 100644
index 3e817fcdd6ee..000000000000
--- a/media-video/avidemux/files/avidemux-2.5.2-altivec-bool.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- avidemux/ADM_libraries/ADM_libmpeg2enc/mjpeg_types.h	2010-06-03 14:35:59.449422885 +0000
-+++ mavidemux/ADM_libraries/ADM_libmpeg2enc/jpeg_types.h	2010-06-03 14:35:49.612757527 +0000
-@@ -76,7 +76,9 @@
- 
- #  define false   false
- #  define true    true
-+#ifndef HAVE_ALTIVEC_H
- #  define bool locBool
-+#endif
- # endif
- #endif
- 
diff --git a/media-video/avidemux/files/avidemux-2.5.3-build-plugins-fix.patch b/media-video/avidemux/files/avidemux-2.5.3-build-plugins-fix.patch
deleted file mode 100644
index 0ab277dac099..000000000000
--- a/media-video/avidemux/files/avidemux-2.5.3-build-plugins-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: avidemux_2.5.3/CMakeLists.txt
-===================================================================
---- avidemux_2.5.3.orig/CMakeLists.txt
-+++ avidemux_2.5.3/CMakeLists.txt
-@@ -191,7 +191,7 @@ MESSAGE("")
- ADD_SUBDIRECTORY(avidemux)

- ADD_SUBDIRECTORY(po)

- ADD_SUBDIRECTORY(scripts)

--# MEANX : DOES NOT WORK ADD_SUBDIRECTORY(plugins EXCLUDE_FROM_ALL)

-+ADD_SUBDIRECTORY(plugins EXCLUDE_FROM_ALL)

- 

- ########################################

- # Config Summary

diff --git a/media-video/avidemux/files/avidemux-2.5.3-fix-fgets-fortify.patch b/media-video/avidemux/files/avidemux-2.5.3-fix-fgets-fortify.patch
deleted file mode 100644
index 509478ab4dd9..000000000000
--- a/media-video/avidemux/files/avidemux-2.5.3-fix-fgets-fortify.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Switch calls of fgets from using magic numbers to using sizeof() to
-ensure that the size passed to fgets is consistent with the size
-allocated by the compiler.
-
-diff -ru a/plugins/ADM_videoFilters/Srt/ADM_vidSRTload.cpp b/plugins/ADM_videoFilters/Srt/ADM_vidSRTload.cpp
---- a/plugins/ADM_videoFilters/Srt/ADM_vidSRTload.cpp	2009-12-19 20:41:13.000000000 +0000
-+++ b/plugins/ADM_videoFilters/Srt/ADM_vidSRTload.cpp	2010-10-02 21:02:59.000000000 +0000
-@@ -86,7 +86,7 @@
- 	return 0;
- 
-   }
--  while (fgets (string, 200, _fd))
-+  while (fgets (string, sizeof(string), _fd))
-     {
-       _line++;
-     }
-@@ -104,7 +104,7 @@
- //
-   for (uint32_t i = 0; i < _line; i++)
-     {
--      fgets (string, ADM_RAW, _fd);
-+      fgets (string, sizeof(string), _fd);
-       //printf("\n in : %s ",string);
-       if (string[0] != '{')
- 	continue;
-@@ -250,7 +250,7 @@
-   // first cound how many line
-   line = 0;
-   _line = 0;
--  while (fgets (string, 300, _fd))
-+  while (fgets (string, sizeof(string), _fd))
-     line++;
-   printf ("\n subs : %ld lines\n", line);
-   // rewind
-@@ -272,7 +272,7 @@
-   for (uint32_t i = 0; i < line; i++)
-     {
- 	current=&_subs[_line];
--	fgets (string, ADM_RAW, _fd);
-+	fgets (string, sizeof(string), _fd);
- 	ADM_utfConv(final,string,strlen(string),&finallen);
- 	// Purge cr/lf
- 	switch (state)
diff --git a/media-video/avidemux/files/avidemux-pulseaudiosimple.patch b/media-video/avidemux/files/avidemux-pulseaudiosimple.patch
deleted file mode 100644
index 320415b93593..000000000000
--- a/media-video/avidemux/files/avidemux-pulseaudiosimple.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cmake/admCheckAudioDeviceLibs.cmake
-===================================================================
---- cmake/admCheckAudioDeviceLibs.cmake	(revision 6442)
-+++ cmake/admCheckAudioDeviceLibs.cmake	(working copy)
-@@ -145,6 +145,7 @@
- 

- 	MESSAGE(STATUS "Checking for PulseAudio Simple")

- 	MESSAGE(STATUS "******************************")

-+	IF (PULSEAUDIOSIMPLE)

-         IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)

-         # in cache already

-          SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE)

-@@ -186,6 +187,9 @@
-         MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES)

- 

- 		MESSAGE("")

-+	ELSE (PULSEAUDIOSIMPLE)

-+		MESSAGE("${MSG_DISABLE_OPTION}")

-+	ENDIF (PULSEAUDIOSIMPLE)

- ELSE (UNIX AND NOT APPLE)

- 	SET(PULSEAUDIOSIMPLE_CAPABLE FALSE)

- ENDIF (UNIX AND NOT APPLE)

diff --git a/media-video/avidemux/files/lavcodec-mpegvideo_mmx-asm-fix.patch b/media-video/avidemux/files/lavcodec-mpegvideo_mmx-asm-fix.patch
deleted file mode 100644
index c2ffdaef21b7..000000000000
--- a/media-video/avidemux/files/lavcodec-mpegvideo_mmx-asm-fix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/avidemux/ADM_libraries/ADM_lavcodec/i386/mpegvideo_mmx.c	2008/05/09 11:56:36	13098
-+++ b/avidemux/ADM_libraries/ADM_lavcodec/i386/mpegvideo_mmx.c	2008/08/24 08:41:20	14941
-@@ -99,7 +99,7 @@
-
-                 "add $16, %3                    \n\t"
-                 "jng 1b                         \n\t"
--                ::"r" (block+nCoeffs), "g"(qmul), "g" (qadd), "r" (2*(-nCoeffs))
-+                ::"r" (block+nCoeffs), "rm"(qmul), "rm" (qadd), "r" (2*(-nCoeffs))
-                 : "memory"
-         );
-         block[0]= level;
-@@ -162,7 +162,7 @@
-
-                 "add $16, %3                    \n\t"
-                 "jng 1b                         \n\t"
--                ::"r" (block+nCoeffs), "g"(qmul), "g" (qadd), "r" (2*(-nCoeffs))
-+                ::"r" (block+nCoeffs), "rm"(qmul), "rm" (qadd), "r" (2*(-nCoeffs))
-                 : "memory"
-         );
- }
-@@ -260,7 +260,7 @@
-
-                 "add $16, %%"REG_a"             \n\t"
-                 "js 1b                          \n\t"
--                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "g" (qscale), "g" (-2*nCoeffs)
-+                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "rm" (qscale), "g" (-2*nCoeffs)
-                 : "%"REG_a, "memory"
-         );
-     block[0]= block0;
-@@ -327,7 +327,7 @@
-
-                 "add $16, %%"REG_a"             \n\t"
-                 "js 1b                          \n\t"
--                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "g" (qscale), "g" (-2*nCoeffs)
-+                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "rm" (qscale), "g" (-2*nCoeffs)
-                 : "%"REG_a, "memory"
-         );
- }
-@@ -391,7 +391,7 @@
-
-                 "add $16, %%"REG_a"             \n\t"
-                 "jng 1b                         \n\t"
--                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "g" (qscale), "g" (-2*nCoeffs)
-+                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "rm" (qscale), "g" (-2*nCoeffs)
-                 : "%"REG_a, "memory"
-         );
-     block[0]= block0;
-@@ -470,7 +470,7 @@
-                 "pxor %%mm7, %%mm0              \n\t"
-                 "movd %%mm0, 124(%0, %3)        \n\t"
-
--                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "g" (qscale), "r" (-2*nCoeffs)
-+                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "rm" (qscale), "r" (-2*nCoeffs)
-                 : "%"REG_a, "memory"
-         );
- }