old

(Portage version: 2.1.6.1/cvs/Linux 2.6.27.7 i686, RepoMan options: --force)

5 files changed, 0 insertions, 369 deletions

diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 70956ed777ea..25f414c08b0a 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,12 +1,7 @@
 AUX avidemux-2.4-i18n.patch 1676 RMD160 5cc06702f8a4d96a12630d4f543035baa5ccac0f SHA1 32557519caeed3b236f48b40d5ee8953b2d03197 SHA256 ab978ed96a2689af2e01ad8b9a08ed9bd4b2f8e4c6721d9598964f1fd8a5e6d2
 AUX avidemux-2.4-libdca.patch 949 RMD160 53ec97b26441f2617566dbb949496be72ecbc07c SHA1 91ff55452ed9bdaabd76fa41add4c405bf6b8405 SHA256 95f49dbe69a4621ef8f33795898623156222e16d0774a6c454e2e303c6290c3e
-AUX avidemux-2.4.1-gcc43-includes.patch 4125 RMD160 72eb0497889dd1f463ec22dfbe9682be2f2612f2 SHA1 7197a4d035eb99e6ceed5c763d57d4091e4c309a SHA256 85e30977430d6542529a854837999b436fa9298dcf759e9cac2ed203af4a7253
-AUX avidemux-2.4.1-gcc43-missing-asm-naming.patch 6136 RMD160 d3b38507ac9bee6e854a0002e6f9d92fb80c153d SHA1 00ee010a0d1373a7887d67f6026de55735cfa46e SHA256 c4fe7551a48e7502c1e3e4f16e93a036a67612301ba26186de899e44a9fcca0b
-AUX avidemux-2.4.2-x264-2pass-fix.patch 356 RMD160 5435a2545c56d3c235773755d4098a1d1fd803d2 SHA1 8d41540af98ae62ab3cafb2e3c6201fac1385328 SHA256 90ee49f7dfc193512d3238eb9af32d8dc8cddef3755f373da648ef427c69ef42
 AUX avidemux-2.4.3-x264.patch 1484 RMD160 ed487bb8f6a65fca9180790156411d84ee18fe8c SHA1 06fb7f651ff8b3c866785c8a9e65ced1ec395d03 SHA256 b7e6a3374aed67734602b5ef25c994267d8bd2324c46993554853336c6a47553
-DIST avidemux_2.4.1.tar.gz 5788014 RMD160 8149eb62cb4f3196d98b8c2707a4252f06e198cf SHA1 6bbf542bab73d91cb73f198d2d8afe10d83b2821 SHA256 f3c7ada9da6cd65ce840127dfa7062a7004af0a44a2e3a474ff153b0e7d50b51
 DIST avidemux_2.4.3.tar.gz 6707930 RMD160 3d9d098d97462027ac1a62fe9438451b1915367b SHA1 d3a4dc2c07884916c45f750229d02fbdeb3cedde SHA256 b2e24ed11ad84c1f5c0b6efaad8b1aae07618cf99994ae0d63fbd7f71333214f
-EBUILD avidemux-2.4.1.ebuild 4148 RMD160 60ec54e502ea4edb3b7dd06b8d0c8107b39f3634 SHA1 11c7b31caadcfffaee2142b6999ab8f0088daf8e SHA256 8e5ae3e54d79feb402171e80563fbb4b7c4402bad86f86e541539f5f6b7e311f
 EBUILD avidemux-2.4.3.ebuild 3976 RMD160 b737ee5f191174f0c56998ef77a357e70f485ac3 SHA1 985c1eb3f60e72fb7c9a842a0bd943fb9154efea SHA256 76ab75b8da6610b6391e5174e017c3ef4f0dc171aac168dbd8bf300e542e363d
 MISC ChangeLog 24509 RMD160 c582366b64826d6753cd805c6e6f2393cd394c96 SHA1 e35dc402a86555948b1ffafbccaa06f4822b8624 SHA256 d093078845592d9b9c2d114290f1fb665c700e4f810359097af653f714791bee
 MISC metadata.xml 429 RMD160 b32016aaa9b19e2462d493e38f1d9423d8772361 SHA1 05b0451bfb459579447bd43a30104445f59c23ce SHA256 e5416acf63f5b056b0d9148a73d6914b09c78446338f913a9cf709661487790a
diff --git a/media-video/avidemux/avidemux-2.4.1.ebuild b/media-video/avidemux/avidemux-2.4.1.ebuild
deleted file mode 100644
index d56c91370a2b..000000000000
--- a/media-video/avidemux/avidemux-2.4.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.1.ebuild,v 1.13 2008/11/04 15:35:35 loki_val Exp $
-
-EAPI="1"
-
-inherit cmake-utils eutils 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 amrnb arts dts encode esd jack lame libsamplerate
-truetype vorbis x264 xv xvid gtk qt4"
-
-RDEPEND="dev-libs/libxml2
-	media-libs/libpng
-	media-libs/libsdl
-	>=dev-libs/glib-2
-	aac? ( media-libs/faad2 )
-	aften? ( media-libs/aften )
-	alsa? ( media-libs/alsa-lib )
-	amrnb? ( media-libs/amrnb )
-	arts? ( kde-base/arts )
-	dts? ( media-libs/libdca )
-	encode? (
-		aac? ( media-libs/faac )
-		lame? ( media-sound/lame )
-		)
-	esd? ( media-sound/esound )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	truetype? ( media-libs/freetype
-		media-libs/fontconfig )
-	vorbis? ( media-libs/libvorbis )
-	x264? ( <media-libs/x264-0.0.20081006 )
-	xv? ( x11-libs/libXv )
-	xvid? ( media-libs/xvid )
-	gtk? ( >=x11-libs/gtk+-2
-		x11-libs/libX11 )
-	qt4? ( || ( x11-libs/qt-gui:4
-		=x11-libs/qt-4.3* )
-		x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig
-	>=dev-util/cmake-2.4.4"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if hasq distcc ${FEATURES}; then
-		eerror "Avidemux does not compile with distcc. Please retry with"
-		eerror "FEATURES='-distcc' emerge avidemux"
-		die "distcc not supported for this package"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# TODO. Needs to be reported upstream.
-	epatch "${FILESDIR}"/${PN}-2.4-libdca.patch
-	epatch "${FILESDIR}"/${PN}-2.4-i18n.patch
-	# gcc-4.3 fixes from bug 213099
-	epatch "${FILESDIR}"/${P}-gcc43-includes.patch
-	epatch "${FILESDIR}"/${P}-gcc43-missing-asm-naming.patch
-}
-
-src_compile() {
-	# -O3 seems to corrupt names in the Qt4 filters dialog -yngwin
-	use qt4 && replace-flags -O3 -O2
-
-	# Commented out options cause compilation errors, some
-	# might need -Wl,--as-needed in LDFLAGS and all USE
-	# flags disabled for reproducing. -drac
-	# TODO. Needs to be fixed, or reported upstream.
-
-	local mycmakeargs
-
-	# ConfigureChecks.cmake
-	use alsa || mycmakeargs="${mycmakeargs} -DNO_ALSA=1"
-	#use oss || mycmakeargs="${mycmakeargs} -DNO_OSS=1"
-	#use nls || mycmakeargs="${mycmakeargs} -DNO_NLS=1"
-	#use sdl || mycmakeargs="${mycmakeargs} -DNO_SDL=1"
-
-	# ConfigureChecks.cmake -> ADM_CHECK_HL -> cmake/adm_checkHeaderLib.cmake
-	use truetype || mycmakeargs="${mycmakeargs} -DNO_FontConfig=1"
-	use xv || mycmakeargs="${mycmakeargs} -DNO_Xvideo=1"
-	use esd || mycmakeargs="${mycmakeargs} -DNO_Esd=1"
-	use jack || mycmakeargs="${mycmakeargs} -DNO_Jack=1"
-	use aften || mycmakeargs="${mycmakeargs} -DNO_Aften=1"
-	use libsamplerate || mycmakeargs="${mycmakeargs} -DNO_libsamplerate=1"
-	use encode && use aac || mycmakeargs="${mycmakeargs} -DNO_FAAC=1"
-	use encode && use lame || mycmakeargs="${mycmakeargs} -DNO_Lame=1"
-	use xvid || mycmakeargs="${mycmakeargs} -DNO_Xvid=1"
-	use amrnb || mycmakeargs="${mycmakeargs} -DNO_AMRNB=1"
-	use dts || mycmakeargs="${mycmakeargs} -DNO_libdca=1"
-	use x264 || mycmakeargs="${mycmakeargs} -DNO_x264=1"
-	use aac || mycmakeargs="${mycmakeargs} -DNO_FAAD=1 -DNO_NeAAC=1"
-	use vorbis || mycmakeargs="${mycmakeargs} -DNO_Vorbis=1"
-	#use png || mycmakeargs="${mycmakeargs} -DNO_libPNG=1"
-
-	# ConfigureChecks.cmake -> cmake/FindArts.cmake
-	use arts || mycmakeargs="${mycmakeargs} -DNO_ARTS=1"
-
-	# CMakeLists.txt
-	use truetype || mycmakeargs="${mycmakeargs} -DNO_FREETYPE=1"
-	use gtk || mycmakeargs="${mycmakeargs} -DNO_GTK=1"
-	use qt4 || mycmakeargs="${mycmakeargs} -DNO_QT4=1"
-
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS
-	doicon avidemux_icon.png
-
-	use gtk && make_desktop_entry avidemux2_gtk "Avidemux GTK" \
-		avidemux_icon "AudioVideo;GTK"
-	use qt4 && make_desktop_entry avidemux2_qt4 "Avidemux Qt" \
-		avidemux_icon "AudioVideo;Qt"
-}
diff --git a/media-video/avidemux/files/avidemux-2.4.1-gcc43-includes.patch b/media-video/avidemux/files/avidemux-2.4.1-gcc43-includes.patch
deleted file mode 100644
index 82090c56fd05..000000000000
--- a/media-video/avidemux/files/avidemux-2.4.1-gcc43-includes.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -urdH avidemux_2.4.1-orig/avidemux/ADM_libraries/ADM_mplex/inputstrm.cpp avidemux_2.4.1/avidemux/ADM_libraries/ADM_mplex/inputstrm.cpp
---- avidemux_2.4.1-orig/avidemux/ADM_libraries/ADM_mplex/inputstrm.cpp	2008-03-11 20:55:19.000000000 +0300
-+++ avidemux_2.4.1/avidemux/ADM_libraries/ADM_mplex/inputstrm.cpp	2008-03-12 07:15:32.000000000 +0300
-@@ -28,6 +28,8 @@
- #include "inputstrm.hpp"
- #include "multiplexor.hpp"
- 
-+#include <climits>
-+
- MuxStream::MuxStream() : init(false) 
- {
- }
-diff -urdH avidemux_2.4.1-orig/avidemux/ADM_libraries/ADM_mplex/multiplexor.cpp avidemux_2.4.1/avidemux/ADM_libraries/ADM_mplex/multiplexor.cpp
---- avidemux_2.4.1-orig/avidemux/ADM_libraries/ADM_mplex/multiplexor.cpp	2008-03-11 20:55:19.000000000 +0300
-+++ avidemux_2.4.1/avidemux/ADM_libraries/ADM_mplex/multiplexor.cpp	2008-03-12 07:15:32.000000000 +0300
-@@ -35,7 +35,7 @@
- #include "zalphastrm.hpp"
- #endif
- #include "multiplexor.hpp"
--
-+#include <cstring>
- 
- /****************
-  *
-diff -urdH avidemux_2.4.1-orig/avidemux/ADM_libraries/ADM_mplex/padstrm.cpp avidemux_2.4.1/avidemux/ADM_libraries/ADM_mplex/padstrm.cpp
---- avidemux_2.4.1-orig/avidemux/ADM_libraries/ADM_mplex/padstrm.cpp	2008-03-11 20:55:19.000000000 +0300
-+++ avidemux_2.4.1/avidemux/ADM_libraries/ADM_mplex/padstrm.cpp	2008-03-12 07:15:32.000000000 +0300
-@@ -26,6 +26,7 @@
- 
- #include "padstrm.hpp"
- 
-+#include <cstring>
- 
- 
- //
-diff -urdH avidemux_2.4.1-orig/avidemux/ADM_script/DirectorySearch.h avidemux_2.4.1/avidemux/ADM_script/DirectorySearch.h
---- avidemux_2.4.1-orig/avidemux/ADM_script/DirectorySearch.h	2008-03-11 20:55:19.000000000 +0300
-+++ avidemux_2.4.1/avidemux/ADM_script/DirectorySearch.h	2008-03-12 07:15:32.000000000 +0300
-@@ -23,6 +23,7 @@
- #include <dirent.h>
- #endif
- #include "StdFile.h"
-+#include <cstring>
- 
- // create a non file bit for unix
- #define _A_NONFILE	0x03
-diff -urdH avidemux_2.4.1-orig/avidemux/ADM_userInterfaces/ADM_GTK/ADM_toolkit_gtk/ADM_jogshuttle.cpp avidemux_2.4.1/avidemux/ADM_userInterfaces/ADM_GTK/ADM_toolkit_gtk/ADM_jogshuttle.cpp
---- avidemux_2.4.1-orig/avidemux/ADM_userInterfaces/ADM_GTK/ADM_toolkit_gtk/ADM_jogshuttle.cpp	2008-03-11 20:55:19.000000000 +0300
-+++ avidemux_2.4.1/avidemux/ADM_userInterfaces/ADM_GTK/ADM_toolkit_gtk/ADM_jogshuttle.cpp	2008-03-12 07:15:32.000000000 +0300
-@@ -41,6 +41,8 @@
- #include "config.h"
- 
- #ifdef USE_JOG
-+#include <cstdlib>
-+#include <cstring>
- #include <string>
- using std::string;
- #include <iostream>
-diff -urdH avidemux_2.4.1-orig/avidemux/ADM_userInterfaces/ADM_GTK/ADM_toolkit_gtk/mediactrl.h avidemux_2.4.1/avidemux/ADM_userInterfaces/ADM_GTK/ADM_toolkit_gtk/mediactrl.h
---- avidemux_2.4.1-orig/avidemux/ADM_userInterfaces/ADM_GTK/ADM_toolkit_gtk/mediactrl.h	2008-03-11 20:55:19.000000000 +0300
-+++ avidemux_2.4.1/avidemux/ADM_userInterfaces/ADM_GTK/ADM_toolkit_gtk/mediactrl.h	2008-03-12 07:15:32.000000000 +0300
-@@ -97,6 +97,8 @@
- extern "C" {
- #endif
- 
-+#include <time.h>
-+
- struct media_ctrl_device;
- 
- struct media_ctrl_key
-diff -urdH avidemux_2.4.1-orig/avidemux/ADM_videoFilter/ADM_guiResize.cpp avidemux_2.4.1/avidemux/ADM_videoFilter/ADM_guiResize.cpp
---- avidemux_2.4.1-orig/avidemux/ADM_videoFilter/ADM_guiResize.cpp	2008-03-11 20:55:19.000000000 +0300
-+++ avidemux_2.4.1/avidemux/ADM_videoFilter/ADM_guiResize.cpp	2008-03-12 07:15:32.000000000 +0300
-@@ -41,7 +41,7 @@
- #include <ADM_assert.h>
- 
- 
--static int getResizeParams(uint32_t * w, uint32_t * h, uint32_t * algo,uint32_t w,uint32_t h,uint32_t fps);
-+static int getResizeParams(uint32_t * w, uint32_t * h, uint32_t * algo, uint32_t ow, uint32_t oh, uint32_t fps);
- 
- 
- extern uint8_t DIA_resize(uint32_t *width,uint32_t *height,uint32_t *algo,uint32_t originalw, uint32_t originalh,uint32_t fps1000);
-diff -urdH avidemux_2.4.1-orig/avidemux/gui_action.cpp avidemux_2.4.1/avidemux/gui_action.cpp
---- avidemux_2.4.1-orig/avidemux/gui_action.cpp	2008-03-11 20:55:19.000000000 +0300
-+++ avidemux_2.4.1/avidemux/gui_action.cpp	2008-03-12 07:28:27.000000000 +0300
-@@ -1,4 +1,5 @@
--#include <stdio.h>

-+#include <cstdio>

-+#include <cstring>

- #include <vector>

- using std::vector;

- #include <utility>

diff --git a/media-video/avidemux/files/avidemux-2.4.1-gcc43-missing-asm-naming.patch b/media-video/avidemux/files/avidemux-2.4.1-gcc43-missing-asm-naming.patch
deleted file mode 100644
index 6cb8bd742c3c..000000000000
--- a/media-video/avidemux/files/avidemux-2.4.1-gcc43-missing-asm-naming.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -urdH avidemux_2.4.1-gcc43-inlines/avidemux/ADM_libraries/ADM_utilities/ADM_imageUtils.cpp avidemux_2.4.1/avidemux/ADM_libraries/ADM_utilities/ADM_imageUtils.cpp
---- avidemux_2.4.1-gcc43-inlines/avidemux/ADM_libraries/ADM_utilities/ADM_imageUtils.cpp	2008-03-12 07:47:59.000000000 +0300
-+++ avidemux_2.4.1/avidemux/ADM_libraries/ADM_utilities/ADM_imageUtils.cpp	2008-03-13 04:43:33.000000000 +0300
-@@ -150,7 +150,7 @@
-         return df;
- }
- #if defined( ARCH_X86 ) || defined (ARCH_X86_64)
--static uint64_t noise64;
-+static uint64_t noise64 asm("noise64");
- static uint32_t computeDiffMMX(uint8_t  *s1,uint8_t *s2,uint32_t noise,uint32_t l)
- {
- uint32_t df=0;
-diff -urdH avidemux_2.4.1-gcc43-inlines/avidemux/ADM_video/ADM_interlaced.cpp avidemux_2.4.1/avidemux/ADM_video/ADM_interlaced.cpp
---- avidemux_2.4.1-gcc43-inlines/avidemux/ADM_video/ADM_interlaced.cpp	2008-03-12 07:48:00.000000000 +0300
-+++ avidemux_2.4.1/avidemux/ADM_video/ADM_interlaced.cpp	2008-03-13 04:59:01.000000000 +0300
-@@ -73,13 +73,13 @@
- #if (defined( ARCH_X86)  || defined(ARCH_X86_64)) && defined(ASM_ILACING)
- 
- static uint32_t      ADMVideo_interlaceCount_MMX( uint8_t *src ,uint32_t w, uint32_t h);
--static uint8_t *_l_p=NULL;
--static uint8_t *_l_c=NULL;
--static uint8_t *_l_n=NULL;
-+static uint8_t *_l_p asm("_l_p") =NULL;
-+static uint8_t *_l_c asm("_l_c") =NULL;
-+static uint8_t *_l_n asm("_l_n") =NULL;
- 
--static int64_t _l_h;
-+static int64_t _l_h asm("_l_h");
- 
--static mmx_t _lthresh,_added,_total,_lwrd;
-+static mmx_t _lthresh, _added, _total asm("_total"), _lwrd;
- static mmx_t _l255;
- static mmx_t _l0;
- 
-diff -urdH avidemux_2.4.1-gcc43-inlines/avidemux/ADM_videoFilter/ADM_vidBlend.cpp avidemux_2.4.1/avidemux/ADM_videoFilter/ADM_vidBlend.cpp
---- avidemux_2.4.1-gcc43-inlines/avidemux/ADM_videoFilter/ADM_vidBlend.cpp	2008-03-12 07:48:00.000000000 +0300
-+++ avidemux_2.4.1/avidemux/ADM_videoFilter/ADM_vidBlend.cpp	2008-03-13 05:02:49.000000000 +0300
-@@ -40,15 +40,15 @@
- #include "admmangle.h"
- 
- #ifdef ARCH_X86_64
--static int64_t _l_w,_l_h;
-+static int64_t _l_w asm("_l_w"), _l_h asm("_l_h");
- #else
-- static int32_t _l_w,_l_h;
-+ static int32_t _l_w asm("_l_w"), _l_h asm("_l_h");
- #endif
-- static uint8_t *_l_p,*_l_c,*_l_n;
-- static uint8_t *_l_e,*_l_e2;
-+ static uint8_t *_l_p asm("_l_p"), *_l_c asm("_l_c"), *_l_n asm("_l_n");
-+ static uint8_t *_l_e asm("_l_e"), *_l_e2 asm("_l_e2");
- #define EXPAND(x) (x)+((x)<<16)+((x)<<32) +((x)<<48)
--static uint64_t  __attribute__((used)) _mmTHRESH1=EXPAND((uint64_t )THRES1);
--static uint64_t  __attribute__((used)) full_ones=0xFFFFFFFFFFFFFFFFLL;
-+static uint64_t  __attribute__((used)) _mmTHRESH1 asm("_mmTHRESH1") =EXPAND((uint64_t )THRES1);
-+static uint64_t  __attribute__((used)) full_ones asm("full_ones") =0xFFFFFFFFFFFFFFFFLL;
- 
- 
- static void myBlendASM(void);
-diff -urdH avidemux_2.4.1-gcc43-inlines/avidemux/ADM_videoFilter/ADM_vidDeintASM.cpp avidemux_2.4.1/avidemux/ADM_videoFilter/ADM_vidDeintASM.cpp
---- avidemux_2.4.1-gcc43-inlines/avidemux/ADM_videoFilter/ADM_vidDeintASM.cpp	2008-03-12 07:48:00.000000000 +0300
-+++ avidemux_2.4.1/avidemux/ADM_videoFilter/ADM_vidDeintASM.cpp	2008-03-13 04:38:50.000000000 +0300
-@@ -45,9 +45,9 @@
- 
-  void myDeintASM(void);
- 
-- static int32_t _l_w,_l_h,_l_all;
-- static uint8_t *_l_p,*_l_c,*_l_n;
-- static uint8_t *_l_e,*_l_e2;
-+ static int32_t _l_w,_l_h, _l_all asm("_l_all");
-+ static uint8_t *_l_p asm("_l_p"), *_l_c asm("_l_c"), *_l_n asm("_l_n");
-+ static uint8_t *_l_e asm("_l_e"), *_l_e2 asm("_l_e2");
- #define EXPAND(x) (x)+((x)<<16)+((x)<<32) +((x)<<48)
- static mmx_t _mmTHRESH1;
- static mmx_t _mmTHRESH2;
-diff -urdH avidemux_2.4.1-gcc43-inlines/avidemux/ADM_videoFilter/ADM_vidFlux.cpp avidemux_2.4.1/avidemux/ADM_videoFilter/ADM_vidFlux.cpp
---- avidemux_2.4.1-gcc43-inlines/avidemux/ADM_videoFilter/ADM_vidFlux.cpp	2008-03-12 07:48:00.000000000 +0300
-+++ avidemux_2.4.1/avidemux/ADM_videoFilter/ADM_vidFlux.cpp	2008-03-13 06:06:57.000000000 +0300
-@@ -44,8 +44,8 @@
- 
- #include "ADM_assert.h"
- 
--static int16_t scaletab[16];
--static uint64_t scaletab_MMX[65536];
-+static int16_t scaletab[16] asm("scaletab");
-+static uint64_t scaletab_MMX[65536] asm("scaletab_MMX");
- 
- void initScaleTab( void )
- {
-@@ -72,18 +72,20 @@
- //#define ASM_FLUX
- BUILD_CREATE(fluxsmooth_create,ADMVideoFlux);
- 
--static uint64_t spat_thresh ASM_CONST =0LL;
--static uint64_t temp_thresh ASM_CONST =0LL;
--static uint64_t ASM_CONST _l_counter_init,_l_indexer,_l_prev_pels,_l_next_pels;
--static long int _l_src_pitch ASM_CONST =0;
--static long int _l_dst_pitch ASM_CONST =0;
--static int _l_xmax ASM_CONST=0;
-+static uint64_t spat_thresh asm("spat_thresh") ASM_CONST =0LL;
-+static uint64_t temp_thresh asm("temp_thresh") ASM_CONST =0LL;
-+static uint64_t ASM_CONST _l_counter_init asm("_l_counter_init"),
-+    _l_indexer asm("_l_indexer"), _l_prev_pels asm("_l_prev_pels"),
-+    _l_next_pels asm("_l_next_pels");
-+static long int _l_src_pitch asm("_l_src_pitch") ASM_CONST =0;
-+static long int _l_dst_pitch asm("_l_dst_pitch") ASM_CONST =0;
-+static int _l_xmax asm("_l_xmax") ASM_CONST=0;
- 
--static int ycnt;
--static	uint8_t * _l_currp; 
--static	 uint8_t * _l_prevp;								  								  
--static	 uint8_t * _l_nextp; 
--static	 uint8_t * _l_destp; 
-+static int ycnt asm("ycnt");
-+static uint8_t * _l_currp asm("_l_currp");
-+static uint8_t * _l_prevp asm("_l_prevp");
-+static uint8_t * _l_nextp asm("_l_nextp");
-+static uint8_t * _l_destp asm("_l_destp");
- 
- 
- static uint32_t size;
-diff -urdH avidemux_2.4.1-gcc43-inlines/avidemux/ADM_videoFilter/ADM_vidResampleFPS.cpp avidemux_2.4.1/avidemux/ADM_videoFilter/ADM_vidResampleFPS.cpp
---- avidemux_2.4.1-gcc43-inlines/avidemux/ADM_videoFilter/ADM_vidResampleFPS.cpp	2008-03-12 07:48:00.000000000 +0300
-+++ avidemux_2.4.1/avidemux/ADM_videoFilter/ADM_vidResampleFPS.cpp	2008-03-13 04:45:37.000000000 +0300
-@@ -174,7 +174,7 @@
-                 return 1;
- }
- #if (defined( ARCH_X86)  || defined(ARCH_X86_64))
--static uint64_t low,high;
-+static uint64_t low asm("low"), high asm("high");
- static void blendMMX(uint8_t *src, uint8_t *src2, uint8_t *dst, uint8_t alpha, uint8_t beta,uint32_t count)
- {
- uint32_t left=count&3;
diff --git a/media-video/avidemux/files/avidemux-2.4.2-x264-2pass-fix.patch b/media-video/avidemux/files/avidemux-2.4.2-x264-2pass-fix.patch
deleted file mode 100644
index 55767e3af257..000000000000
--- a/media-video/avidemux/files/avidemux-2.4.2-x264-2pass-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
----  avidemux_2.4.1/avidemux/ADM_encoder/adm_encx264.cpp-orig	2008-06-30 20:30:09.000000000 +0200
-+++  avidemux_2.4.1/avidemux/ADM_encoder/adm_encx264.cpp	2008-07-10 17:27:51.000000000 +0200
-@@ -271,6 +271,7 @@
- {
-   uint32_t    bitrate;
- 
-+  _delayed = 0;
-   ADM_assert (_state == enc_Pass1);
-   printf ("\n[x264] Starting pass 2 (%d x %d)\n", _w, _h);
-