Minor fix

3 files changed, 66 insertions, 2 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index a13b46cfc897..8c3423903a80 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.68 2004/06/26 16:01:04 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.69 2004/08/05 10:29:48 lu_zero Exp $
+
+  05 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/mjpegtools-1.6.2-gcc34-altivec.patch, mjpegtools-1.6.2-r3.ebuild:
+  Minor fix for altivec
 
   26 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>
   mjpegtools-1.6.2-r1.ebuild:
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.2-gcc34-altivec.patch b/media-video/mjpegtools/files/mjpegtools-1.6.2-gcc34-altivec.patch
new file mode 100644
index 000000000000..9275a4162e5a
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.6.2-gcc34-altivec.patch
@@ -0,0 +1,59 @@
+diff -ruN mjpegtools-1.6.2.orig/utils/altivec/fdct_idct.c mjpegtools-1.6.2/utils/altivec/fdct_idct.c
+--- mjpegtools-1.6.2.orig/utils/altivec/fdct_idct.c	2003-10-09 09:05:09.000000000 +0200
++++ mjpegtools-1.6.2/utils/altivec/fdct_idct.c	2004-08-05 09:38:31.808037456 +0200
+@@ -177,14 +177,14 @@
+ 
+ /* Post-scaling matrix -- scaled by 1 */
+ static const vector signed short PostScale[8] = {
+-    (vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
+-    (vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880),
+-    (vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
+-    (vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
+-    (vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
+-    (vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
+-    (vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
+-    (vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880)
++    (const vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
++    (const vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880),
++    (const vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
++    (const vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
++    (const vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
++    (const vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
++    (const vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
++    (const vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880)
+ };
+ 
+ /***************************************************************
+@@ -219,7 +219,7 @@
+  * of lvx which is more efficient given the remainder of the instruction mix.
+  */
+ static const vector signed short SpecialConstants =
+-  (vector signed short)VCONST(23170, 13573, 6518, 21895, -23170, -21895, 0, 0);
++  (const vector signed short)VCONST(23170, 13573, 6518, 21895, -23170, -21895, 0, 0);
+ 
+ #ifdef ORIGINAL_SOURCE
+ void DCT(short *input, short *output) {
+@@ -364,14 +364,14 @@
+ 
+ /* Pre-Scaling matrix -- scaled by 1 */
+ static const vector signed short PreScale[8] = {
+-    (vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
+-    (vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880),
+-    (vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
+-    (vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
+-    (vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
+-    (vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
+-    (vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
+-    (vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880)
++    (const vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
++    (const vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880),
++    (const vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
++    (const vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
++    (const vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
++    (const vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
++    (const vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
++    (const vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880)
+ };
+ 
+ 
+
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild
index e602ea5555f6..1b6340fa258e 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild,v 1.2 2004/06/25 03:19:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild,v 1.3 2004/08/05 10:29:48 lu_zero Exp $
 
 inherit flag-o-matic gcc eutils
 
@@ -35,6 +35,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-fPIC.patch
 	epatch ${FILESDIR}/${P}-gcc34.patch
+	epatch ${FILESDIR}/${P}-gcc34-altivec.patch
 
 	# Fix an error in the detection of the altivec-support
 	# in the compiler