[pkgsrc/trunk]: pkgsrc/multimedia/mjpegtools make this build on amd64/current...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3ea7b23c2ca6
branches:  trunk
changeset: 514989:3ea7b23c2ca6
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Jun 21 18:29:18 2006 +0000

description:
make this build on amd64/current, from Martijn van Buul per PR pkg/33769
(it builds for me on amd64/3.0, but the effect is easily verified by
disassembling -- basically it is insignificant because "cpuid" always
yields just 32 bit, but if newer compilers complain something must be done)

diffstat:

 multimedia/mjpegtools/distinfo         |   3 ++-
 multimedia/mjpegtools/patches/patch-ab |  13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r f6e0e8016bbe -r 3ea7b23c2ca6 multimedia/mjpegtools/distinfo
--- a/multimedia/mjpegtools/distinfo    Wed Jun 21 18:18:05 2006 +0000
+++ b/multimedia/mjpegtools/distinfo    Wed Jun 21 18:29:18 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.11 2006/01/30 08:44:25 xtraeme Exp $
+$NetBSD: distinfo,v 1.12 2006/06/21 18:29:18 drochner Exp $
 
 SHA1 (mjpegtools-1.8.0.tar.gz) = e11d68298a64b52f98724dbf3fd14f168e140290
 RMD160 (mjpegtools-1.8.0.tar.gz) = 4d97a6a721f29223975605e2a5e645b4d7d129b5
 Size (mjpegtools-1.8.0.tar.gz) = 1475998 bytes
 SHA1 (patch-aa) = 3db2656a4d74b1ec1ac21b654c7a8ea33b791e19
+SHA1 (patch-ab) = 5fc460db1593afb1f99422003db86e6b7cfc8eb9
diff -r f6e0e8016bbe -r 3ea7b23c2ca6 multimedia/mjpegtools/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mjpegtools/patches/patch-ab    Wed Jun 21 18:29:18 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.6 2006/06/21 18:29:18 drochner Exp $
+
+--- utils/cpu_accel.c.orig     2006-06-21 20:18:47.000000000 +0200
++++ utils/cpu_accel.c
+@@ -117,7 +117,7 @@ static int x86_accel (void)
+       /* Slightly weirdified cpuid that preserves the ebx and edi required
+          by gcc for PIC offset table and frame pointer */
+ 
+-#ifdef __LP64__
++#if defined(__LP64__) || defined(_LP64)
+ #  define REG_b "rbx"
+ #  define REG_S "rsi"
+ #else