Merge branch 'schismtracker:master' into master

Vad1mCSO2 · Dec 16, 2024 · 8f7efc8 · 8f7efc8
2 parents 3ae4227 + d59dfbe
commit 8f7efc8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -291,13 +291,11 @@ jobs:
         if: steps.cache-x86_64-dependencies.outputs.cache-hit != 'true'
         run: |
           pushd utf8proc-$UTF8PROC_VERSION
-          patch -p1 < ../.github/patches/utf8proc/2-fix-prefix.patch
           mkdir build_x86_64
           cd build_x86_64
           LDFLAGS="-F$HOME/x86_64/SDKs/MacOSX10.9.sdk/System/Library/Frameworks -L/usr/lib -L/usr/lib/system -Wl,-syslibroot,$HOME/x86_64/SDKs/MacOSX10.9.sdk" cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="$HOME/x86_64prefix" -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET="10.7" -DCMAKE_OSX_SYSROOT="$HOME/x86_64/SDKs/MacOSX10.9.sdk" -DBUILD_SHARED_LIBS=1
           make
           make install
-          patch -p1 -R < ../.github/patches/utf8proc/2-fix-prefix.patch
           popd
 
       - name: 'Build utf8proc (arm64)'

diff --git a/fmt/dsm.c b/fmt/dsm.c
@@ -364,7 +364,7 @@ int fmt_dsm_load_song(song_t *song, slurp_t *fp, unsigned int lflags)
 				sample->c5speed = bswapLE16(inst.c5speed);
 				sample->volume = inst.volume * 4; // modplug
 
-				iff_read_sample(&chunk, fp, sample, flags, sizeof(inst));
+				iff_read_sample(&chunk, fp, sample, flags, 64);
 			}
 			s++;