Added patch to fix upstream --enable params on configure which are borked. Fixes #89356.

(Portage version: 2.0.51.19)

4 files changed, 93 insertions, 3 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 1123de209116..5d074812ef64 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.71 2005/04/18 21:36:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.72 2005/04/19 10:46:23 flameeyes Exp $
+
+  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:
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 832b71b43102..a4e7f5e070c5 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -6,7 +6,7 @@ MD5 0aed1a48ceb9c6c76092b0799433077a avidemux-2.0.36.ebuild 2539
 MD5 162de3edb58b8605348d0c594368017c avidemux-2.0.38_rc1.ebuild 2666
 MD5 f18fa403fee71aa513005f27bbcc4fd7 avidemux-2.0.38_rc2.ebuild 2639
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
-MD5 d5eac482b3eb29c4c396afd394ad8633 avidemux-2.0.38_rc2-r1.ebuild 2571
+MD5 ae0c05cc1dbba41860b1839840a6ea5e avidemux-2.0.38_rc2-r1.ebuild 2614
 MD5 3c0b478183f7b065d81e252c1b63b4db ChangeLog 12878
 MD5 71caa2da3a9489e6d3e10b3816c753c6 files/2.0.38_rc1_mpegidentify.patch 1077
 MD5 4b0dc1a0f1e81197582e817410f8d180 files/2.0.38_rc2-fix-faad.patch 759
@@ -29,3 +29,4 @@ MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
 MD5 a425235d45d2628fb39a2d5e336585be files/xvid.patch 672
 MD5 4240b00a52d4c48f4c37fa919a62c75f files/digest-avidemux-2.0.38_rc2-r1 153
 MD5 7dc435f96cc9de9a1d0388947e22de48 files/avidemux-2.0.38_rc2-aclocal.patch 419
+MD5 3052b2cca97c9375f9641a9e97534179 files/avidemux-2.0.38_rc2-mmx_altivec.patch 3224
diff --git a/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild b/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild
index 7eb54ee4639d..32de50f8765a 100644
--- a/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild,v 1.2 2005/04/18 21:36:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild,v 1.3 2005/04/19 10:46:23 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -54,6 +54,7 @@ src_unpack() {
 
 	cp ${WORKDIR}/${PVR}/m4/* ${S}/m4 || die "cp m4 failed"
 	epatch ${FILESDIR}/${P}-aclocal.patch
+	epatch ${FILESDIR}/${P}-mmx_altivec.patch
 
 	make -f Makefile.dist || die "autotools failed."
 }
diff --git a/media-video/avidemux/files/avidemux-2.0.38_rc2-mmx_altivec.patch b/media-video/avidemux/files/avidemux-2.0.38_rc2-mmx_altivec.patch
new file mode 100644
index 000000000000..55893f1bc7e0
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.0.38_rc2-mmx_altivec.patch
@@ -0,0 +1,82 @@
+--- avidemux-2.0.38rc2b/configure.in.in	2005-04-19 12:14:50.903448208 +0200
++++ avidemux-2.0.38rc2b-mmx/configure.in.in	2005-04-19 12:29:49.831790328 +0200
+@@ -665,20 +665,20 @@
+ adm_cpu=`uname -m`;
+ dnl reset config.cpu, avoid weird bugs
+ echo "CPU type : $adm_cpu"
+-use_mmx=0
++use_mmx=no
+ case $adm_cpu in
+ 	i386|i486|i586|i686)
+-		use_mmx=1
++		use_mmx=yes
+ 		have_little_endian=yes;
+ 		AC_DEFINE(CONFIG_X86,1,[FFMPEG])
+ 		AC_DEFINE(ARCH_X86,1,[post proc])
+ 		LMPG_OPT=-DARCH_X86
+ 		have_x86=yes
+-		AC_ARG_ENABLE(mmx,[  --disable-mmx           don't use MMX acceleration],use_mmx=0)
+-		
+-
++		AC_ARG_ENABLE([mmx],
++			AC_HELP_STRING([--disable-mmx], [disable MMX acceleration support]),
++			[ use_mmx=${enableval} ], [ use_mmx=yes ])
+ 
+-		if test "x$use_mmx" = "x1"; then
++		if test "x$use_mmx" = "xyes"; then
+ 		AC_DEFINE(USE_MMX,1,"Use MMX acceleration")
+ 		AC_DEFINE(HAVE_ASM_MMX,1,"Use MMX acceleration")
+ 		AC_DEFINE(HAVE_MMX,1,"Use MMX acceleration")
+@@ -746,10 +746,13 @@
+ 		dnl we assume to be on linux-ish system here
+ 		AC_DEFINE(restrict,__restrict__,[roundup function])
+ 		AC_DEFINE(ADM_BIG_ENDIAN,1,[Big endian cpu  sparc or powerpc])
+-		AC_DEFINE(ARCH_POWERPC,1,[Enable powerpc optim])		
+-		AC_ARG_ENABLE(altivec,[  --enable-altivec           enable  altivec acceleration(ppc)],have_altivec=yes)
++		AC_DEFINE(ARCH_POWERPC,1,[Enable powerpc optim])
++		
++		AC_ARG_ENABLE([altivec],
++			AC_HELP_STRING([--enable-altivec], [enable altivec acceleration (ppc)]),
++			[ have_altivec=${enableval} ], [ have_altivec=no ] )
++		
+ 		AC_DEFINE(WORDS_BIGENDIAN,1,[Big endian cpu  sparc or powerpc]);;
+-
+ 	*)
+ 		adm_cpu=`uname -p`;
+ 		case $adm_cpu in
+@@ -769,7 +772,9 @@
+ 			AC_DEFINE(ADM_BIG_ENDIAN,1,[Big endian cpu  sparc or powerpc])
+ 			AC_DEFINE(CONFIG_DARWIN,0,[Say to ffmpeg we are using darwin macOsX])
+ 			AC_DEFINE(WORDS_BIGENDIAN,1,[Big endian cpu  sparc or powerpc])
+-			AC_ARG_ENABLE(altivec,[  --enable-altivec           enable  altivec acceleration(ppc)],have_altivec=yes)
++			AC_ARG_ENABLE([altivec],
++				AC_HELP_STRING([--enable-altivec], [enable altivec acceleration (ppc)]),
++				[ have_altivec=${enableval} ], [ have_altivec=no ] )
+ 			AC_DEFINE(ARCH_POWERPC,1,[Enable powerpc optim])
+ 			have_ppc=yes;;
+ 			*)
+@@ -847,9 +852,9 @@
+ dnl __________ conditional ___________________
+ 
+ AM_CONDITIONAL(HAVE_NASM, test "x$have_nasm" = "xyes")
+-AM_CONDITIONAL(BUILD_MMX, test "x$use_mmx" = "x1")
++AM_CONDITIONAL(BUILD_MMX, test "x$use_mmx" = "xyes")
+ 
+-AM_CONDITIONAL(BUILD_MMX_COMPATIBLE, test "x$use_mmx" = "x1" || test "x$have_amd64" = "xyes")
++AM_CONDITIONAL(BUILD_MMX_COMPATIBLE, test "x$use_mmx" = "xyes" || test "x$have_amd64" = "xyes")
+ 
+ AM_CONDITIONAL(BUILD_DARWIN, test "x$have_darwin" = "xyes")
+ AM_CONDITIONAL(BUILD_PPC, test "x$have_ppc" = "xyes")
+@@ -929,11 +934,7 @@
+ echo " FreeType            : $have_freetype"
+ echo " locale              : $ADM_LOCALEDIR"
+ echo " Little endian cpu   : $have_little_endian"
+-if test "x$use_mmx" = "x1"; then
+-echo " MMX                 : yes"
+-else
+-echo " MMX                 : no"
+-fi
++echo " MMX                 : $use_mmx"
+ echo " AMD64               : $have_amd64"
+ echo " Altivec             : $have_altivec"
+ echo " PPC                 : $have_ppc"