Version bump. Changed usage of mmx flag to autodetect if not disabled by -mmx.

4 files changed, 113 insertions, 14 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index e41c89faf4fd..fcd1fc857bf9 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.59 2004/11/30 06:53:09 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.60 2004/12/12 16:42:39 zypher Exp $
+
+*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.
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 9190b2fa135c..aca288e2386e 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a23d4b5cf385a650d0436327d2b7c19e ChangeLog 10941
+MD5 18dce9727e88a4a94a2483f950c4caf3 ChangeLog 11129
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
-MD5 ab3162ca7bbd22cd158aac547a2a1754 avidemux-2.0.34_rc1-r1.ebuild 3117
+MD5 6d949c882a5b18378b29e39d48ec0c49 avidemux-2.0.34_rc2.ebuild 2675
 MD5 5846b93f88b88de1c06950c94bf09e21 avidemux-2.0.34_rc1.ebuild 2417
 MD5 4c24428398acd26c384e724f5e2cd71a avidemux-2.0.24.ebuild 2482
+MD5 ab3162ca7bbd22cd158aac547a2a1754 avidemux-2.0.34_rc1-r1.ebuild 3117
 MD5 634a8594c2fead1220505d3071037788 files/avidemux-2.0.32_mpeg_ps_fix.patch 519
-MD5 c850494d08353a205ed94f81f6005aa4 files/digest-avidemux-2.0.34_rc1-r1 74
-MD5 c850494d08353a205ed94f81f6005aa4 files/digest-avidemux-2.0.34_rc1 74
-MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
-MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
 MD5 c235b3c2a9d464d8729ec6698895866e files/alsa.patch 607
-MD5 7b49ecad9a48d74f4e99127f434ce29b files/avidemux-2.0.34-test1_faac.patch 631
-MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
-MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
+MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
 MD5 a425235d45d2628fb39a2d5e336585be files/xvid.patch 672
-MD5 04305efde8b8b115e0a0c8e1885cf194 files/avidemux-2.0.30_amd64_cpuutil.patch 1539
+MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
+MD5 7b49ecad9a48d74f4e99127f434ce29b files/avidemux-2.0.34-test1_faac.patch 631
+MD5 f9121be7bae99c7b33f4140c70799dce files/digest-avidemux-2.0.34_rc2 71
+MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
 MD5 277683ec9bcbe17a0b7fea610eba9cfb files/avidemux-2.0.30_fixes.patch 1713
 MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
+MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
+MD5 c850494d08353a205ed94f81f6005aa4 files/digest-avidemux-2.0.34_rc1 74
+MD5 04305efde8b8b115e0a0c8e1885cf194 files/avidemux-2.0.30_amd64_cpuutil.patch 1539
+MD5 c850494d08353a205ed94f81f6005aa4 files/digest-avidemux-2.0.34_rc1-r1 74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBrBqbRPjscZbntocRAvZpAJ0XMDKBjkpQFdMlunTaWyS5Mj7BogCdFHwx
-nZq7LPvuSNdPUsw/49fDlAg=
-=M7oE
+iD8DBQFBvHW1RPjscZbntocRAuK7AJ9AfNQdWyqLboxXXR87G2RfbaGrrgCdH03P
++yl6he45N31ZFXTepFuAodc=
+=zi1T
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.0.34_rc2.ebuild b/media-video/avidemux/avidemux-2.0.34_rc2.ebuild
new file mode 100644
index 000000000000..52c0c43b94a8
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.0.34_rc2.ebuild
@@ -0,0 +1,91 @@
+# 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.34_rc2.ebuild,v 1.1 2004/12/12 16:42:39 zypher Exp $
+
+inherit eutils flag-o-matic
+
+MY_P="${P/_rc/-test}"
+DESCRIPTION="Great Video editing/encoding tool"
+HOMEPAGE="http://fixounet.free.fr/avidemux/"
+SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="a52 alsa altivec arts debug encode faac faad mad mmx nls oggvorbis pic sdl truetype xvid xv"
+
+RDEPEND="virtual/x11
+	a52? ( >=media-libs/a52dec-0.7.4 )
+	encode? ( >=media-sound/lame-3.93 )
+	>=dev-libs/libxml2-2.6.7
+	>=x11-libs/gtk+-2.4.1
+	faac? ( >=media-libs/faac-1.23.5 )
+	faad? ( >=media-libs/faad2-2.0-r2 )
+	mad? ( media-libs/libmad )
+	xvid? ( >=media-libs/xvid-1.0.0 )
+	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 )
+	sdl? ( media-libs/libsdl )"
+# 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"
+filter-flags "-funroll-loops"
+filter-flags "-funroll-all-loops"
+filter-flags "-fforce-addr"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die
+}
+
+src_compile() {
+	local myconf
+	myconf="--with-gnu-ld --disable-warnings"
+
+	use arts || export ac_cv_path_ART_CONFIG=no
+	use alsa || export ac_cv_header_alsa_asoundlib_h=no
+	use sdl || export ac_cv_path_SDL_CONFIG=no
+	use oggvorbis || export ac_cv_lib_vorbis_vorbis_info_init=no
+	use xvid || export ac_cv_header_xvid_h=no
+	use xv || export ac_cv_header_X11_extensions_XShm_h=no
+	use truetype || export ac_cv_path_FREETYPE_CONFIG=no
+	use encode || export ac_cv_header_lame_lame_h=no
+	use mad || export ac_cv_header_mad_h=no
+	use a52 || export ac_cv_header_a52dec_a52=no
+
+	use debug && myconf="${myconf} --enable-debug=full"
+	use faac || myconf="${myconf} --disable-faac"
+	use faad || myconf="${myconf} --disable-faad"
+	use mmx || myconf="${myconf} --disable-mmx"
+
+	econf \
+		`use_enable nls` \
+		`use_enalbe altivec` \
+		`use_with pic` \
+		${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.34_rc2 b/media-video/avidemux/files/digest-avidemux-2.0.34_rc2
new file mode 100644
index 000000000000..1f1ee822d512
--- /dev/null
+++ b/media-video/avidemux/files/digest-avidemux-2.0.34_rc2
@@ -0,0 +1 @@
+MD5 69f0d90f26011e842aeb809a6077770a avidemux-2.0.34-test2.tgz 3012034