diff options
| -rw-r--r-- | graphics/rayshade/distinfo | 7 | ||||
| -rw-r--r-- | graphics/rayshade/patches/patch-ab | 47 | ||||
| -rw-r--r-- | graphics/rayshade/patches/patch-libray_libtext_mapping.h | 11 | ||||
| -rw-r--r-- | graphics/rayshade/patches/patch-libray_libtext_texture.c | 17 | ||||
| -rw-r--r-- | graphics/rayshade/patches/patch-libshade_lex.l | 24 |
5 files changed, 79 insertions, 27 deletions
diff --git a/graphics/rayshade/distinfo b/graphics/rayshade/distinfo index 76d51ff40a4..e9172b83b84 100644 --- a/graphics/rayshade/distinfo +++ b/graphics/rayshade/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.7 2011/11/02 20:22:15 shattered Exp $ +$NetBSD: distinfo,v 1.8 2012/12/25 21:08:40 joerg Exp $ SHA1 (rayshade.4.0.6.tar.Z) = 5fd1ce05e7ba3bc8e8b337c212eccb6b53b5b4ca RMD160 (rayshade.4.0.6.tar.Z) = a19bf35aa3f66de9ce406a1a98cf7edbde60f356 Size (rayshade.4.0.6.tar.Z) = 369527 bytes SHA1 (patch-aa) = b510e1b3a98ef25ffe0d23f9b499fb5c16c333f4 -SHA1 (patch-ab) = 13b48848c4a40d86ee5ceef8dddf10988b59e088 +SHA1 (patch-ab) = 8a5fb56e6e12440550469a4a7635921fa76ec615 SHA1 (patch-ac) = 496d4d89edaa7a8786cbd22c2fc31679fda96df5 SHA1 (patch-ad) = 8e599cc859406341ec39c52b7711e7b64f015b57 SHA1 (patch-ae) = 3663df57825be54a989dcfd2365662c524f8150f @@ -20,3 +20,6 @@ SHA1 (patch-an) = 0f1fc819052fc05097d278108934582f8e35a236 SHA1 (patch-ao) = a4357564a150836dc9080519f36c81ccc049d981 SHA1 (patch-ap) = 28ab76ad7b65d53bf190a944969b95f0915f6098 SHA1 (patch-ba) = d36261ceede5f89645ff23f5a108b231fd5ea18d +SHA1 (patch-libray_libtext_mapping.h) = e28ff185a6fefaad2fb975aafd04f7246ed83e55 +SHA1 (patch-libray_libtext_texture.c) = 17635e4a7b286db4c86d7e0071852f688b3989d8 +SHA1 (patch-libshade_lex.l) = e06825ca0fe17674c854aa04bf303a3ee0e0b768 diff --git a/graphics/rayshade/patches/patch-ab b/graphics/rayshade/patches/patch-ab index d5962af9314..382a6971ac4 100644 --- a/graphics/rayshade/patches/patch-ab +++ b/graphics/rayshade/patches/patch-ab @@ -1,26 +1,23 @@ -$NetBSD: patch-ab,v 1.1 1998/08/24 18:11:43 agc Exp $ +$NetBSD: patch-ab,v 1.2 2012/12/25 21:08:40 joerg Exp $ -*** etc/rsconvert/lex.l.orig Sun Mar 8 18:55:39 1998 ---- etc/rsconvert/lex.l Sun Mar 8 18:56:05 1998 -*************** -*** 22,27 **** ---- 22,28 ---- - #include "libcommon/common.h" - #include "y.tab.h" - %} -+ %option yylineno - alpha [a-zA-Z] - special [\.\_-] - digit [0-9] -*** libshade/lex.l.orig Sun Mar 8 18:52:11 1998 ---- libshade/lex.l Sun Mar 8 18:53:18 1998 -*************** -*** 29,34 **** ---- 29,35 ---- - #include "y.tab.h" - extern char *strsave(); - %} -+ %option yylineno - alpha [a-zA-Z] - special [\.\_-] - digit [0-9] +--- etc/rsconvert/lex.l.orig 1992-02-10 03:03:54.000000000 +0000 ++++ etc/rsconvert/lex.l +@@ -21,7 +21,9 @@ + #endif + #include "libcommon/common.h" + #include "y.tab.h" ++static void skipcomments(void); + %} ++%option yylineno + alpha [a-zA-Z] + special [\.\_-] + digit [0-9] +@@ -101,7 +103,7 @@ yywrap() {return(1);} + /* + * Skip over comments. + */ +-skipcomments() ++static void skipcomments(void) + { + char c; + diff --git a/graphics/rayshade/patches/patch-libray_libtext_mapping.h b/graphics/rayshade/patches/patch-libray_libtext_mapping.h new file mode 100644 index 00000000000..87c24d9c3b9 --- /dev/null +++ b/graphics/rayshade/patches/patch-libray_libtext_mapping.h @@ -0,0 +1,11 @@ +$NetBSD: patch-libray_libtext_mapping.h,v 1.1 2012/12/25 21:08:40 joerg Exp $ + +--- libray/libtext/mapping.h.orig 2012-12-25 18:59:13.000000000 +0000 ++++ libray/libtext/mapping.h +@@ -36,5 +36,6 @@ typedef struct Mapping { + + extern Mapping *UVMappingCreate(), *SphereMappingCreate(), *CylMappingCreate(), + *LinearMappingCreate(); ++void TextToUV(Mapping *mapping, Geom *prim, Vector *pos, Vector *norm, Float *u, Float *v, Vector *dpdu, Vector *dpdv); + + #endif /* MAPPING_H */ diff --git a/graphics/rayshade/patches/patch-libray_libtext_texture.c b/graphics/rayshade/patches/patch-libray_libtext_texture.c new file mode 100644 index 00000000000..1ca84271f43 --- /dev/null +++ b/graphics/rayshade/patches/patch-libray_libtext_texture.c @@ -0,0 +1,17 @@ +$NetBSD: patch-libray_libtext_texture.c,v 1.1 2012/12/25 21:08:40 joerg Exp $ + +--- libray/libtext/texture.c.orig 2012-12-25 18:58:09.000000000 +0000 ++++ libray/libtext/texture.c +@@ -121,11 +121,7 @@ Trans *p2model, *world2model; + /* + * Compute UV at 'pos' on given primitive. + */ +-TextToUV(mapping, prim, pos, norm, u, v, dpdu, dpdv) +-Mapping *mapping; +-Geom *prim; +-Vector *pos, *norm, *dpdu, *dpdv; +-Float *u, *v; ++void TextToUV(Mapping *mapping, Geom *prim, Vector *pos, Vector *norm, Float *u, Float *v, Vector *dpdu, Vector *dpdv) + { + Vec2d uv; + Vector ptmp; diff --git a/graphics/rayshade/patches/patch-libshade_lex.l b/graphics/rayshade/patches/patch-libshade_lex.l new file mode 100644 index 00000000000..5a1f39e43c3 --- /dev/null +++ b/graphics/rayshade/patches/patch-libshade_lex.l @@ -0,0 +1,24 @@ +$NetBSD: patch-libshade_lex.l,v 1.1 2012/12/25 21:08:40 joerg Exp $ + +--- libshade/lex.l.orig 1992-02-10 03:04:02.000000000 +0000 ++++ libshade/lex.l +@@ -28,7 +28,10 @@ + #include "symtab.h" + #include "y.tab.h" + extern char *strsave(); ++static void skipcomments(void); ++ + %} ++%option yylineno + alpha [a-zA-Z] + special [\.\_-] + digit [0-9] +@@ -163,7 +166,7 @@ yywrap() {return 1;} + /* + * Skip over comments. + */ +-skipcomments() ++static void skipcomments(void) + { + char c; + |