pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/games/xclannad

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Wed Mar  4 12:38:01 UTC 2026

Modified Files:
        pkgsrc/games/xclannad: distinfo
        pkgsrc/games/xclannad/patches: patch-music2_wavfile.cc
            patch-system_file.cc
Added Files:
        pkgsrc/games/xclannad/patches: patch-music2_koedec.cc

Log Message:
xclannad: fix misc other bugs.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/xclannad/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/xclannad/patches/patch-music2_koedec.cc
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/games/xclannad/patches/patch-music2_wavfile.cc
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/xclannad/patches/patch-system_file.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: pkgsrc/games/xclannad/distinfo
diff -u pkgsrc/games/xclannad/distinfo:1.6 pkgsrc/games/xclannad/distinfo:1.7
--- pkgsrc/games/xclannad/distinfo:1.6  Wed Mar  4 10:27:19 2026
+++ pkgsrc/games/xclannad/distinfo      Wed Mar  4 12:38:01 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2026/03/04 10:27:19 tsutsui Exp $
+$NetBSD: distinfo,v 1.7 2026/03/04 12:38:01 tsutsui Exp $
 
 BLAKE2s (xclannad-7hc.tar.gz) = 313c00a10aaeba1fc7bcc69578f2976f5df00414636a27ee19d498cee52ae5ad
 SHA512 (xclannad-7hc.tar.gz) = 5d14c1ca6932d0a013e36c2af51d0d4de2cb73e4c438ccf2bebf03f223a62649203726cc552f975e3177ea614f79c1d2d0d36220116289f0bb8f65a74997ac27
@@ -7,14 +7,15 @@ SHA1 (patch-Makefile.in) = 3586afaf13173
 SHA1 (patch-font_font__peer__ft2.cc) = 7e9201fdfee175233e28bb149b11fd76f3d008eb
 SHA1 (patch-font_font__peer__x11.cc) = d7fa18ecc70c957f7e387b272f6906d4ea83f409
 SHA1 (patch-font_text__stream.cc) = 27b2812c199f69f4d58cc9324c9aa56b713b5abe
+SHA1 (patch-music2_koedec.cc) = 40a250f850491a231f545a1261ebece857640355
 SHA1 (patch-music2_music.cc) = fe8c90d9901a86dc6c799a1482ffe8ca7ca53c98
 SHA1 (patch-music2_nwatowav.cc) = 52cbbb0a7ba116cacbae8c56f67b1dba9e9ab94c
-SHA1 (patch-music2_wavfile.cc) = f302900d87162ff25a561e968ea25bc51c072261
+SHA1 (patch-music2_wavfile.cc) = 0d26862626a5ffa441ed3ab744249c364f02381d
 SHA1 (patch-scn2k_scn2k__cmd.cc) = 887a170571f2eebbc323ac7e4534ddf8ebcb1d1d
 SHA1 (patch-scn2k_scn2k__grp.cc) = cf0c7efa5fcac698873665b9b51f98b62344fb1d
 SHA1 (patch-scn2k_scn2k__impl.cc) = e9a97e1b10dfdd50b92313176259a9c2ebc3951b
 SHA1 (patch-scn2k_scn2k__text.cc) = 8b7d96729d0eec629ced8461f8f6b272a3f7624d
-SHA1 (patch-system_file.cc) = 2d63371ae48ec73cf6fbc6f6bc93069d6360e064
+SHA1 (patch-system_file.cc) = 96eb0ae640c75a2117e9ecea1006283894767b65
 SHA1 (patch-system_file.h) = 8f5ff920167015112bf98df9a2123b1eb8ccc4f6
 SHA1 (patch-system_file__impl.h) = 22efb27fe5135c921542416a6ca0ac85b378daca
 SHA1 (patch-system_system__config.cc) = 0db7eaeb60b540c0c5afc480f820a4f07e200f7f

Index: pkgsrc/games/xclannad/patches/patch-music2_wavfile.cc
diff -u pkgsrc/games/xclannad/patches/patch-music2_wavfile.cc:1.1 pkgsrc/games/xclannad/patches/patch-music2_wavfile.cc:1.2
--- pkgsrc/games/xclannad/patches/patch-music2_wavfile.cc:1.1   Wed Mar  4 10:27:19 2026
+++ pkgsrc/games/xclannad/patches/patch-music2_wavfile.cc       Wed Mar  4 12:38:01 2026
@@ -1,6 +1,9 @@
-$NetBSD: patch-music2_wavfile.cc,v 1.1 2026/03/04 10:27:19 tsutsui Exp $
+$NetBSD: patch-music2_wavfile.cc,v 1.2 2026/03/04 12:38:01 tsutsui Exp $
 
 - appease -Wwrite-strings warnings
+- fix incorrect frequency of the input wav file
+- fix an undefined behavior
+- fix incorrect parentheses
 
 --- music2/wavfile.cc.orig     2008-08-31 09:52:12.000000000 +0000
 +++ music2/wavfile.cc
@@ -22,3 +25,32 @@ $NetBSD: patch-music2_wavfile.cc,v 1.1 2
  {     char    *pend ;
        int             k, test ;
  
+@@ -217,7 +217,7 @@ static char* WavGetInfo(WAVFILE* wfile, 
+ 
+       if ( (e = WaveHeaderCheck(data,
+                                 &channels,&samplerate,
+-                                &sample_bits,&samples,&datastart) != 0 )) {
++                                &sample_bits,&samples,&datastart)) != 0 ) {
+               fprintf(stderr,"WavGetInfo(): Reading WAV header\n");
+               return 0;
+       }
+@@ -303,7 +303,7 @@ WAVFILE_Stream::WAVFILE_Stream(FILE* _st
+       return;
+ }
+ WAVFILE_Stream::~WAVFILE_Stream() {
+-      if (data_orig) delete data_orig;
++      if (data_orig) delete[] data_orig;
+       if (stream) fclose(stream);
+       return;
+ }
+@@ -328,8 +328,8 @@ WAVFILE* WAVFILE::MakeConverter(WAVFILE*
+       if (new_reader->wavinfo.DataBits == 8) from_format = AUDIO_S8;
+       else from_format = AUDIO_S16;
+       SDL_AudioCVT* cvt = new SDL_AudioCVT;
+-      int ret = SDL_BuildAudioCVT(cvt, from_format, new_reader->wavinfo.Channels, freq,
+-              format, 2, freq);
++      int ret = SDL_BuildAudioCVT(cvt, from_format, new_reader->wavinfo.Channels, new_reader->wavinfo.SamplingRate,
++              format, channels, freq);
+       if (ret == -1) {
+               delete cvt;
+               fprintf(stderr,"Cannot make wave file converter!!!\n");

Index: pkgsrc/games/xclannad/patches/patch-system_file.cc
diff -u pkgsrc/games/xclannad/patches/patch-system_file.cc:1.2 pkgsrc/games/xclannad/patches/patch-system_file.cc:1.3
--- pkgsrc/games/xclannad/patches/patch-system_file.cc:1.2      Wed Mar  4 10:27:20 2026
+++ pkgsrc/games/xclannad/patches/patch-system_file.cc  Wed Mar  4 12:38:01 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-system_file.cc,v 1.2 2026/03/04 10:27:20 tsutsui Exp $
+$NetBSD: patch-system_file.cc,v 1.3 2026/03/04 12:38:01 tsutsui Exp $
 
 - avoid unaligned copy for RISC cpus (XXX: handle NetBSD only)
 - fix a missing return value warning
@@ -15,7 +15,7 @@ $NetBSD: patch-system_file.cc,v 1.2 2026
        0, 0, "", "pdt", 
        "seen.txt", "allanm.anl", "allard.ard", "allcur.cur", 
        0, 0, "koe", "bgm", "mov", "gan"};
-@@ -107,7 +107,7 @@ char* FILESEARCH::default_dirnames[TYPEM
+@@ -107,14 +107,14 @@ char* FILESEARCH::default_dirnames[TYPEM
  **    Find ������Τ�Read��������Ƥ�����롣
  */
  
@@ -24,6 +24,14 @@ $NetBSD: patch-system_file.cc,v 1.2 2026
        struct stat sb;
        /* �ѿ��� */
        arcname = 0;
+       list_point = 0;
+       filenames_orig = 0;
+       next = 0;
+-      if (aname[0] == '\0') {arcname=new char[1]; arcname[0]='\0';return;} // NULFILE
++      if (aname == NULL || aname[0] == '\0') {arcname=new char[1]; arcname[0]='\0';return;} // NULFILE
+       /* ���ȥ꤫�ݤ��Υ��� */
+       if (stat(aname,&sb) == -1) { /* error */
+               perror("stat");
 @@ -614,8 +614,9 @@ void FILESEARCH::SetFileInformation(FILE
        /* Ŭ��˽�� */
        if (filenames[type] != 0 &&

Added files:

Index: pkgsrc/games/xclannad/patches/patch-music2_koedec.cc
diff -u /dev/null pkgsrc/games/xclannad/patches/patch-music2_koedec.cc:1.1
--- /dev/null   Wed Mar  4 12:38:01 2026
+++ pkgsrc/games/xclannad/patches/patch-music2_koedec.cc        Wed Mar  4 12:38:01 2026
@@ -0,0 +1,38 @@
+$NetBSD: patch-music2_koedec.cc,v 1.1 2026/03/04 12:38:01 tsutsui Exp $
+
+- fix possible NULL dereferences
+
+--- music2/koedec.cc.orig      2008-08-31 09:52:12.000000000 +0000
++++ music2/koedec.cc
+@@ -96,10 +96,15 @@ AvgKoeInfo AvgKoeCache::Find(int file_nu
+       if (it == cache.end()) {
+               /* ������ head ���� */
+               char fname[100];
++              char *subdir = 0;
+               KoeType type = koe_unknown;
+               sprintf(fname, "z%03d.koe", file_number);
+               ARCINFO* arcinfo = file_searcher.Find(FILESEARCH::KOE,fname,".koe");
+               if (arcinfo == 0) {
++                      sprintf(fname, "z%04d.koe", file_number);
++                      arcinfo = file_searcher.Find(FILESEARCH::KOE,fname,".koe");
++              }
++              if (arcinfo == 0) {
+                       type = koe_nwk;
+                       sprintf(fname, "z%04d.nwk", file_number);
+                       arcinfo = file_searcher.Find(FILESEARCH::KOE,fname,".nwk");
+@@ -113,7 +118,15 @@ AvgKoeInfo AvgKoeCache::Find(int file_nu
+                       DIRFILE* koedir = (DIRFILE*) file_searcher.MakeARCFILE((FILESEARCH::ARCTYPE)0, "koe");
+                       sprintf(fname, "%04d", file_number);
+                       koedir = new DIRFILE(koedir->SearchFile(fname));
++                      if (koedir == 0) return info;
+                       sprintf(fname, "z%04d%05d.ogg", file_number, index);
++                      subdir = koedir->SearchFile(fname);
++                      delete koedir;
++                      koedir = 0;
++                      if (subdir == 0) return info;
++                      koedir = new DIRFILE(subdir);
++                      delete[] subdir;
++                      subdir = 0;
+                       arcinfo = koedir->Find(fname, ".ogg");
+                       delete koedir;
+
Home | Main Index | Thread Index | Old Index