ports/118083: Update port: multimedia/exportvideo -- unbreak for gcc4
Frank W. Josellis
frank at dynamical-systems.org
Fri Nov 16 10:30:05 UTC 2007
>Number: 118083
>Category: ports
>Synopsis: Update port: multimedia/exportvideo -- unbreak for gcc4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 16 10:30:04 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Frank W. Josellis
>Release: FreeBSD 5.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD pollux.senax.net 5.5-STABLE FreeBSD 5.5-STABLE #17: Wed Oct 31 16:22:23 CET 2007 root at pollux.senax.net:/usr/obj/usr/src/sys/POLLUX i386
>Description:
Fix to build with gcc-4.
Bump PORTREVISION (please undo if not desired).
Files added:
files/patch-libmpeg3_video_output.c
>How-To-Repeat:
>Fix:
--- exportvideo-1.0_3.patch begins here ---
diff -Nur exportvideo.BAK/Makefile exportvideo/Makefile
--- exportvideo.BAK/Makefile Wed Oct 31 09:56:40 2007
+++ exportvideo/Makefile Fri Nov 16 10:36:01 2007
@@ -7,7 +7,7 @@
PORTNAME= exportvideo
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= http://tigerente.htu.tuwien.ac.at/~aoe/mystuff/mpeg2_movie-avipatch/
DISTNAME= ${PORTNAME}.7e-pre9
@@ -35,10 +35,6 @@
.if ${ARCH} != "i386"
IGNORE= supported for i386 architecture only
-.endif
-
-.if ${OSVERSION} >= 700042
-BROKEN= Does not compile with GCC 4.2
.endif
.if defined(WITHOUT_MMX)
diff -Nur exportvideo.BAK/files/nuv4dvd exportvideo/files/nuv4dvd
--- exportvideo.BAK/files/nuv4dvd Sat Nov 6 21:16:44 2004
+++ exportvideo/files/nuv4dvd Fri Nov 16 10:36:01 2007
@@ -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 @@
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 -Nur exportvideo.BAK/files/patch-libmpeg3_video_output.c exportvideo/files/patch-libmpeg3_video_output.c
--- exportvideo.BAK/files/patch-libmpeg3_video_output.c Thu Jan 1 01:00:00 1970
+++ exportvideo/files/patch-libmpeg3_video_output.c Fri Nov 16 10:36:01 2007
@@ -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 -Nur exportvideo.BAK/files/patch-rtjpeg_RTjpeg.c exportvideo/files/patch-rtjpeg_RTjpeg.c
--- exportvideo.BAK/files/patch-rtjpeg_RTjpeg.c Sat Nov 6 21:16:44 2004
+++ exportvideo/files/patch-rtjpeg_RTjpeg.c Fri Nov 16 10:36:01 2007
@@ -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 -Nur exportvideo.BAK/files/patch-rtjpeg_RTjpegN.c exportvideo/files/patch-rtjpeg_RTjpegN.c
--- exportvideo.BAK/files/patch-rtjpeg_RTjpegN.c Sat Nov 6 21:16:44 2004
+++ exportvideo/files/patch-rtjpeg_RTjpegN.c Fri Nov 16 10:36:01 2007
@@ -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;
--- exportvideo-1.0_3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list