diff options
author | joerg <joerg> | 2006-05-11 14:46:35 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-05-11 14:46:35 +0000 |
commit | 088283c43ee96b3c18492f316f590ebbd7a93bc0 (patch) | |
tree | 665b33768afc674b9b609fbac2440184c85caed3 /graphics/urt | |
parent | 421a997f57196960dba1128ae48f45516585b982 (diff) | |
download | pkgsrc-088283c43ee96b3c18492f316f590ebbd7a93bc0.tar.gz |
Fix errno. On DragonFly, initialise the rle_dflt_hdr at runtime with
stdout, it can't be computed at link time.
Diffstat (limited to 'graphics/urt')
-rw-r--r-- | graphics/urt/distinfo | 7 | ||||
-rw-r--r-- | graphics/urt/patches/patch-ah | 14 | ||||
-rw-r--r-- | graphics/urt/patches/patch-av | 33 | ||||
-rw-r--r-- | graphics/urt/patches/patch-aw | 12 | ||||
-rw-r--r-- | graphics/urt/patches/patch-ax | 13 |
5 files changed, 70 insertions, 9 deletions
diff --git a/graphics/urt/distinfo b/graphics/urt/distinfo index 4bec9248b4d..600910543e7 100644 --- a/graphics/urt/distinfo +++ b/graphics/urt/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2005/12/19 16:24:12 joerg Exp $ +$NetBSD: distinfo,v 1.7 2006/05/11 14:46:35 joerg Exp $ SHA1 (urt-3.1b.tar.Z) = 370b19c9e7019a7258754e7494b7ae2d7fe138ac RMD160 (urt-3.1b.tar.Z) = fd99f3a4ec7cb6c9195752e227ad95428e331bba @@ -19,7 +19,7 @@ SHA1 (patch-ad) = 764806da7b3b4798ef2627df376db8dcc7c5e97f SHA1 (patch-ae) = f6bd6f34fa3b06a003d9daf563fefc14aab1a096 SHA1 (patch-af) = ef433d729a4c087eb9ff1474e393064701295b66 SHA1 (patch-ag) = 2017d46b8bf8281446cb092841f26753020d87f6 -SHA1 (patch-ah) = 964edc4c36ab4b64e85d6c69e149b354144babad +SHA1 (patch-ah) = e7c89cc45258b40586843c83973e80a9ece34674 SHA1 (patch-ai) = 27ae6c03df5a13bfcf3e56e64f0f1278cdaef5e8 SHA1 (patch-aj) = a3207a60ceacb7deedab1dc96efb8b4c452fea26 SHA1 (patch-ak) = feb3d08f99cfef4df7c0bfd9b8794b540af11469 @@ -33,3 +33,6 @@ SHA1 (patch-ar) = 728e652142bc906dfbad7ee73a928b19b43d9a06 SHA1 (patch-as) = 282b6917daccc7bbfee600b8ea6dbeea8bf6fa86 SHA1 (patch-at) = 4c51def08bb75205ea595c9f1c602b6d427c64e6 SHA1 (patch-au) = ff9e09f3877fc83dad5f275e317e66638f5b8c21 +SHA1 (patch-av) = 62ebce67399111a7a6405d3e639d402273c00d23 +SHA1 (patch-aw) = f9d76a52d6efe3e08099c920e4cd4f9941275eae +SHA1 (patch-ax) = 17b1791381652a4b18f68090694f72c487fc47ec diff --git a/graphics/urt/patches/patch-ah b/graphics/urt/patches/patch-ah index 4543b2b7db8..b2a2533f84d 100644 --- a/graphics/urt/patches/patch-ah +++ b/graphics/urt/patches/patch-ah @@ -1,19 +1,19 @@ -$NetBSD: patch-ah,v 1.3 1999/11/22 11:11:33 agc Exp $ +$NetBSD: patch-ah,v 1.4 2006/05/11 14:46:35 joerg Exp $ ---- tools/into.c Wed Nov 25 23:51:32 1998 -+++ tools/into.c Wed Nov 25 23:58:09 1998 -@@ -41,7 +41,10 @@ +--- tools/into.c.orig 1992-04-30 14:10:15.000000000 +0000 ++++ tools/into.c +@@ -40,8 +40,9 @@ static char temp[] = "intoXXXXXXXX"; + static char buf[MAXPATHLEN+1]; short forceflg; /* overwrite an unwritable file? */ - extern int errno; -+ +-extern int errno; +#ifndef BSD extern char *sys_errlist[]; +#endif void main(argc, argv) -@@ -72,7 +75,7 @@ +@@ -72,7 +73,7 @@ char **argv; exit(1); } diff --git a/graphics/urt/patches/patch-av b/graphics/urt/patches/patch-av new file mode 100644 index 00000000000..e62a8f94651 --- /dev/null +++ b/graphics/urt/patches/patch-av @@ -0,0 +1,33 @@ +$NetBSD: patch-av,v 1.1 2006/05/11 14:46:35 joerg Exp $ + +--- lib/rle_global.c.orig 1992-01-28 18:23:03.000000000 +0000 ++++ lib/rle_global.c +@@ -76,7 +76,11 @@ rle_hdr rle_dflt_hdr = { + 8, /* cmaplen (log2 of length of color map) */ + NULL, /* pointer to color map */ + NULL, /* pointer to comment strings */ ++#if defined(__DragonFly__) ++ NULL, /* output file, overriden with stdout at startup */ ++#else + stdout, /* output file */ ++#endif + { 7 }, /* RGB channels only */ + 0L, /* Can't free name and file fields. */ + "Urt", /* Default "program name". */ +@@ -85,6 +89,16 @@ rle_hdr rle_dflt_hdr = { + /* Can't initialize the union */ + }; + ++#if defined(__DragonFly__) ++static void _rle_init(void) __attribute__((__constructor__)); ++ ++static void ++_rle_init(void) ++{ ++ rle_dflt_hdr.rle_file = stdout; ++} ++#endif ++ + /* ARGSUSED */ + void + NullputEof(the_hdr) diff --git a/graphics/urt/patches/patch-aw b/graphics/urt/patches/patch-aw new file mode 100644 index 00000000000..ab228602ec9 --- /dev/null +++ b/graphics/urt/patches/patch-aw @@ -0,0 +1,12 @@ +$NetBSD: patch-aw,v 1.1 2006/05/11 14:46:35 joerg Exp $ + +--- lib/rle_open_f.c.orig 2006-05-11 14:24:27.000000000 +0000 ++++ lib/rle_open_f.c +@@ -256,7 +256,6 @@ int *pid; + int pipefd[2]; + int i; + char *argv[4]; +- extern int errno; + + /* Check args. */ + if ( *mode != 'r' && *mode != 'w' ) diff --git a/graphics/urt/patches/patch-ax b/graphics/urt/patches/patch-ax new file mode 100644 index 00000000000..4912922c247 --- /dev/null +++ b/graphics/urt/patches/patch-ax @@ -0,0 +1,13 @@ +$NetBSD: patch-ax,v 1.1 2006/05/11 14:46:35 joerg Exp $ + +--- cnv/wasatchrle.c.orig 2006-05-11 14:25:44.000000000 +0000 ++++ cnv/wasatchrle.c +@@ -32,8 +32,6 @@ + #include <errno.h> + #include "rle.h" + +-extern int errno; +- + /* "short" in our world is 16 bits. Beware of swyte-bopping. */ + + struct was_head { |