- Fix build with gcc 4.2

PR:		118083
Submitted by:	Frank W. Josellis <frank@dynamical-systems.org> (maintainer)
Approved by:	portmgr (linimon,erwin)

5 files changed, 164 insertions, 10 deletions

diff --git a/multimedia/exportvideo/Makefile b/multimedia/exportvideo/Makefile
index f0e63d0f3683..d9c65146b75f 100644
--- a/multimedia/exportvideo/Makefile
+++ b/multimedia/exportvideo/Makefile
@@ -37,10 +37,6 @@ WITHOUT_MMX=	yes
 IGNORE=		supported for i386 architecture only
 .endif
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 .if defined(WITHOUT_MMX)
 CONFIGURE_ARGS+=	--no-mmx
 .endif
diff --git a/multimedia/exportvideo/files/nuv4dvd b/multimedia/exportvideo/files/nuv4dvd
index f4989aa1e96f..4148eb24f7df 100644
--- a/multimedia/exportvideo/files/nuv4dvd
+++ b/multimedia/exportvideo/files/nuv4dvd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Trancode NUV to DVD compliant MPEG2 (PAL or NTSC)
+# Transcode NUV to DVD compliant MPEG2 (PAL or NTSC)
 #
  
 usage(){
@@ -97,7 +97,7 @@ retval=0
 for PROG in nuvplay lame mpeg2enc mplex ; do
     which -s $PROG || retval=$?
     if [ $retval -ne 0 ]; then
-	echo "Error: could't find '$PROG' on this system." >&2
+	echo "Error: couldn't find '$PROG' on this system." >&2
 	exit 1
     fi
 done
diff --git a/multimedia/exportvideo/files/patch-libmpeg3_video_output.c b/multimedia/exportvideo/files/patch-libmpeg3_video_output.c
new file mode 100644
index 000000000000..fa634f90e366
--- /dev/null
+++ b/multimedia/exportvideo/files/patch-libmpeg3_video_output.c
@@ -0,0 +1,16 @@
+--- libmpeg3/video/output.c.orig	2001-02-12 22:35:18.000000000 +0100
++++ libmpeg3/video/output.c	2007-11-15 15:55:06.000000000 +0100
+@@ -483,10 +483,11 @@
+ 	*data++ = 0;
+ 
+ #define STORE_PIXEL_RGB565 \
+-	*((unsigned short*)data)++ = \
++	*data = \
+ 		((CLIP(r_l) & 0xf8) << 8) | \
+ 		((CLIP(g_l) & 0xfc) << 3) | \
+-		((CLIP(b_l) & 0xf8) >> 3);
++		((CLIP(b_l) & 0xf8) >> 3); \
++	data += sizeof(unsigned short);
+ 
+ #define STORE_PIXEL_RGB888 \
+ 	*data++ = CLIP(r_l); \
diff --git a/multimedia/exportvideo/files/patch-rtjpeg_RTjpeg.c b/multimedia/exportvideo/files/patch-rtjpeg_RTjpeg.c
index 83bcf9b7544b..7d4f71093c72 100644
--- a/multimedia/exportvideo/files/patch-rtjpeg_RTjpeg.c
+++ b/multimedia/exportvideo/files/patch-rtjpeg_RTjpeg.c
@@ -1,5 +1,76 @@
---- rtjpeg/RTjpeg.c.orig	Thu Jun 21 23:27:12 2001
-+++ rtjpeg/RTjpeg.c	Mon Nov  1 19:40:00 2004
+--- rtjpeg/RTjpeg.c.orig	2001-06-21 23:26:50.000000000 +0200
++++ rtjpeg/RTjpeg.c	2007-11-15 22:52:31.000000000 +0100
+@@ -153,7 +153,7 @@
+ // return 2;
+ 
+  // first byte allways written
+- (__u8)strm[0]=
++ strm[0]=
+       (__u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
+ 
+ 
+@@ -163,7 +163,7 @@
+  bitten = ((unsigned char)ci) << 2;
+ 
+  if (ci==0) {
+-   (__u8)strm[1]= bitten; 
++   strm[1]= bitten; 
+    co = 2;
+    return (int)co;
+  }
+@@ -192,7 +192,7 @@
+    }
+ 
+    if( bitoff == 0 ) {
+-      (__u8)strm[co]= bitten; 
++      strm[co]= bitten; 
+       bitten = 0;
+       bitoff = 8; 
+       co++;
+@@ -204,7 +204,7 @@
+  /* ci must be 0 */
+  if(bitoff != 6) {
+ 
+-      (__u8)strm[co]= bitten; 
++      strm[co]= bitten; 
+       co++;
+      
+  }
+@@ -221,7 +221,7 @@
+    break;
+  case 2:
+  case 0:
+-   (__u8)strm[co]= bitten; 
++   strm[co]= bitten; 
+    bitoff = 4;
+    co++;
+    bitten = 0; // clear half nibble values in bitten
+@@ -242,7 +242,7 @@
+    bitten |= (ZZvalue&0xf)<<bitoff;
+ 
+    if( bitoff == 0 ) {
+-      (__u8)strm[co]= bitten; 
++      strm[co]= bitten; 
+       bitten = 0;
+       bitoff = 8;
+       co++;
+@@ -252,14 +252,14 @@
+  
+  /* ci must be 0 */
+  if( bitoff == 0 ) {
+-    (__u8)strm[co]= bitten; 
++    strm[co]= bitten; 
+     co++;
+  }  
+  goto BAUCHWEH;
+ 
+ HIRNWEH:
+ 
+- (__u8)strm[co]= bitten; 
++ strm[co]= bitten; 
+  co++;
+   
+ 
 @@ -352,7 +352,7 @@
      data[i]= 0;
      break;
diff --git a/multimedia/exportvideo/files/patch-rtjpeg_RTjpegN.c b/multimedia/exportvideo/files/patch-rtjpeg_RTjpegN.c
index 83692a47ac53..c77d6d66a1a8 100644
--- a/multimedia/exportvideo/files/patch-rtjpeg_RTjpegN.c
+++ b/multimedia/exportvideo/files/patch-rtjpeg_RTjpegN.c
@@ -1,5 +1,76 @@
---- rtjpeg/RTjpegN.c.orig	Thu Jul  5 22:32:29 2001
-+++ rtjpeg/RTjpegN.c	Mon Nov  1 19:40:00 2004
+--- rtjpeg/RTjpegN.c.orig	2001-07-05 22:32:07.000000000 +0200
++++ rtjpeg/RTjpegN.c	2007-11-15 22:55:35.000000000 +0100
+@@ -153,7 +153,7 @@
+ // return 2;
+ 
+  // first byte allways written
+- (__u8)strm[0]=
++ strm[0]=
+       (__u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
+ 
+ 
+@@ -163,7 +163,7 @@
+  bitten = ((unsigned char)ci) << 2;
+ 
+  if (ci==0) {
+-   (__u8)strm[1]= bitten; 
++   strm[1]= bitten; 
+    co = 2;
+    return (int)co;
+  }
+@@ -192,7 +192,7 @@
+    }
+ 
+    if( bitoff == 0 ) {
+-      (__u8)strm[co]= bitten; 
++      strm[co]= bitten; 
+       bitten = 0;
+       bitoff = 8; 
+       co++;
+@@ -204,7 +204,7 @@
+  /* ci must be 0 */
+  if(bitoff != 6) {
+ 
+-      (__u8)strm[co]= bitten; 
++      strm[co]= bitten; 
+       co++;
+      
+  }
+@@ -221,7 +221,7 @@
+    break;
+  case 2:
+  case 0:
+-   (__u8)strm[co]= bitten; 
++   strm[co]= bitten; 
+    bitoff = 4;
+    co++;
+    bitten = 0; // clear half nibble values in bitten
+@@ -242,7 +242,7 @@
+    bitten |= (ZZvalue&0xf)<<bitoff;
+ 
+    if( bitoff == 0 ) {
+-      (__u8)strm[co]= bitten; 
++      strm[co]= bitten; 
+       bitten = 0;
+       bitoff = 8;
+       co++;
+@@ -252,14 +252,14 @@
+  
+  /* ci must be 0 */
+  if( bitoff == 0 ) {
+-    (__u8)strm[co]= bitten; 
++    strm[co]= bitten; 
+     co++;
+  }  
+  goto BAUCHWEH;
+ 
+ HIRNWEH:
+ 
+- (__u8)strm[co]= bitten; 
++ strm[co]= bitten; 
+  co++;
+   
+ 
 @@ -352,7 +352,7 @@
      data[i]= 0;
      break;