diff options
| author | drochner <drochner@pkgsrc.org> | 2006-06-21 18:29:18 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2006-06-21 18:29:18 +0000 |
| commit | 39b95b10591e83376380b19e9be04f7559b8b301 (patch) | |
| tree | ae26a0af42afff5374c5991c150716d44af9f994 /multimedia/mjpegtools | |
| parent | 5a7738ae2c4cc61e1916ef1139ef07d266daf01f (diff) | |
| download | pkgsrc-39b95b10591e83376380b19e9be04f7559b8b301.tar.gz | |
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 (limited to 'multimedia/mjpegtools')
| -rw-r--r-- | multimedia/mjpegtools/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/mjpegtools/patches/patch-ab | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/multimedia/mjpegtools/distinfo b/multimedia/mjpegtools/distinfo index 4dca62f48fd..b7c7217258a 100644 --- a/multimedia/mjpegtools/distinfo +++ b/multimedia/mjpegtools/distinfo @@ -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 --git a/multimedia/mjpegtools/patches/patch-ab b/multimedia/mjpegtools/patches/patch-ab new file mode 100644 index 00000000000..a6966ddc9f1 --- /dev/null +++ b/multimedia/mjpegtools/patches/patch-ab @@ -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 |