Added gcc3 fix. Closes #25163.

4 files changed, 113 insertions, 13 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 60ed6c36a8f3..ae893aecf880 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.38 2003/09/23 22:25:18 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.39 2003/10/05 11:30:16 mholzer Exp $
+
+  06 Oct 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7.ebuild,
+  files/mjpegtools-1.6.0-gcc3.patch:
+  Added gcc3 fix. Closes #25163.
 
   23 Sep 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.1.90-r1.ebuild:
   Forward-port the hardened-gcc fixes.
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 35b93086f42b..df2f29cc5895 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,10 +1,11 @@
-MD5 6bc31bfe478508633bd0cb606ea44ad8 mjpegtools-1.6.1.90-r1.ebuild 1849
-MD5 ac487ddde6a6af1ed6db4527dcde1e6f mjpegtools-1.6.0-r7.ebuild 2918
-MD5 827287e0def93e7f50367323a148aec2 ChangeLog 7112
-MD5 c9bb82e3c4de92ad8ed6ce7470250e6b metadata.xml 180
+MD5 f6694dfea31724902c9fa427e5c50e15 ChangeLog 7265
+MD5 9cc6fb6dbb2c14fd70296c36d036b604 mjpegtools-1.6.0-r7.ebuild 2869
 MD5 9fa67243454e797c061ddd4facf262cc mjpegtools-1.6.1.ebuild 2413
-MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r1 72
-MD5 4a594198579130cfe453fffb532b2aef files/digest-mjpegtools-1.6.1 147
+MD5 c9bb82e3c4de92ad8ed6ce7470250e6b metadata.xml 180
+MD5 6bc31bfe478508633bd0cb606ea44ad8 mjpegtools-1.6.1.90-r1.ebuild 1849
+MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
 MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r7 147
+MD5 4a594198579130cfe453fffb532b2aef files/digest-mjpegtools-1.6.1 147
+MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r1 72
 MD5 81c49bb48a8d8e3ea4eb360811c01f67 files/no-x11-lib.patch 497
-MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
+MD5 0d5f90e8ac4023e403bf79d2e14314cb files/mjpegtools-1.6.0-gcc3.patch 5086
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.0-gcc3.patch b/media-video/mjpegtools/files/mjpegtools-1.6.0-gcc3.patch
new file mode 100644
index 000000000000..3b614554e87a
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.6.0-gcc3.patch
@@ -0,0 +1,94 @@
+diff -uNr mjpegtools-1.6.0/mplex/multplex.cc mjpegtools-1.6.0-gcc33/mplex/multplex.cc
+--- mjpegtools-1.6.0/mplex/multplex.cc	2002-04-29 12:30:56.000000000 -0400
++++ mjpegtools-1.6.0-gcc33/mplex/multplex.cc	2003-07-25 01:51:57.228994776 -0400
+@@ -2,6 +2,7 @@
+ #include <config.h>
+ #include <math.h>
+ #include <stdlib.h>
++#include <assert.h>
+ #include <unistd.h>
+ 
+ #include <mjpeg_types.h>
+diff -uNr mjpegtools-1.6.0/mplex/stillsstream.cc mjpegtools-1.6.0-gcc33/mplex/stillsstream.cc
+--- mjpegtools-1.6.0/mplex/stillsstream.cc	2002-04-19 11:14:17.000000000 -0400
++++ mjpegtools-1.6.0-gcc33/mplex/stillsstream.cc	2003-07-25 01:52:12.769632240 -0400
+@@ -22,6 +22,7 @@
+ 
+ 
+ #include <format_codes.h>
++#include <assert.h>
+ 
+ #include "stillsstream.hh"
+ #include "interact.hh"
+diff -uNr mjpegtools-1.6.0/mplex/systems.cc mjpegtools-1.6.0-gcc33/mplex/systems.cc
+--- mjpegtools-1.6.0/mplex/systems.cc	2003-07-25 01:51:14.205535336 -0400
++++ mjpegtools-1.6.0-gcc33/mplex/systems.cc	2003-07-25 01:51:44.020002848 -0400
+@@ -1,6 +1,7 @@
+ #include <config.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <assert.h>
+ #include <string.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
+Files mjpegtools-1.6.0/yuvdenoise/.motion.c.swp and mjpegtools-1.6.0-gcc33/yuvdenoise/.motion.c.swp differ
+diff -uNr mjpegtools-1.6.0/yuvdenoise/motion.c mjpegtools-1.6.0-gcc33/yuvdenoise/motion.c
+--- mjpegtools-1.6.0/yuvdenoise/motion.c	2002-05-06 04:13:37.000000000 -0400
++++ mjpegtools-1.6.0-gcc33/yuvdenoise/motion.c	2003-07-25 01:52:38.339744992 -0400
+@@ -251,6 +251,9 @@
+     " movl         %1    , %%eax;          /* load frameadress into eax                          */\n"
+     " movl         %2    , %%ebx;          /* load frameadress into ebx                          */\n"
+     " movl         %3    , %%ecx;          /* load width       into ecx                          */\n"
++	" shrl         $1    , %%ecx;          /* shift width to scale it in the asm.                */\n"
++	"                                      /* why? we need an lvalue as input... gcc33...        */\n"
++	"                                      /* (carrbc1@wfu.edu)                                  */\n"
+     "                                      /*                                                    */\n"
+     ".rept 4                    ;          /* Loop for 4 lines                                   */\n"
+     " movd        (%%eax), %%mm1;          /* 4 Pixels from filtered frame to mm1                */\n"
+@@ -270,7 +273,7 @@
+     "                                      /*                                                    */\n"
+     " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */\n"
+     :"=m" (a)     
+-    :"m" (frm), "m" (ref), "m" (denoiser.frame.w/2)
++    :"m" (frm), "m" (ref), "m" (denoiser.frame.w)
+     :"%eax", "%ebx", "%ecx"
+     );
+ #endif
+@@ -295,7 +298,10 @@
+     " movl         %1    , %%eax;          /* load frameadress into eax                          */\n"
+     " movl         %2    , %%ebx;          /* load frameadress into ebx                          */\n"
+     " movl         %3    , %%ecx;          /* load width       into ecx                          */\n"
+-    "                           ;          /*                                                    */\n"
++	" shrl         $1    , %%ecx;          /* shift width to scale it in the asm.                */\n"
++	"                                      /* why? we need an lvalue as input... gcc33...        */\n"
++	"                                      /* (carrbc1@wfu.edu)                                  */\n"
++    "                                      /*                                                    */\n"
+     " .rept 4                   ;          /*                                                    */\n"
+     " movd        (%%eax), %%mm1;          /* 4 Pixels from filtered frame to mm1                */\n"
+     " movd        (%%ebx), %%mm2;          /* 4 Pixels from filtered frame to mm2                */\n"
+@@ -307,7 +313,7 @@
+     "                                      /*                                                    */\n"
+     " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */\n"
+     :"=m" (a)     
+-    :"m" (frm), "m" (ref), "m" (denoiser.frame.w/2)
++    :"m" (frm), "m" (ref), "m" (denoiser.frame.w)
+     :"%eax", "%ebx", "%ecx"
+     );
+ #endif
+@@ -349,6 +355,7 @@
+   static uint32_t a;
+ #ifdef HAVE_ASM_MMX
+   static uint32_t bit_mask[2] = {0x7f7f7f7f,0x7f7f7f7f};
++  static uint32_t* bit_mask_addr = bit_mask;
+ 
+   __asm__ __volatile__
+       (
+@@ -380,7 +387,7 @@
+ 	  "                                      /*                                                    */"
+ 	  " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */"
+ 	  :"=m" (a)     
+-	  :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w), "m" (bit_mask)
++	  :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w), "m" (bit_mask_addr)
+ 	  :"%eax", "%ebx", "%ecx", "%edx"
+ 	  );
+ #endif
diff --git a/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild b/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild
index f7ac3609c030..2807102d81fd 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild,v 1.16 2003/08/26 00:56:47 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild,v 1.17 2003/10/05 11:30:16 mholzer Exp $
 
 inherit eutils gcc libtool flag-o-matic base
 
@@ -46,10 +46,8 @@ src_unpack() {
 
 	if use quicktime && ! use alpha; then
 		cd ${WORKDIR}/quicktime4linux-1.4-patch
-		cp libmjpeg.h libmjpeg.h.orig
-		sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" libmjpeg.h.orig > libmjpeg.h
-		cp jpeg_old.h jpeg_old.h.orig
-		sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" jpeg_old.h.orig > jpeg_old.h
+		sed -i "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" libmjpeg.h
+		sed -i "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" jpeg_old.h
 
 		if [ "`gcc-major-version`" -eq "3" ] ; then
 		# Don't remove this - contact phoen][x <phoenix@gentoo.org> if you have problems with it.
@@ -63,6 +61,9 @@ src_unpack() {
 		cd ${S}
 		epatch ${FILESDIR}/1.6.0-r7-ppc.patch || die "epatch failed"
 	fi
+	
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc3.patch
 }
 
 src_compile() {