Remove old.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux i686

9 files changed, 24 insertions, 394 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 4249ec31c96d..299b4ea9c233 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.195 2012/04/21 19:05:28 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.196 2012/04/21 20:00:52 johu Exp $
+
+  21 Apr 2012; Johannes Huber <johu@gentoo.org> -avidemux-2.5.4-r2.ebuild,
+  -files/avidemux-2.5.4-dummy-sound-fix.patch,
+  -files/avidemux-2.5.4-openfileqt.patch,
+  -files/avidemux-2.5.4-x264-build115.patch,
+  -files/avidemux-2.5.4-x264-version-fix.patch,
+  -files/avidemux-2.5.4-x264.patch, -files/avidemux-2.5.4-xvid.patch:
+  Remove old.
 
   21 Apr 2012; Jeff Horelick <jdhore@gentoo.org> avidemux-2.5.6-r1.ebuild:
   marked x86 per bug 412529
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 7b7295fbdae8..c29819f575cc 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,14 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 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
-AUX avidemux-2.5.4-x264-build115.patch 1924 RMD160 44b0a75844f8236e7f2363b3e4dd00b64a3d5bfe SHA1 62b41d7fb9e960a0e5bef1b99ab4a2bb493bfabb SHA256 a938d5fca951ea59f8e8181f40a441d6a320317a287a2d039f9883f14c3bb16f
-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-2.5.6-ffmpeg-symbol-visibility.patch 869 RMD160 646aa449a1961fe80d8e41f0606ad591e831b205 SHA1 d88203f84b43e3f21e88abd01c90637b6925c655 SHA256 0ed5a1296fbe20f001657ed63dcbf758cf88aafb75a451c37513b825864956c0
-DIST avidemux_2.5.4.tar.gz 18154965 RMD160 e20454a558210d5f7ab1418ae4013b618d1001d9 SHA1 83d6f6d87442ce4fc4e4806735ec27ef5e90364c SHA256 355bd3d235f6b3d0af65cbed535f51a1a7213c8abf8794af8b8d2cf88c1d720d
 DIST avidemux_2.5.6.tar.gz 14914123 RMD160 c09f1018ed4ded7f7a89ba0cc2a7a056314cc785 SHA1 47205c236bf6a4435b9d4dd944493c7b7e2752f5 SHA256 d6da7f2c4304368bd9c367a74a464b47d42fee9cada2960e70053d61c1ef9b8b
-EBUILD avidemux-2.5.4-r2.ebuild 4532 RMD160 efaeec4be4b3cc1ecadab5ad5e51cddf3e3d4bc6 SHA1 895d62ed9ab262182d787fae1f7c311cd6cdd51b SHA256 9e773c7da913026d287cc4332c0ba6eabb63fa85f99ba4b58cff255f3c13ae46
 EBUILD avidemux-2.5.6-r1.ebuild 4319 RMD160 5088dc05fdeb61f271c257666a750aacd64e9eae SHA1 53535b72497cb4afba5128991f69fdf8ea095e1d SHA256 1b6f465183cc01579e0c8125a6ebfa54a3e6bf1a52ea9d0d5d9a6863aae5f8f3
-MISC ChangeLog 35826 RMD160 02b4dfe25e6e9cdd77b0a99313a41e2bfcf6f84f SHA1 1038064babd35534659702dcecc4c941bb9e7325 SHA256 aa4e219fb68d59c0d78cb1d9536dbfcc7caf66e5fe3847daf15658b9fe3d7e06
+MISC ChangeLog 36166 RMD160 138d7fc24bb8c8ba5de5638e240dfdb7a736303a SHA1 c5134609cd4192bee2f47548e442e6571c9387e1 SHA256 5f2f165e57a4e640a20b52e66de188bed12fd0705aafa79d52ae42e507b42942
 MISC metadata.xml 444 RMD160 e7b59473077a82343d8e0e98241087463a7f0615 SHA1 4e8ad0b30ff862a1143222c3fb0eb8a27fa4cc8b SHA256 719b91b997e45ef5fe8bf787fcaff8bc8316a5339e7beebf1e1233a3ec7dd23a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJPkxIqAAoJEO+t9ga+3I3a8AwIAMrj0YIWBbzlgXrFK8n5yEGf
+RnJO8P9d6/p9ZC2GrHaWp3IyGjYo7N42s/acXDDhn3Lp8yX4VydmL4woZ09GWtSH
+kdApoHy9NsR3mNYQkc4HxBtWnd9okzpe5ymQHSwrznH3VeFTbKG/VF0ZfDp1fQEc
+HZEc+xhgc0io4zaJbmyD7Il9JV9t9DdhZPB/EtgyujcvFh4JvkyJwkxWhbDc2ZI2
+KyQQfw4OWRZ9G5vQzqA6pwZi2KRM6dIkbx00tGgM96/0e2a3PGLMkhuFl5KGZV2D
+5DhvOYfnSGmC8htn/bJ3WKY+tg3KKce8JAwJYryS9/BX10SFfdB6GQtHkSC93y0=
+=KtVq
+-----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.5.4-r2.ebuild b/media-video/avidemux/avidemux-2.5.4-r2.ebuild
deleted file mode 100644
index 09508a12c6e8..000000000000
--- a/media-video/avidemux/avidemux-2.5.4-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2012 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-r2.ebuild,v 1.7 2012/03/18 13:57:59 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 x86"
-IUSE="+aac +aften +alsa amr +dts 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 )
-	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"
-	#bug 356373
-	"${FILESDIR}/${P}-x264-version-fix.patch"
-	#bug 365153
-	"${FILESDIR}/${P}-x264-build115.patch"
-	#bug 364009
-	"${FILESDIR}/${P}-openfileqt.patch"
-	"${FILESDIR}/${P}-x264.patch"
-	"${FILESDIR}/${P}-xvid.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)
-		-DUSE_ESD=OFF
-		$(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/avidemux-2.5.4-dummy-sound-fix.patch b/media-video/avidemux/files/avidemux-2.5.4-dummy-sound-fix.patch
deleted file mode 100644
index e071dce14398..000000000000
--- a/media-video/avidemux/files/avidemux-2.5.4-dummy-sound-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: avidemux_2.5.4/cmake/config.h.cmake
-===================================================================
---- avidemux_2.5.4.orig/cmake/config.h.cmake
-+++ avidemux_2.5.4/cmake/config.h.cmake
-@@ -76,9 +76,7 @@
- /* use Nvwa memory leak detector */

- #cmakedefine FIND_LEAKS

- 

--#if defined(OSS_SUPPORT) || defined (USE_ARTS) || defined(USE_SDL) || defined(__APPLE__) || defined(__WIN32) || defined(ALSA_SUPPORT)

- #define HAVE_AUDIO

--#endif

- 

- #define HAVE_ENCODER

- 

diff --git a/media-video/avidemux/files/avidemux-2.5.4-openfileqt.patch b/media-video/avidemux/files/avidemux-2.5.4-openfileqt.patch
deleted file mode 100644
index 62011a9e92de..000000000000
--- a/media-video/avidemux/files/avidemux-2.5.4-openfileqt.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Nuar avidemux_2.5_branch_gruntster.orig//avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp avidemux_2.5_branch_gruntster/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp
---- avidemux_2.5_branch_gruntster.orig//avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp	2011-04-18 11:34:58.797593384 +0200
-+++ avidemux_2.5_branch_gruntster/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp	2011-04-18 11:37:16.122645712 +0200
-@@ -210,7 +210,9 @@
- 				delete [] configData;

- 

- 				fillConfigurationComboBox();

--				selectConfiguration(&QFileInfo(configFileName).completeBaseName(), CONFIG_MENU_USER);

-+

-+				QString temporary = QFileInfo(configFileName).completeBaseName();

-+				selectConfiguration(&temporary, CONFIG_MENU_USER);

- 			}

- 		}

- 	}

-@@ -316,7 +318,8 @@
- 	{

- 		ADM_QconfigMenu *configMenu = (ADM_QconfigMenu*)myWidget;

- 

--		configMenu->selectConfiguration(&QString(configName), *configType);

-+		QString temporary2 = QString(configName);

-+		configMenu->selectConfiguration(&temporary2, *configType);

- 	}

- 

- 	void diaElemConfigMenu::finalize(void)

-@@ -356,7 +359,8 @@
- 			}

- 		}

- 

--		configMenu->selectConfiguration(&QString(configName), *configType);

-+		QString temporary3 = QString(configName);

-+		configMenu->selectConfiguration(&temporary3, *configType);

- 	}

- }

- 

diff --git a/media-video/avidemux/files/avidemux-2.5.4-x264-build115.patch b/media-video/avidemux/files/avidemux-2.5.4-x264-build115.patch
deleted file mode 100644
index c627667ecdf9..000000000000
--- a/media-video/avidemux/files/avidemux-2.5.4-x264-build115.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:40:26.000000000 +0200
-@@ -488,8 +488,10 @@
- 	printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);

- 	printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);

- 	printf("[x264] b_cabac = %d\n", x264Param->b_cabac);

--#if X264_BUILD > 101

-+#if X264_BUILD > 101 && X264_BUILD < 115

- 	printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);

-+#elif X264_BUILD > 114

-+	printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);

- #endif

- 	printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);

- #if X264_BUILD > 88

-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:43:36.000000000 +0200
-@@ -417,7 +417,7 @@
- 	_param.b_cabac = cabac;

- }

- 

--#if X264_BUILD > 101

-+#if X264_BUILD > 101 && X264_BUILD < 115

- unsigned int x264Options::getOpenGopMode(void)

- {

- 	return _param.i_open_gop;

-@@ -428,6 +428,17 @@
- 	if (openGopMode < 3)

- 		_param.i_open_gop = openGopMode;

- }

-+#elif X264_BUILD > 114

-+unsigned int x264Options::getOpenGopMode(void)

-+{

-+        return _param.b_open_gop;

-+}

-+ 

-+void x264Options::setOpenGopMode(unsigned int openGopMode)

-+{

-+        if (openGopMode < 3)

-+                _param.b_open_gop = openGopMode;

-+}

- #endif

- 

- unsigned int x264Options::getInterlaced(void)

diff --git a/media-video/avidemux/files/avidemux-2.5.4-x264-version-fix.patch b/media-video/avidemux/files/avidemux-2.5.4-x264-version-fix.patch
deleted file mode 100644
index c0825afdb596..000000000000
--- a/media-video/avidemux/files/avidemux-2.5.4-x264-version-fix.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp	2011-03-12 12:04:53.100131791 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp	2011-03-12 12:02:58.063666919 +0200
-@@ -94,6 +94,13 @@
- 	connect(ui.dct8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(dct8x8CheckBox_toggled(bool)));

- 	connect(ui.p8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(p8x8CheckBox_toggled(bool)));

- 

-+#if X264_BUILD < 110

-+	ui.weightedPPredictComboBox->clear();

-+	ui.weightedPPredictComboBox->addItem(tr("Disabled"));

-+	ui.weightedPPredictComboBox->addItem(tr("Blind Offset"));

-+	ui.weightedPPredictComboBox->addItem(tr("Smart Analysis"));

-+#endif

-+

- 	// Frame tab

- 	connect(ui.loopFilterCheckBox, SIGNAL(toggled(bool)), this, SLOT(loopFilterCheckBox_toggled(bool)));

- 

-diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui	2011-03-12 12:04:53.100131791 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui	2011-03-12 12:02:58.063666919 +0200
-@@ -1131,12 +1131,12 @@
-                 </item>
-                 <item>
-                  <property name="text">
--                  <string>Blind Offset</string>
-+                  <string>Weighted References</string>
-                  </property>
-                 </item>
-                 <item>
-                  <property name="text">
--                  <string>Smart Analysis</string>
-+                  <string>Weighted References + Duplicates</string>
-                  </property>
-                 </item>
-                </widget>
-diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-03-12 12:04:53.100131791 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-03-12 12:02:58.062666914 +0200
-@@ -1386,9 +1386,15 @@
- 		case X264_WEIGHTP_NONE:

- 			strcpy((char*)xmlBuffer, "none");

- 			break;

-+#if X264_BUILD < 110

- 		case X264_WEIGHTP_BLIND:

- 			strcpy((char*)xmlBuffer, "blind");

- 			break;

-+#else

-+		case X264_WEIGHTP_SIMPLE:

-+			strcpy((char*)xmlBuffer, "simple");

-+			break;

-+#endif

- 		case X264_WEIGHTP_SMART:

- 			strcpy((char*)xmlBuffer, "smart");

- 			break;

-@@ -1895,8 +1901,13 @@
- 			{

- 				int weightedPredPFrames = X264_WEIGHTP_NONE;

- 

-+#if X264_BUILD < 110

- 				if (strcmp(content, "blind") == 0)

- 					weightedPredPFrames = X264_WEIGHTP_BLIND;

-+#else

-+				if (strcmp(content, "simple") == 0)

-+					weightedPredPFrames = X264_WEIGHTP_SIMPLE;

-+#endif

- 				else if (strcmp(content, "smart") == 0)

- 					weightedPredPFrames = X264_WEIGHTP_SMART;

- 

-diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd	2011-03-12 12:04:53.100131791 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd	2011-03-12 12:02:58.062666914 +0200
-@@ -335,7 +335,9 @@
-                       <xs:simpleType>

-                         <xs:restriction base="xs:string">

-                           <xs:enumeration value="none"/>

-+						  <!-- blind deprecated core 110 -->

-                           <xs:enumeration value="blind"/>

-+						  <xs:enumeration value="simple"/>

-                           <xs:enumeration value="smart"/>

-                         </xs:restriction>

-                       </xs:simpleType>

diff --git a/media-video/avidemux/files/avidemux-2.5.4-x264.patch b/media-video/avidemux/files/avidemux-2.5.4-x264.patch
deleted file mode 100644
index 5dd350608866..000000000000
--- a/media-video/avidemux/files/avidemux-2.5.4-x264.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nuar avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp	2010-09-29 22:20:48.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp	2011-04-18 12:26:34.482304155 +0200
-@@ -343,7 +343,8 @@
- 		delete [] xml;

- 

- 		fillConfigurationComboBox();

--		selectConfiguration(&QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);

-+		QString temporary = QFileInfo(configFileName).completeBaseName();

-+		selectConfiguration(&temporary, PLUGIN_CONFIG_USER);

- 	}

- 

- 	delete [] configDirectory;

-@@ -580,7 +581,8 @@
- 	disableGenericSlots = true;

- 	options->getPresetConfiguration(&configurationName, &configurationType);

- 

--	bool foundConfig = selectConfiguration(&QString(configurationName), configurationType);

-+	QString temporary2 = QString(configurationName);

-+	bool foundConfig = selectConfiguration(&temporary2, configurationType);

- 

- 	if (!foundConfig)

- 		printf("Configuration %s (type %d) could not be found.  Using snapshot.\n", configurationName, configurationType);

diff --git a/media-video/avidemux/files/avidemux-2.5.4-xvid.patch b/media-video/avidemux/files/avidemux-2.5.4-xvid.patch
deleted file mode 100644
index 6b1d2f0c8c8a..000000000000
--- a/media-video/avidemux/files/avidemux-2.5.4-xvid.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nuar avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp	2010-06-07 01:07:37.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp	2011-04-18 12:12:13.640562284 +0200
-@@ -233,7 +233,8 @@
- 		delete [] xml;

- 

- 		fillConfigurationComboBox();

--		selectConfiguration(&QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);

-+		QString temporary = QFileInfo(configFileName).completeBaseName();

-+		selectConfiguration(&temporary, PLUGIN_CONFIG_USER);

- 	}

- 

- 	delete [] configDirectory;

-@@ -373,7 +374,8 @@
- 	disableGenericSlots = true;

- 	options->getPresetConfiguration(&configurationName, &configurationType);		

- 

--	bool foundConfig = selectConfiguration(&QString(configurationName), configurationType);

-+	QString temporary2 = QString(configurationName);

-+	bool foundConfig = selectConfiguration(&temporary2, configurationType);

- 

- 	if (!foundConfig)

- 		printf("Configuration %s (type %d) could not be found.  Using snapshot.\n", configurationName, configurationType);