[pkgsrc/trunk]: pkgsrc/multimedia/mjpegtools Add patches to get around these ...

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/20cc6c975e89
branches:  trunk
changeset: 494683:20cc6c975e89
user:      reed <reed%pkgsrc.org@localhost>
date:      Sat May 28 00:05:39 2005 +0000

description:
Add patches to get around these errors:
 error: label at end of compound statement
 error: array bound forbidden after parenthesized type-id

This was noticed on FreeBSD 5.4-STABLE with gcc 3.4.2.
Also test build under NetBSD 1.6.2_STABLE with gcc 2.95.3
and Linux with gcc 3.3.5.

No PKGREVISION bump since this should not change anything.
This package does not have a maintainer.

diffstat:

 multimedia/mjpegtools/distinfo         |   4 +++-
 multimedia/mjpegtools/patches/patch-aq |  13 +++++++++++++
 multimedia/mjpegtools/patches/patch-ar |  18 ++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletions(-)

diffs (54 lines):

diff -r 66e8b5ad212e -r 20cc6c975e89 multimedia/mjpegtools/distinfo
--- a/multimedia/mjpegtools/distinfo    Fri May 27 22:15:53 2005 +0000
+++ b/multimedia/mjpegtools/distinfo    Sat May 28 00:05:39 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 11:24:03 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/05/28 00:05:39 reed Exp $
 
 SHA1 (mjpegtools-1.6.2.tar.gz) = c69ce6cd8a37c133c92d677f21650ae541c86575
 RMD160 (mjpegtools-1.6.2.tar.gz) = 48d4e6fa037f18973bae7d22ac14412182361c23
@@ -19,3 +19,5 @@
 SHA1 (patch-an) = 0f16df6a3e0ad870162ca394b9aa57dce2854230
 SHA1 (patch-ao) = 4fe99c5d321e8d41b9b2790c515da68e9b0bdf03
 SHA1 (patch-ap) = 0d57387658ddffef2cf69a4349570b1f2ef6b5b8
+SHA1 (patch-aq) = 39ab8e3f77488f1e5fa8e523e5ca96afbf925d99
+SHA1 (patch-ar) = 803856b6f8c02ca0255e4c7e60964301df8fa69b
diff -r 66e8b5ad212e -r 20cc6c975e89 multimedia/mjpegtools/patches/patch-aq
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mjpegtools/patches/patch-aq    Sat May 28 00:05:39 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2005/05/28 00:05:39 reed Exp $
+error: label at end of compound statement
+
+--- ./lavtools/lavpipe.c.orig  Fri May 27 15:55:09 2005
++++ ./lavtools/lavpipe.c       Fri May 27 15:55:55 2005
+@@ -582,6 +582,7 @@
+       mjpeg_info( "closing input %d (source %d)", i, current_index);
+       decommission_pipe_source(source);
+     KEEP_SOURCE:
++      ;
+     }
+   }
+ }
diff -r 66e8b5ad212e -r 20cc6c975e89 multimedia/mjpegtools/patches/patch-ar
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mjpegtools/patches/patch-ar    Sat May 28 00:05:39 2005 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ar,v 1.1 2005/05/28 00:05:39 reed Exp $
+error: array bound forbidden after parenthesized type-id
+
+--- ./mpeg2enc/picture.cc.orig Fri May 27 16:01:27 2005
++++ ./mpeg2enc/picture.cc      Fri May 27 16:01:57 2005
+@@ -83,9 +83,9 @@
+     }
+ 
+ 
+-      curref = new (uint8_t *)[5];
+-      curorg = new (uint8_t *)[5];
+-      pred   = new (uint8_t *)[5];
++      curref = new uint8_t *[5];
++      curorg = new uint8_t *[5];
++      pred   = new uint8_t *[5];
+ 
+       for( i = 0 ; i<3; i++)
+       {