summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Riley <justin.t.riley@gmail.com>2012-03-19 12:36:54 -0400
committerJustin Riley <justin.t.riley@gmail.com>2012-03-19 12:36:54 -0400
commita315a59617bb39c9bd96c0af86193a376762e28e (patch)
tree5cb16ef36b09769560187176c5e08538662546e0 /media-video
parentfix sci-chemistry/vmd-1.9.1 when gcc != 4.4 (diff)
downloadjtriley-a315a59617bb39c9bd96c0af86193a376762e28e.tar.gz
jtriley-a315a59617bb39c9bd96c0af86193a376762e28e.tar.bz2
jtriley-a315a59617bb39c9bd96c0af86193a376762e28e.zip
avidemux: patch 2.5.6-r1 ebuild to fix 408813
Diffstat (limited to 'media-video')
-rw-r--r--media-video/avidemux/ChangeLog963
-rw-r--r--media-video/avidemux/Manifest1
-rw-r--r--media-video/avidemux/avidemux-2.5.6-r1.ebuild174
-rw-r--r--media-video/avidemux/files/avidemux-2.5.4-build-plugins-fix.patch13
-rw-r--r--media-video/avidemux/files/avidemux-2.5.4-dummy-sound-fix.patch14
-rw-r--r--media-video/avidemux/files/avidemux-2.5.4-openfileqt.patch34
-rw-r--r--media-video/avidemux/files/avidemux-2.5.4-x264-build115.patch45
-rw-r--r--media-video/avidemux/files/avidemux-2.5.4-x264-version-fix.patch81
-rw-r--r--media-video/avidemux/files/avidemux-2.5.4-x264.patch23
-rw-r--r--media-video/avidemux/files/avidemux-2.5.4-xvid.patch23
-rw-r--r--media-video/avidemux/metadata.xml12
11 files changed, 1383 insertions, 0 deletions
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
new file mode 100644
index 0000000..12f4ecf
--- /dev/null
+++ b/media-video/avidemux/ChangeLog
@@ -0,0 +1,963 @@
+# 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.191 2012/03/18 20:21:36 pesa Exp $
+
+*avidemux-2.5.6-r1 (18 Mar 2012)
+
+ 18 Mar 2012; Davide Pesavento <pesa@gentoo.org> +avidemux-2.5.6-r1.ebuild,
+ metadata.xml:
+ Use system copy of dev-lang/spidermonkey, remove obsolete dts USE flag, add
+ vpx USE flag, add missing deps, general ebuild cleanup.
+
+ 18 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> avidemux-2.5.4-r2.ebuild,
+ avidemux-2.5.5.ebuild, avidemux-2.5.6.ebuild:
+ Remove USE="esd" because media-sound/esound isn't in tree anymore.
+
+ 11 Mar 2012; Markos Chandras <hwoarang@gentoo.org> avidemux-2.5.6.ebuild:
+ Add opengl useflag. Bug #406955. Patch by Ian Delaney
+
+*avidemux-2.5.6 (02 Jan 2012)
+
+ 02 Jan 2012; Markos Chandras <hwoarang@gentoo.org> +avidemux-2.5.6.ebuild:
+ version bump
+
+ 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)
+
+ 24 Aug 2011; Tim Harder <radhermit@gentoo.org> +avidemux-2.5.5.ebuild:
+ Version bump (bug #373067).
+
+ 13 Jun 2011; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
+ Remove myself from metadata.xml
+
+ 29 Apr 2011; Markos Chandras <hwoarang@gentoo.org> avidemux-2.5.4-r2.ebuild,
+ +files/avidemux-2.5.4-openfileqt.patch,
+ +files/avidemux-2.5.4-x264-build115.patch, +files/avidemux-2.5.4-x264.patch,
+ +files/avidemux-2.5.4-xvid.patch:
+ Add gcc-4.6 patches thanks to Fabio Scaccabarozzi <fsvm88@gmail.com>. Add
+ patch for latest x264 thanks to zimous <zimous@matfyz.cz>. Bugs #364009 and
+ #365153
+
+ 13 Apr 2011; Markos Chandras <hwoarang@gentoo.org> avidemux-2.5.4-r1.ebuild,
+ avidemux-2.5.4-r2.ebuild:
+ Move yasm to build dependencies
+
+ 13 Apr 2011; Markos Chandras <hwoarang@gentoo.org> avidemux-2.5.4-r1.ebuild,
+ avidemux-2.5.4-r2.ebuild:
+ Depend on dev-lang/yasm. Bug #362805. Drop ppc keywords
+
+ 11 Apr 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ avidemux-2.5.4-r2.ebuild:
+ x86 stable wrt bug #360613
+
+ 09 Apr 2011; Christoph Mende <angelos@gentoo.org> avidemux-2.5.4-r2.ebuild:
+ Stable on amd64 wrt bug #360613
+
+*avidemux-2.5.4-r2 (12 Mar 2011)
+
+ 12 Mar 2011; Markos Chandras <hwoarang@gentoo.org> +avidemux-2.5.4-r2.ebuild,
+ +files/avidemux-2.5.4-x264-version-fix.patch:
+ Upstream patch to make avidemux compile with the latest version of x264. Bug
+ #356373. Thanks to all these people who provided solutions on the bug
+
+ 02 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ avidemux-2.5.4-r1.ebuild:
+ Use cmake-utils eclass more extensively.
+
+*avidemux-2.5.4-r1 (28 Oct 2010)
+
+ 28 Oct 2010; Markos Chandras <hwoarang@gentoo.org> -avidemux-2.5.4.ebuild,
+ +avidemux-2.5.4-r1.ebuild, +files/avidemux-2.5.4-dummy-sound-fix.patch:
+ Apply patch to fix audio settings dummy device. Bug #342909. Thanks to
+ Eric F. GARIOUD <eric-f.garioud@wanadoo.fr>
+
+*avidemux-2.5.4 (26 Oct 2010)
+
+ 26 Oct 2010; Markos Chandras <hwoarang@gentoo.org> +avidemux-2.5.4.ebuild,
+ +files/avidemux-2.5.4-build-plugins-fix.patch:
+ Version bump
+
+ 24 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+ avidemux-2.5.1-r2.ebuild, avidemux-2.5.1_p5428.ebuild,
+ avidemux-2.5.2.ebuild, avidemux-2.5.3-r3.ebuild:
+ Remove media-libs/alsa-oss from deps wrt #342441 by Sven Müller.
+
+*avidemux-2.5.3-r3 (05 Oct 2010)
+
+ 05 Oct 2010; Markos Chandras <hwoarang@gentoo.org>
+ -avidemux-2.5.3-r1.ebuild, -avidemux-2.5.3-r2.ebuild,
+ +avidemux-2.5.3-r3.ebuild, +files/avidemux-2.5.3-fix-fgets-fortify.patch:
+ Apply patch to fix possible buffer overflows. Thanks to Kevin Pyle for the
+ patch. Bug #338619
+
+ 18 Sep 2010; Fabio Erculiani <lxnay@gentoo.org>
+ avidemux-2.5.1_p5428.ebuild, avidemux-2.5.2.ebuild,
+ avidemux-2.5.3-r1.ebuild, avidemux-2.5.3-r2.ebuild:
+ fix AVIDEMUX_INSTALL_PREFIX and AVIDEMUX_CORECONFIG_DIR cmake variables,
+ they were poiting to non-existent directories, causing build failures on
+ plugins
+
+ 01 Sep 2010; Markos Chandras <hwoarang@gentoo.org>
+ avidemux-2.5.3-r2.ebuild:
+ Append -D__STDC_FORMAT_MACROS to fix compilation issues with new glibc.
+ Thanks to Diego E. 'Flameeyes' Pettenò <flameeyes@gentoo.org>. Bug
+ #335015
+
+ 21 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+ -files/avidemux-2.4.3-x264.patch, -files/avidemux-2.4-libdca.patch:
+ Remove unused files
+
+ 11 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+ avidemux-2.5.3-r2.ebuild:
+ Reverting my previous commit about the media-plugins/swh-plugins
+ dependency. Bug #331695
+
+ 08 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+ avidemux-2.5.3-r2.ebuild:
+ Add missing media-plugins/swh-plugins dependency. Thanks to Michael Weber
+ (xmw) <gentoo@xmw.de> for reporting. Bug #331695
+
+*avidemux-2.5.3-r2 (01 Aug 2010)
+
+ 01 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+ +avidemux-2.5.3-r2.ebuild, +files/avidemux-pulseaudiosimple.patch:
+ Apply patch to fix pulseaudio automagic dependency. Fixes bug #327555.
+ Thanks to Mike Gilbert <floppymaster@gmail.com> for the patch
+
+ 18 Jun 2010; Markos Chandras <hwoarang@gentoo.org> avidemux-2.5.2.ebuild:
+ Apply gcc-4.5 patch to previous ebuild
+
+*avidemux-2.5.3-r1 (18 Jun 2010)
+
+ 18 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
+ +files/2.5.3_field_asm_fix.diff, -avidemux-2.5.3.ebuild,
+ +avidemux-2.5.3-r1.ebuild, -files/avidemux-gcc-4.5.patch:
+ New patch for GCC-4.5. Thanks to Archlinux guys
+
+*avidemux-2.5.3 (13 Jun 2010)
+
+ 13 Jun 2010; Markos Chandras <hwoarang@gentoo.org> +avidemux-2.5.3.ebuild,
+ +files/avidemux-2.5.3-build-plugins-fix.patch, metadata.xml:
+ Version bump to 2.5.3. Fixes bug #321015. Fixes desktop icon wrt bug
+ #316599 and bug #291453
+
+ 11 Jun 2010; Ben de Groot <yngwin@gentoo.org> metadata.xml:
+ Removing myself as maintainer and co-assigning to qt herd
+
+ 03 Jun 2010; Markos Chandras <hwoarang@gentoo.org> avidemux-2.5.2.ebuild,
+ +files/avidemux-gcc-4.5.patch:
+ GCC-4.5 patch thanks to Martin Väth <vaeth@mathematik.uni-wuerzburg.de>.
+ Fixes bug #322217
+
+ 03 Jun 2010; Joseph Jezak <josejx@gentoo.org> avidemux-2.5.2.ebuild,
+ +files/avidemux-2.5.2-altivec-bool.patch:
+ Add fix for altivec on ppc.
+
+ 09 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
+ avidemux-2.5.1_p5428.ebuild:
+ stable x86, bug 297850
+
+*avidemux-2.5.2 (22 Dec 2009)
+
+ 22 Dec 2009; Ben de Groot <yngwin@gentoo.org> +avidemux-2.5.2.ebuild:
+ Version bump
+
+ 22 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+ avidemux-2.5.1_p5428.ebuild:
+ amd64 stable wrt #297850
+
+*avidemux-2.5.1_p5428 (29 Oct 2009)
+
+ 29 Oct 2009; Ben de Groot <yngwin@gentoo.org>
+ -avidemux-2.5.1_p5359.ebuild, -avidemux-2.5.1_p5396.ebuild,
+ +avidemux-2.5.1_p5428.ebuild,
+ +files/avidemux-2.5.1-build-plugins-fix.patch:
+ New snapshot, fixes bug 290233. Drop older snapshots.
+
+*avidemux-2.5.1_p5396 (21 Oct 2009)
+
+ 21 Oct 2009; Ben de Groot <yngwin@gentoo.org> avidemux-2.5.1_p5359.ebuild,
+ +avidemux-2.5.1_p5396.ebuild:
+ Add new snapshot to work with new x264 snapshot (bug 287850), add
+ subversion as buildtime dep for snapshots (bug 287241).
+
+ 20 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+ avidemux-2.4.4-r2.ebuild:
+ Remove amrnb support wrt #252140.
+
+*avidemux-2.5.1_p5359 (30 Sep 2009)
+
+ 30 Sep 2009; Ben de Groot <yngwin@gentoo.org>
+ +avidemux-2.5.1_p5359.ebuild:
+ Adding snapshot from current 2.5 'gruntster' branch, which works with
+ newer x264 (bug 286801). Dropped a few patches which were applied upstream.
+
+*avidemux-2.5.1-r2 (30 Sep 2009)
+
+ 30 Sep 2009; Ben de Groot <yngwin@gentoo.org> avidemux-2.4.4-r2.ebuild,
+ -avidemux-2.5.0.ebuild, -avidemux-2.5.1-r1.ebuild,
+ +avidemux-2.5.1-r2.ebuild, metadata.xml:
+ Remove old, except stable. Cleanup wrt amr. Specify x264 dep to fix bug
+ 286801. Re-adding ~ppc keyword.
+
+ 27 Sep 2009; Dominik Kapusta <ayoy@gentoo.org> avidemux-2.5.0.ebuild,
+ avidemux-2.5.1-r1.ebuild:
+ Added a dependency on cmake-2.6.4 at least (bug #281560)
+
+*avidemux-2.5.1-r1 (24 Sep 2009)
+
+ 24 Sep 2009; Dominik Kapusta <ayoy@gentoo.org> +avidemux-2.5.1-r1.ebuild,
+ metadata.xml:
+ Version bump, dropping ~ppc keyword due to opencore-amr not keyworded yet
+ for ppc (bug #283839).
+
+ 15 Aug 2009; Ben de Groot <yngwin@gentoo.org> -avidemux-2.4.3.ebuild:
+ Remove old
+
+*avidemux-2.5.0 (04 Aug 2009)
+
+ 04 Aug 2009; Ben de Groot <yngwin@gentoo.org> +avidemux-2.5.0.ebuild:
+ Version bump
+
+ 28 Jun 2009; Markus Meier <maekke@gentoo.org> avidemux-2.4.4-r2.ebuild:
+ amd64 stable, bug #272842
+
+ 27 Jun 2009; Ben de Groot <yngwin@gentoo.org> -avidemux-2.4.4-r1.ebuild,
+ avidemux-2.4.4-r2.ebuild, +files/avidemux-2.4-ts-cmake.patch:
+ Add patch to fix possible parallel make issues, thanks to Martin von
+ Gagern in bug 272730. Remove old revision.
+
+ 26 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+ avidemux-2.4.4-r2.ebuild:
+ stable x86, bug 272842
+
+ 06 Jun 2009; nixnut <nixnut@gentoo.org> avidemux-2.4.4-r2.ebuild:
+ ppc stable #272842
+
+*avidemux-2.4.4-r2 (05 Jun 2009)
+
+ 05 Jun 2009; Ben de Groot <yngwin@gentoo.org> +avidemux-2.4.4-r2.ebuild:
+ Drop arts support (bug 270575). Always depend on libX11 (bug 257019).
+ Install translations into the right path (bug 272258). Drop die on distcc
+ (bug 261996).
+
+ 15 May 2009; Ben de Groot <yngwin@gentoo.org> -avidemux-2.4.4.ebuild,
+ avidemux-2.4.4-r1.ebuild, +files/avidemux-2.4.4-gcc-4.4.patch:
+ Remove old. Add patch to fix compilation with gcc-4.4 (bug 269114).
+
+*avidemux-2.4.4-r1 (08 May 2009)
+
+ 08 May 2009; Ben de Groot <yngwin@gentoo.org>
+ +files/avidemux-2.4-cmake264.patch, avidemux-2.4.3.ebuild,
+ +avidemux-2.4.4-r1.ebuild:
+ Re-enable qt4 useflag, which works again with qt 4.5.1 (bug 259414). Add
+ patch for cmake-2.6.4 change in behavior (bug 268618). Add test
+ restriction (bug 265218).
+
+*avidemux-2.4.4 (15 Feb 2009)
+
+ 15 Feb 2009; Ben de Groot <yngwin@gentoo.org> +avidemux-2.4.4.ebuild:
+ Version bump, dropping patches that have been applied upstream. Fixes bug
+ 258655. Dropping encode useflag, renaming lame useflag to mp3. Disabling
+ qt4 useflag, as that fails compilation, until someone supplies a patch or
+ I find more time to look into this issue.
+
+ 17 Jan 2009; Ben de Groot <yngwin@gentoo.org>
+ +files/lavcodec-mpegvideo_mmx-asm-fix.patch, avidemux-2.4.3.ebuild:
+ Add patch from ffmpeg to prevent compilation failure triggered by
+ -ftracer. Fixes bug 255268.
+
+ 21 Dec 2008; nixnut <nixnut@gentoo.org> avidemux-2.4.3.ebuild:
+ Stable on ppc wrt bug 245535
+
+ 20 Dec 2008; Thomas Anderson <gentoofan23@gentoo.org>
+ avidemux-2.4.3.ebuild:
+ stable amd64, bug 245535
+
+ 15 Dec 2008; <ssuominen@gentoo.org> avidemux-2.4.3.ebuild:
+ x86 stable wrt #245535
+
+ 04 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> avidemux-2.4.1.ebuild:
+ Fix x264 dependencies in preparation for ffmpeg bump.
+
+ 16 Oct 2008; Ben de Groot <yngwin@gentoo.org>
+ +files/avidemux-2.4.3-x264.patch, avidemux-2.4.3.ebuild:
+ Adding patch for newer x264 from upstream. Thanks to Tim Harder in bug
+ 240446.
+
+ 24 Sep 2008; Ben de Groot <yngwin@gentoo.org> -avidemux-2.4.ebuild,
+ avidemux-2.4.1.ebuild, -avidemux-2.4.2.ebuild, avidemux-2.4.3.ebuild:
+ Split out aac and lame configure flags, to fix bug 236229. Remove old
+ ~arch versions.
+
+*avidemux-2.4.3 (10 Aug 2008)
+
+ 10 Aug 2008; Ben de Groot <yngwin@gentoo.org> +avidemux-2.4.3.ebuild:
+ Version bump
+
+ 26 Jul 2008; Carsten Lohrke <carlo@gentoo.org> avidemux-2.4.ebuild,
+ avidemux-2.4.1.ebuild, avidemux-2.4.2.ebuild:
+ Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
+
+*avidemux-2.4.2 (12 Jul 2008)
+
+ 12 Jul 2008; Ben de Groot <yngwin@gentoo.org>
+ +files/avidemux-2.4.2-x264-2pass-fix.patch, +avidemux-2.4.2.ebuild:
+ Version bump. Bug 231151.
+
+ 22 Jun 2008; Markus Meier <maekke@gentoo.org> avidemux-2.4.1.ebuild:
+ amd64/x86 stable, bug #227307
+
+ 20 Jun 2008; Ben de Groot <yngwin@gentoo.org> avidemux-2.4.1.ebuild:
+ Adding check for distcc and die if present in FEATURES. Bug 213455.
+
+ 16 Jun 2008; nixnut <nixnut@gentoo.org> avidemux-2.4.1.ebuild:
+ Stable on ppc wrt bug 227307
+
+ 19 Apr 2008; Ben de Groot <yngwin@gentoo.org> avidemux-2.4.ebuild,
+ avidemux-2.4.1.ebuild:
+ Adjusting qt:4 dep
+
+ 10 Apr 2008; Ben de Groot <yngwin@gentoo.org> avidemux-2.4.ebuild,
+ avidemux-2.4.1.ebuild:
+ Adjust dependency for split qt-4.
+
+ 10 Apr 2008; Ben de Groot <yngwin@gentoo.org>
+ +files/avidemux-2.4.1-gcc43-includes.patch,
+ +files/avidemux-2.4.1-gcc43-missing-asm-naming.patch,
+ avidemux-2.4.1.ebuild:
+ Adding gcc-4.3 patches from bug 213099.
+
+ 07 Apr 2008; Ben de Groot <yngwin@gentoo.org> avidemux-2.4.ebuild,
+ avidemux-2.4.1.ebuild:
+ Pkgmove x264-svn to x264
+
+*avidemux-2.4.1 (17 Feb 2008)
+
+ 17 Feb 2008; Ben de Groot (yngwin) <ben@berkano.net> metadata.xml,
+ +avidemux-2.4.1.ebuild:
+ Version bump. Should fix #207326.
+
+ 15 Feb 2008; Samuli Suominen <drac@gentoo.org> avidemux-2.4.ebuild:
+ Move fontconfig behind truetype flag to match other ebuilds in tree.
+
+ 28 Jan 2008; Samuli Suominen <drac@gentoo.org> avidemux-2.4.ebuild:
+ Change qt dep to >=4.3 wrt #207743.
+
+*avidemux-2.4 (28 Dec 2007)
+
+ 28 Dec 2007; Samuli Suominen <drac@gentoo.org>
+ +files/avidemux-2.4-i18n.patch, +files/avidemux-2.4-libdca.patch,
+ +avidemux-2.4.ebuild:
+ Version bump wrt #203164, thanks to Joe for reporting.
+
+ 25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
+ Removing zypher from metadata.xml as per #26909.
+
+ 01 Dec 2007; Samuli Suominen <drac@gentoo.org> avidemux-2.4_pre3.ebuild:
+ Update cmake dep. to 2.4.4 wrt #200940, thanks to Honza for reporting.
+
+ 30 Nov 2007; Samuli Suominen <drac@gentoo.org>
+ +files/avidemux-2.4_pre3-i18n.patch, avidemux-2.4_pre3.ebuild:
+ Change i18n installation directory.
+
+*avidemux-2.4_pre3 (30 Nov 2007)
+
+ 30 Nov 2007; Samuli Suominen <drac@gentoo.org>
+ +files/avidemux-2.4_pre3-libdca.patch, +avidemux-2.4_pre3.ebuild:
+ Version bump, ebuild from /dev/null but thanks to yngwin for original ebuild
+ at berkano overlay and Ingmar from #genkdesvn for helping with cmake utils.
+
+ 27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> avidemux-2.3.0.ebuild:
+ Fixed quoting.
+
+ 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ avidemux-2.3.0.ebuild:
+ Drop virtual/x11 references.
+
+ 07 Feb 2007; Alexis Ballier <aballier@gentoo.org> avidemux-2.3.0.ebuild:
+ Fix faac configuration, bug #165817
+
+ 03 Feb 2007; Alexis Ballier <aballier@gentoo.org>
+ files/avidemux-2.3.0-twolame.patch, avidemux-2.3.0.ebuild:
+ external twolame patch update from Fabrice Delliaux
+
+ 03 Feb 2007; Alexis Ballier <aballier@gentoo.org> avidemux-2.3.0.ebuild:
+ make install -> emake
+
+ 03 Feb 2007; Steve Dibb <beandog@gentoo.org>
+ -files/avidemux-2.0.42-as-needed.patch, -files/avidemux-altivec.patch,
+ -files/avidemux-extra-qualification.diff:
+ Remove old patches
+
+ 03 Feb 2007; Steve Dibb <beandog@gentoo.org> -avidemux-2.0.42-r1.ebuild,
+ -avidemux-2.1_pre1.ebuild:
+ Remove old versions
+
+ 03 Feb 2007; Alexis Ballier <aballier@gentoo.org>
+ +files/avidemux-2.3.0-twolame.patch, avidemux-2.3.0.ebuild:
+ Patch to build with external twolame, thanks to Fabrice Delliaux, bug #158340
+
+ 02 Feb 2007; Alexis Ballier <aballier@gentoo.org>
+ +files/avidemux-2.3.0-amprogas.patch, avidemux-2.3.0.ebuild:
+ Use eautoreconf rather than the provided script, bug #164973
+
+ 02 Feb 2007; Alexis Ballier <aballier@gentoo.org>
+ +files/avidemux-2.3.0-po.makefile.patch, avidemux-2.3.0.ebuild:
+ parallel make fix, bug #163376, add some quotes, einfo -> elog conversion
+
+ 23 Jan 2007; Steve Dibb <beandog@gentoo.org> avidemux-2.3.0.ebuild:
+ Autotools fix, bug 163376
+
+*avidemux-2.3.0 (22 Jan 2007)
+
+ 22 Jan 2007; Steve Dibb <beandog@gentoo.org>
+ +files/avidemux-2.3.0-configure.patch, +files/avidemux-2.3.0-dts.patch,
+ +avidemux-2.3.0.ebuild:
+ Version bump, bug 150175
+
+ 10 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
+ Add missing email address for herd with name != alias.
+
+ 05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+ avidemux-2.0.42-r1.ebuild, avidemux-2.1_pre1.ebuild:
+ Convert to use elog.
+
+ 16 Sep 2006; Michael Sterrett <mr_bones_@gentoo.org>
+ -avidemux-2.0.24.ebuild:
+ clean out old, non-modX ebuild
+
+ 14 Sep 2006; Matthias Schwarzott <zzam@gentoo.org>
+ +files/avidemux-2.0.42-as-needed.patch, avidemux-2.0.42-r1.ebuild:
+ Added patch to make it link with --as-needed, Bug #145684.
+
+ 07 Sep 2006; Joshua Jackson <tsunam@gentoo.org> avidemux-2.0.42-r1.ebuild:
+ stable x86; bug #140715
+
+ 06 Sep 2006; Joseph Jezak <josejx@gentoo.org> avidemux-2.0.42-r1.ebuild:
+ Marked ppc stable for bug #140715.
+
+ 08 Jul 2006; Joseph Jezak <josejx@gentoo.org>
+ +files/avidemux-altivec.patch, avidemux-2.0.42-r1.ebuild:
+ Added altivec patch from bug #107209.
+
+ 14 Apr 2006; Mark Loeser <halcy0n@gentoo.org>
+ +files/avidemux-extra-qualification.diff, avidemux-2.0.42-r1.ebuild:
+ Add patch to fix compilation with gcc-4.1 by Hanno Meyer-Thurow <h DOT mth
+ AT web dot de>; bug #126287
+
+ 15 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> avidemux-2.0.24.ebuild,
+ avidemux-2.0.42-r1.ebuild, avidemux-2.1_pre1.ebuild:
+ Fix dependencies: gettext is not an RDEPEND.
+
+ 26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> avidemux-2.0.24.ebuild:
+ Cleanup
+
+ 19 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+ avidemux-2.0.42-r1.ebuild, avidemux-2.1_pre1.ebuild:
+ Fix dependencies for modular x.
+
+ 04 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+ avidemux-2.1_pre1.ebuild:
+ Bump requirement of spidermonkey to a version that actually provide jsapi.h.
+ See bug #111445. Move flags filtering in pkg_setup in the mean time.
+
+*avidemux-2.0.42-r1 (03 Sep 2005)
+
+ 03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+ -avidemux-2.0.42.ebuild, +avidemux-2.0.42-r1.ebuild:
+ Added patch to fix hangs during export of JPEG sequences. Thanks to Alexey
+ Drobiyan in bug #104013.
+
+ 30 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+ -files/2.0.38_rc2-fix-faad.patch, -avidemux-2.0.38.ebuild,
+ -avidemux-2.0.38-r1.ebuild, -avidemux-2.0.40.ebuild,
+ -avidemux-2.0.40-r1.ebuild:
+ Removed extra versions, leaving 2.1 pre, 2.0.24 (stable) and 2.0.42 (target
+ stable?).
+
+*avidemux-2.1_pre1 (22 Aug 2005)
+
+ 22 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+ +avidemux-2.1_pre1.ebuild:
+ Added pre version of Avidemux 2.1, with heavy patching. Need quite a bit of
+ testing.
+
+ 08 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> avidemux-2.0.42.ebuild:
+ Added patch to respect CXXFLAGS.
+
+ 07 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> avidemux-2.0.42.ebuild:
+ Use fixheadtails eclass to fix non-POSIX head calls.
+
+ 07 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> avidemux-2.0.42.ebuild:
+ Updated patchlevel with PIC/__PIC__ patch.
+
+*avidemux-2.0.42 (23 Jul 2005)
+
+ 23 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+ +avidemux-2.0.42.ebuild:
+ New upstream version. Closes #99984.
+
+ 29 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+ avidemux-2.0.40-r1.ebuild:
+ Now install icon and .desktop file for Avidemux2.
+
+*avidemux-2.0.40-r1 (26 May 2005)
+
+ 26 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+ +avidemux-2.0.40-r1.ebuild:
+ New revision to cope with latest faad2 API changes.
+
+ 25 May 2005; Diego Pettenò <flameeyes@gentoo.org> avidemux-2.0.38.ebuild,
+ avidemux-2.0.38-r1.ebuild, avidemux-2.0.40.ebuild:
+ Added a check to avoid compiling without audio devices (make the compilation
+ fail). Closes #93943.
+
+*avidemux-2.0.40 (25 May 2005)
+
+ 25 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+ -avidemux-2.0.36.ebuild, -avidemux-2.0.38_rc2.ebuild,
+ -avidemux-2.0.38_rc2-r1.ebuild, -avidemux-2.0.38_rc3-r1.ebuild,
+ +avidemux-2.0.40.ebuild:
+ New upstream version, removed some old versions.
+
+*avidemux-2.0.38-r1 (18 May 2005)
+
+ 18 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+ +avidemux-2.0.38-r1.ebuild:
+ Added the two patches from upstream for latest version.
+
+*avidemux-2.0.38 (14 May 2005)
+
+ 14 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+ +avidemux-2.0.38.ebuild:
+ New upstream version, out of rc. Removed mmx useflag as upstream removed
+ --enable-mmx and just enable it at runtime if found. Patchset updated as
+ needed.
+
+ 12 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+ avidemux-2.0.38_rc3-r1.ebuild:
+ Added patch which should fix bug #89356.
+
+*avidemux-2.0.38_rc3-r1 (07 May 2005)
+
+ 07 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+ -avidemux-2.0.38_rc3.ebuild, +avidemux-2.0.38_rc3-r1.ebuild:
+ Removed faad patch as faad2-2.0-r6 broken the build. Fixes #91799.
+
+*avidemux-2.0.38_rc3 (02 May 2005)
+
+ 02 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+ +avidemux-2.0.38_rc3.ebuild:
+ New upstream version. Updated patchset for new version.
+
+ 01 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+ -files/2.0.38_rc1_mpegidentify.patch,
+ -files/avidemux-0.9-libxml2.5.7.patch,
+ -files/avidemux-2.0.30_amd64_cpuutil.patch,
+ -files/avidemux-2.0.30_fixes.patch,
+ -files/avidemux-2.0.32_mpeg_ps_fix.patch,
+ -files/avidemux-2.0.34-test1_faac.patch,
+ -files/avidemux-2.0.38_rc2-aclocal.patch, -files/alsa.patch,
+ -files/gcc2.patch, -files/avidemux-2.0.38_rc2-mmx_altivec.patch,
+ -files/patch_jpeg.diff, -files/resize_crash.patch, -files/xvid.patch,
+ -avidemux-2.0.34_rc1.ebuild, -avidemux-2.0.34_rc1-r1.ebuild,
+ -avidemux-2.0.34_rc2.ebuild, -avidemux-2.0.38_rc1.ebuild,
+ avidemux-2.0.38_rc2-r1.ebuild:
+ Removed old ebuilds (release candidates) and orphaned files. Make a new
+ patchset tarball so that it doesn't need files in FILESDIR. Now just one
+ file is there.
+
+ 29 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+ avidemux-2.0.38_rc2-r1.ebuild:
+ Fixed patchset urls.
+
+ 21 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+ avidemux-2.0.38_rc2-r1.ebuild:
+ Increased requirement of faad of at least -r5 which has the change in API
+ calls so that can't be installed in old-API systems.
+
+ 19 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+ +files/avidemux-2.0.38_rc2-mmx_altivec.patch,
+ avidemux-2.0.38_rc2-r1.ebuild:
+ Added patch to fix upstream --enable params on configure which are borked.
+ Fixes #89356.
+
+ 18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+ +files/avidemux-2.0.38_rc2-aclocal.patch, avidemux-2.0.38_rc2-r1.ebuild:
+ Added a patch for some strange autotools combination which doesn't look in
+ m4 directory. Fixes #89575.
+
+*avidemux-2.0.38_rc2-r1 (18 Apr 2005)
+
+ 18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+ +avidemux-2.0.38_rc2-r1.ebuild:
+ Added a new revision to avidemux with configure patches which makes
+ deprecated the configure cache tricks. Fixes #89097.
+
+ 15 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+ avidemux-2.0.34_rc1-r1.ebuild, avidemux-2.0.34_rc2.ebuild,
+ avidemux-2.0.36.ebuild, avidemux-2.0.38_rc1.ebuild,
+ avidemux-2.0.38_rc2.ebuild:
+ doesnt makes use of the pic useflag any longer
+
+ 06 Apr 2005; Luca Barbato <lu_zero@gentoo.org> avidemux-2.0.38_rc2.ebuild:
+ Another fix to configure args
+
+ 06 Apr 2005; Luca Barbato <lu_zero@gentoo.org> avidemux-2.0.38_rc2.ebuild:
+ Minor fix
+
+ 05 Apr 2005; Luca Barbato <lu_zero@gentoo.org>
+ +files/2.0.38_rc2-fix-faad.patch, avidemux-2.0.38_rc2.ebuild:
+ fix for bug #86935, thanks again Diego
+
+*avidemux-2.0.38rc2b (31 Mar 2005)
+
+ 03 Apr 2005; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.38_rc2.ebuild:
+ Version bump.
+
+ 31 Mar 2005; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.36.ebuild:
+ Fixed typo, closing bug #87380.
+
+*avidemux-2.0.38rc1 (20 Feb 2005)
+
+ 21 Feb 2005; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.38_rc1.ebuild:
+ Version bump.
+
+*avidemux-2.0.36 (12 Jan 2005)
+
+ 14 Jan 2005; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.36.ebuild:
+ Version bump.
+
+ 14 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ avidemux-2.0.34_rc1-r1.ebuild, avidemux-2.0.34_rc2.ebuild:
+ Using 'aac' instead of faad and faac.
+
+*avidemux-2.0.34_rc2 (11 Dec 2004)
+
+ 12 Dec 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.34_rc2.ebuild:
+ Version bump, changed usage of mmx-flag to autodetect if not diabled.
+
+ 30 Nov 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.34_rc1-r1.ebuild,
+ Cleanup and addition of missing USE-flags, solves bug #72217.
+ Thanks go to Diego Pettenò for bug and suggested fix.
+
+ 26 Nov 2004; Chris White <chriswhite@gentoo.org> -avidemux-0.9-r1.ebuild,
+ -avidemux-2.0.18.ebuild, -avidemux-2.0.20.ebuild, -avidemux-2.0.22.ebuild,
+ -avidemux-2.0.26.ebuild, -avidemux-2.0.28.ebuild, -avidemux-2.0.30.ebuild,
+ -avidemux-2.0.32.ebuild:
+ Removed old ebuilds with permission from zypher.
+
+ 09 Nov 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.34_rc1.ebuild:
+ Version bump.
+
+*avidemux-2.0.32 (26 Okt 2004)
+
+ 29 Okt 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.32.ebuild:
+ Version bump.
+
+ 19 Okt 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.30.ebuild:
+ Added amd64-patch, closes bug #68052.
+
+*avidemux-2.0.30 (15 Okt 2004)
+
+ 17 Okt 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.30.ebuild:
+ Version bump.
+
+ 23 Sep 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.26.ebuild,
+ avidemux-2.0.28.ebuild:
+ Added faad2 dependency, closes bug #59556
+
+ 29 Aug 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.28.ebuild:
+ Added xvid-(0.9)-patch.
+ Closes bug #61895
+
+ 26 Aug 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.28.ebuild:
+ Added "-fforce-addr" to the list of filtered flags.
+ Closes bug #61632 and #61612
+
+*avidemux-2.0.28 (12 Aug 2004)
+
+ 24 Aug 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.28.ebuild:
+ Version bump, closes bug #60254.Introducing xvid-1.0 as a dependency.
+ Thanks to Ken Garland for his submission.
+
+ 23 Jul 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.26.ebuild:
+ Cleaned up filter-flags, closes bug #58112.
+
+ 23 Jul 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.26.ebuild:
+ Version bump.
+ Added dependency to faac, closes bug #58080.
+
+ 22 Jul 2004; Marc Hildebrand <zypher@gentoo.org> metadata.xml,
+ avidemux-2.0.24.ebuild:
+ Changed package maintainer (Added myself).
+ Fixed configure and configure.in, closing bug #57831
+
+ 22 Jul 2004; Chris White <chriswhite@gentoo.org> metadata.xml,
+ avidemux-2.0.24.ebuild:
+ Added myself to metadata.xml as package maintainer. Added -funroll-all-loops
+ to the filter-flags list. It appears that both -funroll-loops and
+ -funroll-all-loops both kill the build.
+
+ 19 Jul 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.24.ebuild:
+ Added dependency for automake-1.8.3, fixes bug #57328
+
+ 26 Jun 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.24.ebuild:
+ Marked stable for ppc and testing for ~amd64.
+
+ 23 Jun 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.24.ebuild:
+ Marked stable for x86.
+
+ 09 Jun 2004; Aron Griffis <agriffis@gentoo.org> avidemux-0.9-r1.ebuild,
+ avidemux-2.0.18.ebuild, avidemux-2.0.20.ebuild, avidemux-2.0.22.ebuild,
+ avidemux-2.0.24.ebuild:
+ Fix use invocation
+
+*avidemux-2.0.24 (08 May 2004)
+
+ 08 May 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.24.ebuild:
+ Version bump.
+
+ 03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ avidemux-0.9-r1.ebuild, avidemux-2.0.18.ebuild, avidemux-2.0.20.ebuild,
+ avidemux-2.0.22.ebuild:
+ Changing mad dep to madplay.
+
+ Removed divx4linux dep as it's not used anyway. Closes bug #45176
+ bumped to stable
+
+*avidemux-2.0.22 (28 Feb 2004)
+
+ 28 Feb 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.22.ebuild:
+ Version bumped.
+
+ 01 Feb 2004; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.18.ebuild,
+ files/alsa.patch:
+ adding alsa.patch Closes 38982
+
+ 01 Feb 2004; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.18.ebuild,
+ avidemux-2.0.20.ebuild:
+ adding filter. Closes 39980.
+
+*avidemux-2.0.20 (21 Dec 2003)
+
+ 01 May 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.20.ebuild:
+ Removed divx4linux dep as it's not used anyway. Closes bug #45176
+
+ 21 Dec 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.20.ebuild:
+ Version bumped. Closes 36224.
+
+ 27 Nov 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.18.ebuild,
+ files/resize_crash.patch:
+ adding patch. Closes #33993.
+
+ 02 Nov 2003; Martin Holzer <mholzer@gentoo.org>
+ avidemux-2.0.16.ebuild, avidemux-2.0.18.ebuild, files/gcc2.patch:
+ adding gcc2 patch.
+
+*avidemux-2.0.18 (01 Nov 2003)
+
+ 01 May 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.18.ebuild:
+ Removed divx4linux dep as it's not used anyway. Closes bug #45176
+
+ 01 Nov 2003; Markus Nigbur <pyrania@gentoo.org> avidemux-2.0.18.ebuild:
+ Version bump.
+
+ 30 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> avidemux-0.9.ebuild:
+ removed old ebuild that had an odd DEPEND on a no longer existing libxml2
+
+*avidemux-2.0.16 (29 Sep 2003)
+
+ 29 Sep 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.16.ebuild:
+ Version bumped. Closes #29824.
+
+ 20 Aug 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.12.ebuild,
+ avidemux-2.0.14.ebuild:
+ Filtering out flag. Closes #26936.
+
+*avidemux-2.0.14 (17 Aug 2003)
+
+ 17 Aug 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.14.ebuild:
+ Version bumped.
+
+*avidemux-2.0.12 (04 Aug 2003)
+
+ 04 Aug 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.12.ebuild:
+ Verison bumped as always #25896.
+
+*avidemux-0.9-r1 (22 Jul 2003)
+
+ 22 Jul 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9-r1.ebuild,
+ files/avidemux-0.9-libxml2.5.7.patch:
+ Fixing libxml2 issue. Submitted by Marc Hildebrand
+ <marc.hildebrand@t-online.de> in #24545.
+
+ 19 Jul 2003; Nick Hadaway <raker@gentoo.org> avidemux-2.0.10-r1.ebuild:
+ Readjusted for a mad metapackage Changed to econf. Added debug and
+ nls USE variables. Author suggests marking 2.0.10 as stable. Also
+ added alsa, arts, oggvorbis, and truetype USE variables albeit with no
+ configure opts.
+
+*avidemux-2.0.10-r1 (17 Jul 2003)
+
+ 17 Jul 2003; Nick Hadaway <raker@gentoo.org> avidemux-2.0.10-r1.ebuild:
+ New ebuild which depends on media-libs/{libmad,libid3tag}
+
+*avidemux-2.0.10 (14 Jul 2003)
+
+ 14 Jul 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.10.ebuild:
+ Version bumped.
+
+*avidemux-2.0.9 (11 Jul 2003)
+
+ 11 Jul 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.2.ebuild,
+ avidemux-2.0.9.ebuild:
+ Version bumped. Ebuild submitted by Marc Hildebrand
+ <marc.hildebrand@t-online.de> in #24216.
+
+*avidemux-2.0.8 (28 Jun 2003)
+
+ 28 Jun 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.8.ebuild:
+ Version bumped. Ebuild submitted by Marc Hildebrand
+ <marc.hildebrand@t-online.de> in #20182.
+
+*avidemux-2.0.3_rc2 (24 May 2003)
+
+ 24 May 2003; Lars Weiler <pylon@gentoo.org> avidemux-2.0.3_rc2.ebuild:
+ Newer release candidat added. Thanks to Marc Hildebrand
+ <marc.hildebrand@t-online.de> for the ebuild.
+
+*avidemux-0.9 (27 Apr 2003)
+
+ 01 May 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9.ebuild:
+ Marked as stable
+
+ 28 Apr 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9.ebuild:
+ Added libxml2 IUSE. Closes #20097.
+
+ 27 Apr 2003; Mike Frysinger <vapier@gentoo.org> :
+ Version bump.
+
+*avidemux-0.9_rc3 (23 Mar 2003)
+
+ 29 Mar 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_rc3.ebuild:
+ Marked as stable.
+
+ 23 Mar 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_rc1.ebuild,
+ avidemux-0.9_rc3.ebuild:
+ Version bumped and cleanup.
+
+*avidemux-0.9_rc2 (12 Mar 2003)
+
+ 12 Mar 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_rc2.ebuild
+ files/digest-avidemux-0.9_rc2 ChangeLog :
+ Version bumped. Thx for ebuild to marc.hildebrand@t-online.de submitted
+ in #17292.
+
+*avidemux-0.9-rc1 (10 Mar 2003)
+
+ 10 Mar 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_rc1.ebuild
+ files/digest-avidemux-0.9_rc1 ChangeLog :
+ Version bumped. Thx for ebuild to marc.hildebrand@t-online.de submitted in
+ #16909.
+
+*avidemux-0.9-pre32 (09 Feb 2003)
+
+ 21 Feb 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_pre32.ebuild
+ Marked as stable.
+
+ 09 Feb 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_pre32.ebuild
+ files/digest-avidemux-0.9_pre32 ChangeLog :
+ Version bumped. Thx for ebuild to marc.hildebrand@t-online.de submitted in
+ #15366.
+
+*avidemux-0.9-pre30 (20 Jan 2003)
+
+ 20 Jan 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_pre30.ebuild
+ files/digest-avidemux-0.9_pre30 files/ASM_vidDeintAsm.cpp.diff.gz
+ files/gui_filter.diff.gz ChangeLog :
+ Version bumped. Thx for ebuild to marc.hildebrand@t-online.de submitted in
+ #14174.
+
+*avidemux-0.9-pre28 (09 Jan 2003)
+
+ 09 Jan 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_pre28.ebuild
+ files/digest-avidemux-0.9_pre28 ChangeLog :
+ Version bumped. Thx for ebuild to marc.hildebrand@t-online.de submitted in
+ #13300. Including now fix to compile with -O3
+
+*avidemux-0.9-pre26 (08 Jan 2003)
+
+ 08 Jan 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_pre26.ebuild
+ files/digest-avidemux-0.9_pre26 ChangeLog :
+ New Version + Patch to compile with freetype 2.1.3
+
+*avidemux-0.9-pre24 (09 Dec 2002)
+
+ 09 Dec 2002; Mike Frysinger <vapier@gentoo.org> :
+ version bump #11776
+
+*avidemux-0.9-pre22 (22 Nov 2002)
+
+ 22 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+ version bump #11024
+
+*avidemux-0.9-pre18 (06 Okt 2002)
+
+ 25 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+ Initial import. Ebuilds from #8621 and #7973
+ Ronny Pietschke <pietschke.r@t-online.de> (#8621)
+ Marc Hildebrand <marc.hildebrand@t-online.de>
+
+ 06 Okt 2002; Marc Hildebrand <marc.hildebrand@t-online.de> :
+ Small fix.
+ see http://fixounet.free.fr/avidemux/ for details
+
+*avidemux-0.9-pre17-fixed (05 Okt 2002)
+
+ 05 Okt 2002; Marc Hildebrand <marc.hildebrand@t-online.de> :
+ The author fixed the code, compiles now without ffmpeg.
+ see http://fixounet.free.fr/avidemux/ for details
+
+*avidemux-0.9-pre17 (03 Okt 2002)
+
+ 05 Okt (Marc Hildebrand <marc.hildebrand@t-online.de> :
+ This version won't compile without ffmpeg installed:
+ Grab ffmpeg from cvs (or /usr/portage/distfiles) and install it this way:
+ ./configure --prefix=/usr --enable-shared && make && make install
+
+ Then try to emerge avidemux again.
+
+ New features/bugfixes:
+ see http://fixounet.free.fr/avidemux/ for details
+
+*avidemux-0.9-pre16 (15 Sep 2002)
+
+ 23 Sep 2002; Marc Hildebrand <marc.hildebrand@t-online.de> :
+ Fixes and changes by the author. Changed name of ebuild-file to match
+ version better.
+ see http://fixounet.free.fr/avidemux/ for details
+
+*avidemux-0.9-pre14 (15 Sep 2002)
+
+ 10 Sep 2002; Marc Hildebrand <marc.hildebrand@t-online.de> :
+ Small fixes and changes by the author.
+ see http://fixounet.free.fr/avidemux/ for details
+
+*avidemux-0.9-pre13 (30 Aug 2002)
+
+ 10 Sep 2002; Marc Hildebrand <marc.hildebrand@t-online.de> :
+ Initial ebuild.
+ see http://fixounet.free.fr/avidemux/ for details
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
new file mode 100644
index 0000000..6e8e6be
--- /dev/null
+++ b/media-video/avidemux/Manifest
@@ -0,0 +1 @@
+DIST avidemux_2.5.6.tar.gz 14914123 SHA256 d6da7f2c4304368bd9c367a74a464b47d42fee9cada2960e70053d61c1ef9b8b SHA512 8a9dcfc61a396fc4f9f0a213269bcb574de0baa442d3165cfab0fe8e86309e7b0dd2ffe3e2d7ff8a8e6e3fd15da28699e8000367d92da0782fec6d5a38c1d77c WHIRLPOOL fecca87889b19a321a9fe13e734ca11a883c88152e5d59926ecd423b178bb26ef611ee00d8b2897f8a4a36a5c159d6c9f32733bc98fccced08532b8f060bd6ac
diff --git a/media-video/avidemux/avidemux-2.5.6-r1.ebuild b/media-video/avidemux/avidemux-2.5.6-r1.ebuild
new file mode 100644
index 0000000..fed55ec
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.5.6-r1.ebuild
@@ -0,0 +1,174 @@
+# 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.6-r1.ebuild,v 1.1 2012/03/18 20:21:36 pesa Exp $
+
+EAPI=4
+
+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 ~x86"
+IUSE="aac aften alsa amr gtk jack +mp3 nls opengl oss pulseaudio
+ +qt4 sdl +truetype vorbis vpx +x264 +xv +xvid"
+
+RDEPEND="
+ <=dev-lang/spidermonkey-1.7.0-r2
+ dev-libs/libxml2
+ sys-libs/zlib
+ aac? (
+ media-libs/faac
+ media-libs/faad2
+ )
+ aften? ( media-libs/aften[cxx] )
+ alsa? ( media-libs/alsa-lib )
+ amr? ( media-libs/opencore-amr )
+ gtk? ( x11-libs/gtk+:2 )
+ jack? (
+ media-libs/libsamplerate
+ media-sound/jack-audio-connection-kit
+ )
+ mp3? ( media-sound/lame )
+ pulseaudio? ( media-sound/pulseaudio )
+ qt4? (
+ >=x11-libs/qt-gui-4.6:4
+ opengl? (
+ virtual/opengl
+ >=x11-libs/qt-opengl-4.6:4
+ )
+ )
+ sdl? ( media-libs/libsdl )
+ truetype? (
+ media-libs/freetype:2
+ media-libs/fontconfig
+ )
+ vorbis? ( media-libs/libvorbis )
+ vpx? ( media-libs/libvpx )
+ x264? ( media-libs/x264 )
+ xv? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXv
+ )
+ xvid? ( media-libs/xvid )
+"
+DEPEND="${RDEPEND}
+ dev-lang/yasm
+ dev-util/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+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 lang in ${AVIDEMUX_LANGS}; do
+ IUSE+=" linguas_${lang}"
+done
+unset lang
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.5.4-build-plugins-fix.patch"
+)
+
+src_prepare() {
+ base_src_prepare
+
+ local lingua= po_files= qt_ts_files= avidemux_ts_files=
+ for lingua in ${LINGUAS}; do
+ if has ${lingua} ${AVIDEMUX_LANGS}; then
+ if [[ -e ${S}/po/${lingua}.po ]]; then
+ po_files+=" \${po_subdir}/${lingua}.po"
+ fi
+ if [[ -e ${S}/po/qt_${lingua}.ts ]]; then
+ qt_ts_files+=" \${ts_subdir}/qt_${lingua}.ts"
+ fi
+ if [[ -e ${S}/po/${PN}_${lingua}.ts ]]; then
+ 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 -e '/^Exec/ s:\[\$e\]::' avidemux2-gtk.desktop || die
+ sed -i -e '/^Exec/ s:\(avidemux2_\)gtk:\1qt4:' avidemux2.desktop || die
+
+ # don't install Windows-only files
+ sed -i -e '/addons\/avsfilter/d' CMakeLists.txt || die
+}
+
+src_configure() {
+ # Add lax vector typing for PowerPC
+ if use ppc || use ppc64; then
+ append-cflags -flax-vector-conversions
+ fi
+
+ local mycmakeargs=(
+ -DAVIDEMUX_SOURCE_DIR="${S}"
+ -DAVIDEMUX_INSTALL_PREFIX="${BUILD_S}"
+ -DAVIDEMUX_CORECONFIG_DIR="${BUILD_S}/config"
+ -DARTS=OFF
+ -DESD=OFF
+ -DUSE_SYSTEM_SPIDERMONKEY=ON
+ -DSPIDERMONKEY_INCLUDE_DIR="${EPREFIX}/usr/include/js"
+ -DSPIDERMONKEY_LIBRARY_DIR="${EPREFIX}/usr/$(get_libdir)/libjs.so"
+ $(cmake-utils_use aac FAAC)
+ $(cmake-utils_use aac FAAD)
+ $(cmake-utils_use aften)
+ $(cmake-utils_use alsa)
+ $(cmake-utils_use amr OPENCORE_AMRNB)
+ $(cmake-utils_use amr OPENCORE_AMRWB)
+ $(cmake-utils_use gtk)
+ $(cmake-utils_use jack)
+ $(cmake-utils_use mp3 LAME)
+ $(cmake-utils_use nls GETTEXT)
+ $(cmake-utils_use_use opengl)
+ $(cmake-utils_use oss)
+ $(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
+ $(cmake-utils_use qt4)
+ $(cmake-utils_use sdl)
+ $(cmake-utils_use truetype FREETYPE2)
+ $(cmake-utils_use truetype FONTCONFIG)
+ $(cmake-utils_use vorbis)
+ $(cmake-utils_use vorbis LIBVORBIS)
+ $(cmake-utils_use vpx VPXDEC)
+ $(cmake-utils_use x264)
+ $(cmake-utils_use xv XVIDEO)
+ $(cmake-utils_use xvid)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ # first build the application
+ cmake-utils_src_compile -j1
+
+ # and then go on with plugins
+ emake -C "${CMAKE_BUILD_DIR}/plugins"
+}
+
+src_install() {
+ # install the application
+ cmake-utils_src_install
+
+ # install plugins
+ emake -C "${CMAKE_BUILD_DIR}/plugins" DESTDIR="${D}" install
+
+ dodoc AUTHORS
+ newicon ${PN}_icon.png ${PN}.png
+
+ use gtk && domenu avidemux2-gtk.desktop
+ use qt4 && domenu avidemux2.desktop
+}
diff --git a/media-video/avidemux/files/avidemux-2.5.4-build-plugins-fix.patch b/media-video/avidemux/files/avidemux-2.5.4-build-plugins-fix.patch
new file mode 100644
index 0000000..66b44ad
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.5.4-build-plugins-fix.patch
@@ -0,0 +1,13 @@
+Index: avidemux_2.5.4/CMakeLists.txt
+===================================================================
+--- avidemux_2.5.4.orig/CMakeLists.txt
++++ avidemux_2.5.4/CMakeLists.txt
+@@ -205,7 +205,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.4-dummy-sound-fix.patch b/media-video/avidemux/files/avidemux-2.5.4-dummy-sound-fix.patch
new file mode 100644
index 0000000..e071dce
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.5.4-dummy-sound-fix.patch
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000..62011a9
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.5.4-openfileqt.patch
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 0000000..c627667
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.5.4-x264-build115.patch
@@ -0,0 +1,45 @@
+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
new file mode 100644
index 0000000..c0825af
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.5.4-x264-version-fix.patch
@@ -0,0 +1,81 @@
+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
new file mode 100644
index 0000000..5dd3506
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.5.4-x264.patch
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 0000000..6b1d2f0
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.5.4-xvid.patch
@@ -0,0 +1,23 @@
+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);
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
new file mode 100644
index 0000000..7f9ae3f
--- /dev/null
+++ b/media-video/avidemux/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qt</herd>
+<herd>video</herd>
+<use>
+ <flag name="aften">Enable A/52 (AC-3) audio encoder support</flag>
+ <flag name="amr">Enable Adaptive Multi-Rate format support through
+ <pkg>media-libs/opencore-amr</pkg></flag>
+ <flag name="vpx">Enable vp8 codec support using <pkg>media-libs/libvpx</pkg></flag>
+</use>
+</pkgmetadata>