diff options
-rw-r--r-- | cross/uisp/distinfo | 4 | ||||
-rw-r--r-- | cross/uisp/patches/patch-src_MotIntl.C | 22 | ||||
-rw-r--r-- | cross/uisp/patches/patch-src_Stk500.C | 13 | ||||
-rw-r--r-- | games/nighthawk/distinfo | 4 | ||||
-rw-r--r-- | games/nighthawk/patches/patch-bb | 34 | ||||
-rw-r--r-- | games/qonk/distinfo | 7 | ||||
-rw-r--r-- | games/qonk/patches/patch-ap | 7 | ||||
-rw-r--r-- | games/qonk/patches/patch-src_lisp_lexer.cpp | 12 | ||||
-rw-r--r-- | games/qonk/patches/patch-src_lisp_parser.cpp | 12 | ||||
-rw-r--r-- | games/qonk/patches/patch-src_sdl__driver.cpp | 12 |
10 files changed, 119 insertions, 8 deletions
diff --git a/cross/uisp/distinfo b/cross/uisp/distinfo index c65cfa21831..7c97ee8445a 100644 --- a/cross/uisp/distinfo +++ b/cross/uisp/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.4 2011/09/03 21:59:18 dholland Exp $ +$NetBSD: distinfo,v 1.5 2011/12/05 22:44:08 joerg Exp $ SHA1 (uisp-20040311.tar.bz2) = 8e4c1e05d2f9a962b8969fc76d8b448c9e0751d4 RMD160 (uisp-20040311.tar.bz2) = 4f45d375e942376a2508232cf787f94ab7f8995b Size (uisp-20040311.tar.bz2) = 142973 bytes SHA1 (patch-aa) = 60d42fc897b8c77c8396823fd9b26b95adb68a77 +SHA1 (patch-src_MotIntl.C) = 456a47463f81da901c78822dc26e9e7683ac5b61 +SHA1 (patch-src_Stk500.C) = a2881e5e0591dc2efb58fa9bd6b84b8327f54b0e SHA1 (patch-src_avr_h) = f5ac07e1a8e3865e7c6bd3af86a1777bb068b5fd SHA1 (patch-src_dapa_c) = bc3fd2ecde373af2a2a3864f07efedd1177ecca0 diff --git a/cross/uisp/patches/patch-src_MotIntl.C b/cross/uisp/patches/patch-src_MotIntl.C new file mode 100644 index 00000000000..14fad2319f1 --- /dev/null +++ b/cross/uisp/patches/patch-src_MotIntl.C @@ -0,0 +1,22 @@ +$NetBSD: patch-src_MotIntl.C,v 1.1 2011/12/05 22:44:08 joerg Exp $ + +--- src/MotIntl.C.orig 2011-12-05 20:37:28.000000000 +0000 ++++ src/MotIntl.C +@@ -110,7 +110,7 @@ void TMotIntl::UploadMotorola(){ + do{ + /* convert to upper case */ + buf_len = strlen(line_buf); +- for (int i=0;i<buf_len;i++){line_buf[i] = toupper(line_buf[i]);} ++ for (int i=0;i<buf_len;i++){line_buf[i] = toupper((unsigned char)line_buf[i]);} + + if (line_buf[0]!='S'){throw Error_Device("Bad Motorola file format.");} + +@@ -246,7 +246,7 @@ void TMotIntl::UploadIntel(){ + do{ + /* convert to upper case */ + buf_len = strlen(line_buf); +- for (int i=0;i<buf_len;i++){line_buf[i] = toupper(line_buf[i]);} ++ for (int i=0;i<buf_len;i++){line_buf[i] = toupper((unsigned char)line_buf[i]);} + + if (line_buf[0]!=':'){throw Error_Device("Bad Intel file format.");} + diff --git a/cross/uisp/patches/patch-src_Stk500.C b/cross/uisp/patches/patch-src_Stk500.C new file mode 100644 index 00000000000..c039b0fcfde --- /dev/null +++ b/cross/uisp/patches/patch-src_Stk500.C @@ -0,0 +1,13 @@ +$NetBSD: patch-src_Stk500.C,v 1.1 2011/12/05 22:44:08 joerg Exp $ + +--- src/Stk500.C.orig 2011-12-05 20:37:56.000000000 +0000 ++++ src/Stk500.C +@@ -407,7 +407,7 @@ void TStk500::FlushWriteBuffer(){ + } + + pgsz = prg_part[desired_part].params.pagesize; +- pagesize = (pgsz[0]) << 8 + pgsz[1]; ++ pagesize = (pgsz[0] << 8) + pgsz[1]; + + if (pagesize == 0) { + pagesize = 128; diff --git a/games/nighthawk/distinfo b/games/nighthawk/distinfo index b14c5548dcd..91b7b20b498 100644 --- a/games/nighthawk/distinfo +++ b/games/nighthawk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2007/08/08 20:40:20 joerg Exp $ +$NetBSD: distinfo,v 1.11 2011/12/05 22:44:47 joerg Exp $ SHA1 (nighthawk-2.1.tgz) = 117cd7d2c496a0d9e44b1b6d02523ad1cb0de1bf RMD160 (nighthawk-2.1.tgz) = 3973ff63c4525de65ae4dd3803d355c102968997 @@ -16,5 +16,5 @@ SHA1 (patch-ag) = be5419e9cbd1f2af3a41f2dc37db792e299f8625 SHA1 (patch-ah) = 5734f92db807cb44da1494bb51eab9fd18d9fec8 SHA1 (patch-ai) = 72d47ae02b1e5f1a5f04094c03d00471370a3092 SHA1 (patch-ba) = 3bf82814d23305a686317ea36ff03698d65157ee -SHA1 (patch-bb) = 783951fb4532aa66466ef8e820e3964fd6326aa6 +SHA1 (patch-bb) = 3c6bc506fb7cf52d6b03da5d6c2281f5ea135e0b SHA1 (patch-bc) = 8bbcd9bd7bcde579a9b7ddb26ef60ffc05362b7e diff --git a/games/nighthawk/patches/patch-bb b/games/nighthawk/patches/patch-bb index c79e0ac2d57..0faa65ae28a 100644 --- a/games/nighthawk/patches/patch-bb +++ b/games/nighthawk/patches/patch-bb @@ -1,4 +1,4 @@ -$NetBSD: patch-bb,v 1.5 2007/08/08 20:40:20 joerg Exp $ +$NetBSD: patch-bb,v 1.6 2011/12/05 22:44:47 joerg Exp $ --- src_sound/dsp_mixxer.c.orig 1998-06-22 10:41:31.000000000 +0000 +++ src_sound/dsp_mixxer.c @@ -63,3 +63,35 @@ $NetBSD: patch-bb,v 1.5 2007/08/08 20:40:20 joerg Exp $ dsp_dealloc_bufs(); } else +@@ -301,13 +301,13 @@ void DAC0816_channel_mixxer(int chan_no, + + for(sample_no = 0;sample_no < mix_buffer_size;sample_no++) + { +- if(chmix[chan_no].funkctrl & 0x2) + #pragma pack(1) ++ if(chmix[chan_no].funkctrl & 0x2) + sam = *((sDB *)chmix[chan_no].sample_addr + + (unsigned long)chmix[chan_no].sample_ptr); +-#pragma pack() + else + sam = 0; ++#pragma pack() + + #ifdef DIGITAL_ECHOING + sam_reverb = *(chmix[chan_no].echo_buffer + +@@ -363,13 +363,13 @@ void DAC1616_channel_mixxer(int chan_no, + shift_t = 8 + shift_table[funk_info.no_active_channels]; + for(sample_no = 0;sample_no < mix_buffer_size;sample_no++) + { +- if(chmix[chan_no].funkctrl & 0x2) + #pragma pack(1) ++ if(chmix[chan_no].funkctrl & 0x2) + sam = *((sDW *)chmix[chan_no].sample_addr + + (unsigned long)chmix[chan_no].sample_ptr); +-#pragma pack() + else + sam = 0; ++#pragma pack() + #ifdef DIGITAL_ECHOING + sam_reverb = *(chmix[chan_no].echo_buffer + + ((chmix[chan_no].echo_ptr - echo_rpos) & echo_mask)); diff --git a/games/qonk/distinfo b/games/qonk/distinfo index 3055e16e4e4..073dd95dd65 100644 --- a/games/qonk/distinfo +++ b/games/qonk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/11/25 23:52:54 wiz Exp $ +$NetBSD: distinfo,v 1.2 2011/12/05 22:45:19 joerg Exp $ SHA1 (qonk-0.3.1.tar.gz) = 703fc8282642ff20986c9a395dc6626d4b087ed9 RMD160 (qonk-0.3.1.tar.gz) = 6ed1ad1fb67cea6677d39d1201da1eca9ea4479b @@ -15,4 +15,7 @@ SHA1 (patch-al) = d25bbb4919862d3340c460d47fcb3282cc3d386f SHA1 (patch-am) = 0a2db8a22684137dddc8f8bbafbf9d8c194d42b1 SHA1 (patch-an) = 2fdf8c2e7e30389fa253beaef79e39ea8bbe5eda SHA1 (patch-ao) = 36deb01bf80208e39e922738e0a181151f263a28 -SHA1 (patch-ap) = 401312074dd83ea63f2d7fdcb9606c673fd02956 +SHA1 (patch-ap) = 3f21ccc5a37e9c16648e532df10799c4a34675cd +SHA1 (patch-src_lisp_lexer.cpp) = d122f69dc0289c509ba93ece509a2c59fca1286f +SHA1 (patch-src_lisp_parser.cpp) = 4cafcda558d3b4a1bc0efb1ecbad55f045b58532 +SHA1 (patch-src_sdl__driver.cpp) = 338a2aa7fa17761ff88d088cdd701be8d7c5fedf diff --git a/games/qonk/patches/patch-ap b/games/qonk/patches/patch-ap index 37977ebec45..a353356b44e 100644 --- a/games/qonk/patches/patch-ap +++ b/games/qonk/patches/patch-ap @@ -1,8 +1,11 @@ -$NetBSD: patch-ap,v 1.1.1.1 2007/11/25 23:52:54 wiz Exp $ +$NetBSD: patch-ap,v 1.2 2011/12/05 22:45:19 joerg Exp $ --- src/videooptions.cpp.orig 2007-09-14 05:43:03.000000000 +0000 +++ src/videooptions.cpp -@@ -3,7 +3,7 @@ +@@ -1,9 +1,10 @@ + #include <vector> + #include <sstream> ++#include <algorithm> #include <SDL/SDL.h> diff --git a/games/qonk/patches/patch-src_lisp_lexer.cpp b/games/qonk/patches/patch-src_lisp_lexer.cpp new file mode 100644 index 00000000000..b2d29201b6e --- /dev/null +++ b/games/qonk/patches/patch-src_lisp_lexer.cpp @@ -0,0 +1,12 @@ +$NetBSD: patch-src_lisp_lexer.cpp,v 1.1 2011/12/05 22:45:19 joerg Exp $ + +--- src/lisp/lexer.cpp.orig 2011-12-05 21:37:43.000000000 +0000 ++++ src/lisp/lexer.cpp +@@ -19,6 +19,7 @@ + // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include <sstream> + #include <stdexcept> ++#include <cstring> + + #include "lexer.hpp" + #include "translation.hpp" diff --git a/games/qonk/patches/patch-src_lisp_parser.cpp b/games/qonk/patches/patch-src_lisp_parser.cpp new file mode 100644 index 00000000000..4e0feee4879 --- /dev/null +++ b/games/qonk/patches/patch-src_lisp_parser.cpp @@ -0,0 +1,12 @@ +$NetBSD: patch-src_lisp_parser.cpp,v 1.1 2011/12/05 22:45:19 joerg Exp $ + +--- src/lisp/parser.cpp.orig 2011-12-05 21:38:05.000000000 +0000 ++++ src/lisp/parser.cpp +@@ -22,6 +22,7 @@ + #include <fstream> + + #include <cassert> ++#include <cstring> + + #include "parser.hpp" + #include "lisp.hpp" diff --git a/games/qonk/patches/patch-src_sdl__driver.cpp b/games/qonk/patches/patch-src_sdl__driver.cpp new file mode 100644 index 00000000000..c82f54963b4 --- /dev/null +++ b/games/qonk/patches/patch-src_sdl__driver.cpp @@ -0,0 +1,12 @@ +$NetBSD: patch-src_sdl__driver.cpp,v 1.1 2011/12/05 22:45:19 joerg Exp $ + +--- src/sdl_driver.cpp.orig 2011-12-05 21:39:04.000000000 +0000 ++++ src/sdl_driver.cpp +@@ -5,6 +5,7 @@ + #include <SDL/SDL.h> + #include <SDL/SDL_ttf.h> + #include <cstdio> ++#include <cstdlib> + + #include "sdl_driver.h" + #include "canvas.h" |