Version bump. See http://fixounet.free.fr/avidemux for complete changelog.

4 files changed, 82 insertions, 9 deletions

diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 14183b367c6f..14c40033c2f8 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,17 +1,19 @@
-MD5 ae52e42b3b8a35743b9fa6e732c73f99 ChangeLog 9049
-MD5 7256a686e0dbef20b41142c8741b56e8 avidemux-2.0.20.ebuild 2294
-MD5 0a839c0d95bd12ca890310c77e6eb5b7 avidemux-2.0.22.ebuild 2321
 MD5 4c24428398acd26c384e724f5e2cd71a avidemux-2.0.24.ebuild 2482
+MD5 8558ebc13740fb8b8a99511609063df9 avidemux-2.0.26.ebuild 2142
+MD5 7256a686e0dbef20b41142c8741b56e8 avidemux-2.0.20.ebuild 2294
+MD5 ae52e42b3b8a35743b9fa6e732c73f99 ChangeLog 9049
 MD5 eba326432d26a3e8eb926c52124bbb9c metadata.xml 257
+MD5 0a839c0d95bd12ca890310c77e6eb5b7 avidemux-2.0.22.ebuild 2321
 MD5 a4e7880f69cf02398a2dc82d928a6584 avidemux-2.0.18.ebuild 2445
 MD5 11648f5ec6649662e9fb3182267612fe avidemux-0.9-r1.ebuild 2021
-MD5 fabe25010e336c02fff55054b90bde1b files/digest-avidemux-2.0.22 68
 MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
-MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
-MD5 41d1cf2e682c0023c0c445822c13c7ad files/digest-avidemux-2.0.20 68
-MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
 MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9-r1 62
 MD5 7f9945862f4c68c59549897fe020eb2c files/digest-avidemux-2.0.18 68
+MD5 41d1cf2e682c0023c0c445822c13c7ad files/digest-avidemux-2.0.20 68
+MD5 fabe25010e336c02fff55054b90bde1b files/digest-avidemux-2.0.22 68
+MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
+MD5 ed8344c0d166e56f3f15948d7488abbb files/digest-avidemux-2.0.26 68
+MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
+MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
 MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
 MD5 c235b3c2a9d464d8729ec6698895866e files/alsa.patch 607
-MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
diff --git a/media-video/avidemux/avidemux-2.0.26.ebuild b/media-video/avidemux/avidemux-2.0.26.ebuild
new file mode 100644
index 000000000000..ed5a10443ccc
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.0.26.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.26.ebuild,v 1.1 2004/07/23 11:09:36 zypher Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Great Video editing/encoding tool"
+HOMEPAGE="http://fixounet.free.fr/avidemux/"
+SRC_URI="http://fixounet.free.fr/avidemux/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="alsa altivec arts debug nls oggvorbis truetype xvid"
+
+RDEPEND="virtual/x11
+	media-sound/madplay
+	>=media-libs/a52dec-0.7.4
+	>=media-sound/lame-3.93
+	>=media-video/mjpegtools-1.6
+	>=dev-libs/libxml2-2.6.7
+	>=x11-libs/gtk+-2.4.1
+	xvid? ( >=media-libs/xvid-0.9.1 )
+	x86? ( dev-lang/nasm )
+	nls? ( >=sys-devel/gettext-0.12.1 )
+	oggvorbis? ( >=media-libs/libogg-1.0
+		>=media-libs/libvorbis-1.0.1 )
+	arts? ( >=kde-base/arts-1.2.3 )
+	truetype? ( >=media-libs/freetype-2.1.5 )
+	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )"
+# media-sound/toolame is supported as well
+
+DEPEND="$RDEPEND >=sys-devel/autoconf-2.58
+		>=sys-devel/automake-1.8.3"
+
+
+filter-flags "-fno-default-inline -funroll-loops -funroll-all-loops"
+
+src_compile() {
+	local myconf
+	myconf="--with-gnu-ld --disable-warnings"
+
+	# --enable-profile        creates profiling infos default=no
+	# --enable-pch            enables precompiled header support
+	#                         (currently only KCC) default=no
+	# --enable-final          build size optimized apps
+	#                         (experimental - needs lots of memory)
+	# --disable-closure       don't delay template instantiation
+
+	use debug && myconf="${myconf} --enable-debug=full"
+	use nls || myconf="${myconf} --disable-nls"
+	use altivec && myconf="${myconf} --enable-altivec"
+	econf ${myconf} || die "configure failed"
+
+	make || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS ChangeLog History README TODO
+}
+
+pkg_postinst() {
+	if use ppc ; then
+		echo
+		einfo "OSS sound output may not work on ppc"
+		einfo "If your hear only static noise, try"
+		einfo "changing the sound device to ALSA or arts"
+	fi
+}
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.26 b/media-video/avidemux/files/digest-avidemux-2.0.26
new file mode 100644
index 000000000000..482bbac35acf
--- /dev/null
+++ b/media-video/avidemux/files/digest-avidemux-2.0.26
@@ -0,0 +1 @@
+MD5 d4697e3289b7db4b684a0cef6884db2f avidemux-2.0.26.tar.gz 2734668
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index bc624c3dc823..4642af4a1139 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -11,7 +11,7 @@ MD5 6b9e16c4f08ac48748812909ed431f31 mplayer-1.0_pre4-r3.ebuild 13034
 MD5 d13f33f9022f7abccfe9b14f96531057 mplayer-1.0_pre4-r4.ebuild 13157
 MD5 071a354aa3c0e9290b6dcfc8c3621d87 mplayer-1.0_pre4.ebuild 11319
 MD5 e933e8c714424c7ee14ccede6f31cd63 mplayer-1.0_pre4-r6.ebuild 12539
-MD5 3c89297fdc0f6490d70d912fb2b890bb mplayer-1.0_pre5-r1.ebuild 12205
+MD5 3fad54c9cb186044cfdd8085eec65377 mplayer-1.0_pre5-r1.ebuild 12405
 MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
 MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
 MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2-r1 358