modplug-svn-commit Mailing List for modplug (Page 106)

A music tracker software for Windows.

Brought to you by: lpchip, manxorist, rewbs, saga-games

modplug-svn-commit — OpenMPT subversion commit notifications

You can subscribe to this list here.

2006	Jan	Feb	Mar (1)	Apr (1)	May	Jun (1)	Jul	Aug (10)	Sep	Oct	Nov	Dec (3)
2007	Jan (1)	Feb (2)	Mar (3)	Apr (2)	May (10)	Jun (2)	Jul (1)	Aug	Sep	Oct	Nov (3)	Dec
2008	Jan (6)	Feb (4)	Mar (5)	Apr (2)	May (1)	Jun (1)	Jul (4)	Aug (6)	Sep (2)	Oct (9)	Nov (1)	Dec (4)
2009	Jan (9)	Feb (2)	Mar (2)	Apr (2)	May (6)	Jun (18)	Jul (33)	Aug (39)	Sep (33)	Oct (24)	Nov (23)	Dec (22)
2010	Jan (29)	Feb (32)	Mar (51)	Apr (17)	May (31)	Jun (21)	Jul (32)	Aug (28)	Sep (35)	Oct (27)	Nov (11)	Dec (13)
2011	Jan (14)	Feb (13)	Mar (27)	Apr (27)	May (28)	Jun (20)	Jul (43)	Aug (52)	Sep (66)	Oct (61)	Nov (11)	Dec (8)
2012	Jan (20)	Feb (30)	Mar (38)	Apr (21)	May (33)	Jun (21)	Jul (25)	Aug (9)	Sep (24)	Oct (42)	Nov (27)	Dec (41)
2013	Jan (20)	Feb (35)	Mar (156)	Apr (298)	May (258)	Jun (201)	Jul (105)	Aug (60)	Sep (193)	Oct (245)	Nov (280)	Dec (194)
2014	Jan (63)	Feb (202)	Mar (200)	Apr (23)	May (53)	Jun (105)	Jul (18)	Aug (26)	Sep (110)	Oct (187)	Nov (97)	Dec (74)
2015	Jan (45)	Feb (55)	Mar (116)	Apr (116)	May (193)	Jun (164)	Jul (50)	Aug (111)	Sep (98)	Oct (71)	Nov (103)	Dec (63)
2016	Jan (33)	Feb (101)	Mar (182)	Apr (139)	May (140)	Jun (103)	Jul (165)	Aug (286)	Sep (208)	Oct (127)	Nov (97)	Dec (54)
2017	Jan (64)	Feb (335)	Mar (202)	Apr (212)	May (139)	Jun (127)	Jul (294)	Aug (154)	Sep (170)	Oct (152)	Nov (156)	Dec (62)
2018	Jan (168)	Feb (237)	Mar (196)	Apr (174)	May (174)	Jun (161)	Jul (127)	Aug (88)	Sep (149)	Oct (66)	Nov (52)	Dec (135)
2019	Jan (146)	Feb (126)	Mar (104)	Apr (58)	May (60)	Jun (28)	Jul (197)	Aug (129)	Sep (141)	Oct (148)	Nov (63)	Dec (100)
2020	Jan (74)	Feb (37)	Mar (59)	Apr (154)	May (194)	Jun (133)	Jul (313)	Aug (197)	Sep (49)	Oct (162)	Nov (143)	Dec (57)
2021	Jan (120)	Feb (107)	Mar (314)	Apr (157)	May (524)	Jun (169)	Jul (72)	Aug (133)	Sep (135)	Oct (146)	Nov (198)	Dec (325)
2022	Jan (409)	Feb (249)	Mar (138)	Apr (95)	May (102)	Jun (221)	Jul (66)	Aug (120)	Sep (192)	Oct (131)	Nov (53)	Dec (171)
2023	Jan (357)	Feb (82)	Mar (168)	Apr (218)	May (196)	Jun (86)	Jul (115)	Aug (49)	Sep (190)	Oct (102)	Nov (45)	Dec (76)
2024	Jan (86)	Feb (50)	Mar (324)	Apr (209)	May (197)	Jun (232)	Jul (194)	Aug (247)	Sep (219)	Oct (266)	Nov (328)	Dec (304)
2025	Jan (191)	Feb (115)	Mar (137)	Apr (32)	May (126)	Jun (403)	Jul (213)	Aug (152)	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 104 105 106 107 108 .. 963 > >> (Page 106 of 963)

[OMPT-svn-commit] OpenMPT r21421 - trunk/OpenMPT/soundlib

From: <sv...@op...> - 2024-08-13 14:23:24

Author: manx
Date: Tue Aug 13 16:23:16 2024
New Revision: 21421
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21421

Log:
[Ref] Silence MSVC static analyser brain-damage.

Modified:
   trunk/OpenMPT/soundlib/Load_669.cpp

Modified: trunk/OpenMPT/soundlib/Load_669.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_669.cpp	Tue Aug 13 07:15:51 2024	(r21420)
+++ trunk/OpenMPT/soundlib/Load_669.cpp	Tue Aug 13 16:23:16 2024	(r21421)
@@ -249,7 +249,15 @@
 				// Weird stuff happening in corehop.669 with effects > 8... they seem to do the same thing as if the high bit wasn't set, but the sample also behaves strangely.
 				if(command < static_cast<uint8>(std::size(effTrans)))
 				{
+#if MPT_COMPILER_MSVC
+#pragma warning(push)
+// false-positive
+#pragma warning(disable:6385)  // Reading invalid data from 'effTrans'.
+#endif
 					m->command = effTrans[command];
+#if MPT_COMPILER_MSVC
+#pragma warning(pop)
+#endif
 				} else
 				{
 					m->command = CMD_NONE;

[OMPT-svn-commit] OpenMPT r21420 - in branches/OpenMPT-1.31: . .github/workflows

From: <sv...@op...> - 2024-08-13 05:16:06

Author: manx
Date: Tue Aug 13 07:15:51 2024
New Revision: 21420
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21420

Log:
Merged revision(s) 21419 from trunk/OpenMPT:
[Fix] build: CI: GitHub: Pass NO_VORBISFILE=1 in addition to NO_VORBIS=1.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.github/workflows/Fedora-Makefile.yml
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml
   branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml
   branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml
   branches/OpenMPT-1.31/.github/workflows/Ubuntu-Makefile.yml
   branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/Fedora-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/Fedora-Makefile.yml	Tue Aug 13 07:15:21 2024	(r21419)
+++ branches/OpenMPT-1.31/.github/workflows/Fedora-Makefile.yml	Tue Aug 13 07:15:51 2024	(r21420)
@@ -32,6 +32,6 @@
       # https://github.com/actions/runner/issues/2033
       run: chown -R $(id -u):$(id -g) $(pwd)
     - name: Build
-      run: make -j$(nproc) VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+      run: make -j$(nproc) VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
-      run: make -j$(nproc) VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+      run: make -j$(nproc) VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check

Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml	Tue Aug 13 07:15:21 2024	(r21419)
+++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml	Tue Aug 13 07:15:51 2024	(r21420)
@@ -62,7 +62,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
       uses: cross-platform-actions/action@v0.25.0
       with:
@@ -74,7 +74,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
       uses: cross-platform-actions/action@v0.25.0
       with:

Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml	Tue Aug 13 07:15:21 2024	(r21419)
+++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml	Tue Aug 13 07:15:51 2024	(r21420)
@@ -67,7 +67,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+          gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
       uses: cross-platform-actions/action@v0.25.0
       with:
@@ -79,7 +79,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+          gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
       uses: cross-platform-actions/action@v0.25.0
       with:

Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml	Tue Aug 13 07:15:21 2024	(r21419)
+++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml	Tue Aug 13 07:15:51 2024	(r21420)
@@ -64,7 +64,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
       uses: cross-platform-actions/action@v0.25.0
       with:
@@ -76,7 +76,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
       uses: cross-platform-actions/action@v0.25.0
       with:

Modified: branches/OpenMPT-1.31/.github/workflows/Ubuntu-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/Ubuntu-Makefile.yml	Tue Aug 13 07:15:21 2024	(r21419)
+++ branches/OpenMPT-1.31/.github/workflows/Ubuntu-Makefile.yml	Tue Aug 13 07:15:51 2024	(r21420)
@@ -35,7 +35,7 @@
       run: echo "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV
     - name: Build
       run: |
-        make STRICT=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+        make STRICT=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
       run: |
-        make STRICT=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+        make STRICT=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Tue Aug 13 07:15:21 2024	(r21419)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Tue Aug 13 07:15:51 2024	(r21420)
@@ -71,7 +71,7 @@
     - name: setup parallel make
       run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
     - name: make
-      run: make ${{ matrix.ancient == true && 'ANCIENT=1' || '' }} ARCH=${{matrix.arch}} MACOSX_VERSION_MIN=${{matrix.target}} STRICT=1 ${{ (matrix.deps == 'sys') && 'FORCE_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+      run: make ${{ matrix.ancient == true && 'ANCIENT=1' || '' }} ARCH=${{matrix.arch}} MACOSX_VERSION_MIN=${{matrix.target}} STRICT=1 ${{ (matrix.deps == 'sys') && 'FORCE_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: make check
       if: ${{ matrix.check }}
-      run: make ${{ matrix.ancient == true && 'ANCIENT=1' || '' }} ARCH=${{matrix.arch}} MACOSX_VERSION_MIN=${{matrix.target}} STRICT=1 ${{ (matrix.deps == 'sys') && 'FORCE_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+      run: make ${{ matrix.ancient == true && 'ANCIENT=1' || '' }} ARCH=${{matrix.arch}} MACOSX_VERSION_MIN=${{matrix.target}} STRICT=1 ${{ (matrix.deps == 'sys') && 'FORCE_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check

[OMPT-svn-commit] OpenMPT r21419 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2024-08-13 05:15:29

Author: manx
Date: Tue Aug 13 07:15:21 2024
New Revision: 21419
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21419

Log:
[Fix] build: CI: GitHub: Pass NO_VORBISFILE=1 in addition to NO_VORBIS=1.

Modified:
   trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml
   trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml
   trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml
   trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml
   trunk/OpenMPT/.github/workflows/Ubuntu-Makefile.yml
   trunk/OpenMPT/.github/workflows/macOS-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml	Tue Aug 13 00:03:59 2024	(r21418)
+++ trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml	Tue Aug 13 07:15:21 2024	(r21419)
@@ -34,6 +34,6 @@
       # https://github.com/actions/runner/issues/2033
       run: chown -R $(id -u):$(id -g) $(pwd)
     - name: Build
-      run: make -j$(nproc) VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+      run: make -j$(nproc) VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
-      run: make -j$(nproc) VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+      run: make -j$(nproc) VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check

Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml	Tue Aug 13 00:03:59 2024	(r21418)
+++ trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml	Tue Aug 13 07:15:21 2024	(r21419)
@@ -64,7 +64,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
       uses: cross-platform-actions/action@v0.25.0
       with:
@@ -76,7 +76,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
       uses: cross-platform-actions/action@v0.25.0
       with:

Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml	Tue Aug 13 00:03:59 2024	(r21418)
+++ trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml	Tue Aug 13 07:15:21 2024	(r21419)
@@ -69,7 +69,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+          gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
       uses: cross-platform-actions/action@v0.25.0
       with:
@@ -81,7 +81,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+          gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
       uses: cross-platform-actions/action@v0.25.0
       with:

Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml	Tue Aug 13 00:03:59 2024	(r21418)
+++ trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml	Tue Aug 13 07:15:21 2024	(r21419)
@@ -66,7 +66,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
       uses: cross-platform-actions/action@v0.25.0
       with:
@@ -78,7 +78,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
       uses: cross-platform-actions/action@v0.25.0
       with:

Modified: trunk/OpenMPT/.github/workflows/Ubuntu-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/Ubuntu-Makefile.yml	Tue Aug 13 00:03:59 2024	(r21418)
+++ trunk/OpenMPT/.github/workflows/Ubuntu-Makefile.yml	Tue Aug 13 07:15:21 2024	(r21419)
@@ -37,7 +37,7 @@
       run: echo "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV
     - name: Build
       run: |
-        make STRICT=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+        make STRICT=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
       run: |
-        make STRICT=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+        make STRICT=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check

Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Tue Aug 13 00:03:59 2024	(r21418)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Tue Aug 13 07:15:21 2024	(r21419)
@@ -73,7 +73,7 @@
     - name: setup parallel make
       run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
     - name: make
-      run: make ${{ matrix.ancient == true && 'ANCIENT=1' || '' }} ARCH=${{matrix.arch}} MACOSX_VERSION_MIN=${{matrix.target}} STRICT=1 ${{ (matrix.deps == 'sys') && 'FORCE_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+      run: make ${{ matrix.ancient == true && 'ANCIENT=1' || '' }} ARCH=${{matrix.arch}} MACOSX_VERSION_MIN=${{matrix.target}} STRICT=1 ${{ (matrix.deps == 'sys') && 'FORCE_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: make check
       if: ${{ matrix.check }}
-      run: make ${{ matrix.ancient == true && 'ANCIENT=1' || '' }} ARCH=${{matrix.arch}} MACOSX_VERSION_MIN=${{matrix.target}} STRICT=1 ${{ (matrix.deps == 'sys') && 'FORCE_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+      run: make ${{ matrix.ancient == true && 'ANCIENT=1' || '' }} ARCH=${{matrix.arch}} MACOSX_VERSION_MIN=${{matrix.target}} STRICT=1 ${{ (matrix.deps == 'sys') && 'FORCE_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check

[OMPT-svn-commit] OpenMPT r21418 - trunk/OpenMPT/soundlib

From: <sv...@op...> - 2024-08-12 22:04:11

Author: sagamusix
Date: Tue Aug 13 00:03:59 2024
New Revision: 21418
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21418

Log:
[Fix] 669: Auto slides were only stopped on note change (https://www.un4seen.com/forum/?topic=15448.msg143478#msg143478).

Modified:
   trunk/OpenMPT/soundlib/Load_669.cpp

Modified: trunk/OpenMPT/soundlib/Load_669.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_669.cpp	Tue Aug 13 00:01:57 2024	(r21417)
+++ trunk/OpenMPT/soundlib/Load_669.cpp	Tue Aug 13 00:03:59 2024	(r21418)
@@ -215,6 +215,7 @@
 				uint8 note = noteInstr >> 2;
 				uint8 instr = ((noteInstr & 0x03) << 4) | (instrVol >> 4);
 				uint8 vol = instrVol & 0x0F;
+				uint8 command = effect[chn] >> 4;
 				if(noteInstr < 0xFE)
 				{
 					m->note = note + 36 + NOTE_MIN;
@@ -235,6 +236,8 @@
 				{
 					// A param value of 0 resets the effect.
 					effect[chn] = 0xFF;
+					if(command < 3)
+						m->SetEffectCommand(effTrans[command], 0);
 				}
 				if(effect[chn] == 0xFF)
 				{
@@ -244,7 +247,6 @@
 				m->param = effect[chn] & 0x0F;
 
 				// Weird stuff happening in corehop.669 with effects > 8... they seem to do the same thing as if the high bit wasn't set, but the sample also behaves strangely.
-				uint8 command = effect[chn] >> 4;
 				if(command < static_cast<uint8>(std::size(effTrans)))
 				{
 					m->command = effTrans[command];

[OMPT-svn-commit] OpenMPT r21417 - in branches/OpenMPT-1.31: . soundlib

From: <sv...@op...> - 2024-08-12 22:02:04

Author: sagamusix
Date: Tue Aug 13 00:01:57 2024
New Revision: 21417
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21417

Log:
Merged revision(s) 21416 from trunk/OpenMPT:
[Fix] Mod Conversion: Condition in r21301 for when to enable sustain loop was wrong (https://bugs.openmpt.org/view.php?id=1805).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/ModInstrument.cpp

Modified: branches/OpenMPT-1.31/soundlib/ModInstrument.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/ModInstrument.cpp	Tue Aug 13 00:01:40 2024	(r21416)
+++ branches/OpenMPT-1.31/soundlib/ModInstrument.cpp	Tue Aug 13 00:01:57 2024	(r21417)
@@ -41,7 +41,7 @@
 			// So we have to disable the sustain loop if it was behind the normal loop.
 			dwFlags.reset(ENV_SUSTAIN);
 		}
-		if(!dwFlags.test_all(ENV_LOOP | ENV_SUSTAIN))
+		if(!dwFlags[ENV_LOOP | ENV_SUSTAIN])
 		{
 			// XM has no automatic fade-out behaviour at the end of the envelope.
 			dwFlags.set(ENV_SUSTAIN);

[OMPT-svn-commit] OpenMPT r21416 - trunk/OpenMPT/soundlib

From: <sv...@op...> - 2024-08-12 22:01:47

Author: sagamusix
Date: Tue Aug 13 00:01:40 2024
New Revision: 21416
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21416

Log:
[Fix] Mod Conversion: Condition in r21301 for when to enable sustain loop was wrong (https://bugs.openmpt.org/view.php?id=1805).

Modified:
   trunk/OpenMPT/soundlib/ModInstrument.cpp

Modified: trunk/OpenMPT/soundlib/ModInstrument.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/ModInstrument.cpp	Mon Aug 12 22:15:36 2024	(r21415)
+++ trunk/OpenMPT/soundlib/ModInstrument.cpp	Tue Aug 13 00:01:40 2024	(r21416)
@@ -41,7 +41,7 @@
 			// So we have to disable the sustain loop if it was behind the normal loop.
 			dwFlags.reset(ENV_SUSTAIN);
 		}
-		if(!dwFlags.test_all(ENV_LOOP | ENV_SUSTAIN))
+		if(!dwFlags[ENV_LOOP | ENV_SUSTAIN])
 		{
 			// XM has no automatic fade-out behaviour at the end of the envelope.
 			dwFlags.set(ENV_SUSTAIN);

[OMPT-svn-commit] OpenMPT r21415 - trunk/OpenMPT/soundlib

From: <sv...@op...> - 2024-08-12 20:15:49

Author: sagamusix
Date: Mon Aug 12 22:15:36 2024
New Revision: 21415
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21415

Log:
[Fix] Velocity was halved in previous commit.

Modified:
   trunk/OpenMPT/soundlib/Sndmix.cpp

Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp	Mon Aug 12 22:08:10 2024	(r21414)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp	Mon Aug 12 22:15:36 2024	(r21415)
@@ -2680,7 +2680,7 @@
 		switch(pIns->pluginVelocityHandling)
 		{
 			case PLUGIN_VELOCITYHANDLING_CHANNEL:
-				velocity = hasVolCommand ? vol : chn.nVolume;
+				velocity = hasVolCommand ? vol * 2 : chn.nVolume;
 				break;
 			default:
 				break;

[OMPT-svn-commit] OpenMPT r21414 - trunk/OpenMPT/soundlib

From: <sv...@op...> - 2024-08-12 20:08:22

Author: sagamusix
Date: Mon Aug 12 22:08:10 2024
New Revision: 21414
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21414

Log:
[Fix] Result of CMD_VOLUME was never sent to plugins, because it was processed after ProcessMidiOut was called. In particular this means that MOD to MIDI export didn't export volumes.

Modified:
   trunk/OpenMPT/soundlib/Sndmix.cpp

Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp	Mon Aug 12 21:40:26 2024	(r21413)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp	Mon Aug 12 22:08:10 2024	(r21414)
@@ -2648,11 +2648,11 @@
 	// Check for volume commands
 	uint8 vol = 0xFF;
 	if(chn.rowCommand.volcmd == VOLCMD_VOLUME)
-		vol = std::min(chn.rowCommand.vol, uint8(64));
+		vol = std::min(chn.rowCommand.vol, uint8(64)) * 2u;
 	else if(chn.rowCommand.command == CMD_VOLUME)
-		vol = std::min(chn.rowCommand.param, uint8(64));
+		vol = std::min(chn.rowCommand.param, uint8(64)) * 2u;
 	else if(chn.rowCommand.command == CMD_VOLUME8)
-		vol = static_cast<uint8>((chn.rowCommand.param + 3u) / 4u);
+		vol = static_cast<uint8>((chn.rowCommand.param + 1u) / 2u);
 
 	const bool hasVolCommand = (vol != 0xFF);
 
@@ -2666,7 +2666,7 @@
 			SendMIDINote(nChn, realNote, static_cast<uint16>(chn.nVolume), m_playBehaviour[kMIDINotesFromChannelPlugin] ? pPlugin : nullptr);
 		} else if(hasVolCommand)
 		{
-			pPlugin->MidiCC(MIDIEvents::MIDICC_Volume_Fine, vol, nChn);
+			pPlugin->MidiCC(MIDIEvents::MIDICC_Volume_Fine, vol / 2u, nChn);
 		}
 		return;
 	}
@@ -2680,7 +2680,7 @@
 		switch(pIns->pluginVelocityHandling)
 		{
 			case PLUGIN_VELOCITYHANDLING_CHANNEL:
-				velocity = chn.nVolume;
+				velocity = hasVolCommand ? vol : chn.nVolume;
 				break;
 			default:
 				break;
@@ -2708,11 +2708,11 @@
 		switch(pIns->pluginVolumeHandling)
 		{
 			case PLUGIN_VOLUMEHANDLING_DRYWET:
-				if(hasVolCommand) pPlugin->SetDryRatio(1.0f - (2 * vol) / 127.0f);
+				if(hasVolCommand) pPlugin->SetDryRatio(1.0f - vol / 127.0f);
 				else pPlugin->SetDryRatio(1.0f - static_cast<float>(2 * defaultVolume) / 127.0f);
 				break;
 			case PLUGIN_VOLUMEHANDLING_MIDI:
-				if(hasVolCommand) pPlugin->MidiCC(MIDIEvents::MIDICC_Volume_Coarse, std::min(uint8(127), static_cast<uint8>(2 * vol)), nChn);
+				if(hasVolCommand) pPlugin->MidiCC(MIDIEvents::MIDICC_Volume_Coarse, std::min(uint8(127), vol), nChn);
 				else pPlugin->MidiCC(MIDIEvents::MIDICC_Volume_Coarse, static_cast<uint8>(std::min(uint32(127), static_cast<uint32>(2 * defaultVolume))), nChn);
 				break;
 			default:

[OMPT-svn-commit] OpenMPT r21413 - branches/OpenMPT-1.31/.github/workflows

From: <sv...@op...> - 2024-08-12 19:40:37

Author: manx
Date: Mon Aug 12 21:40:26 2024
New Revision: 21413
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21413

Log:
[Imp] build: CI: GitHub: macOS: Add XCode 16.0-beta.

Modified:
   branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Mon Aug 12 21:39:29 2024	(r21412)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Mon Aug 12 21:40:26 2024	(r21413)
@@ -11,6 +11,22 @@
       fail-fast: false
       matrix:
         include:
+          - { host: macos-14, compiler: '16.0', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: ''     , deps: local, check: true , ancient: false }

[OMPT-svn-commit] OpenMPT r21412 - branches/OpenMPT-1.31/.github/workflows

From: <sv...@op...> - 2024-08-12 19:39:41

Author: manx
Date: Mon Aug 12 21:39:29 2024
New Revision: 21412
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21412

Log:
[Fix] build: CI: GitHub: macOS: Makefile: Remove unsupported i386.

Modified:
   branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Mon Aug 12 21:37:52 2024	(r21411)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Mon Aug 12 21:39:29 2024	(r21412)
@@ -32,9 +32,7 @@
           - { host: macos-12, compiler: '14.2', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
           - { host: macos-12, compiler: '14.2', arch: x86_64, target: '10.13', deps: small, check: true , ancient: false }
           - { host: macos-12, compiler: '13.2', arch: x86_64, target: '10.13', deps: local, check: true , ancient: true  }
-          - { host: macos-12, compiler: '13.2', arch: i386  , target: '10.13', deps: local, check: false, ancient: true  }
           - { host: macos-12, compiler: '13.2', arch: x86_64, target: '10.13', deps: small, check: true , ancient: true  }
-          - { host: macos-12, compiler: '13.2', arch: i386  , target: '10.13', deps: small, check: false, ancient: true  }
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}}
       cancel-in-progress: true

[OMPT-svn-commit] OpenMPT r21411 - branches/OpenMPT-1.31/.github/workflows

From: <sv...@op...> - 2024-08-12 19:38:04

Author: manx
Date: Mon Aug 12 21:37:52 2024
New Revision: 21411
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21411

Log:
[Fix] build: CI: GitHub: macOS: Makefile: Fix typo in x86_64.

Modified:
   branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Mon Aug 12 21:34:12 2024	(r21410)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Mon Aug 12 21:37:52 2024	(r21411)
@@ -13,27 +13,27 @@
         include:
           - { host: macos-14, compiler: '15.4', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: ''     , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: small, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: ''     , deps: small, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: '14'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: '14'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: '13'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: '13'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: '12'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: '12'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: '11'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '11'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.15', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.14', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-13, compiler: '15.2', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-12, compiler: '14.2', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-12, compiler: '14.2', arch: x64_64, target: '10.13', deps: small, check: true , ancient: false }
-          - { host: macos-12, compiler: '13.2', arch: x64_64, target: '10.13', deps: local, check: true , ancient: true  }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.3', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-13, compiler: '15.2', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-12, compiler: '14.2', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-12, compiler: '14.2', arch: x86_64, target: '10.13', deps: small, check: true , ancient: false }
+          - { host: macos-12, compiler: '13.2', arch: x86_64, target: '10.13', deps: local, check: true , ancient: true  }
           - { host: macos-12, compiler: '13.2', arch: i386  , target: '10.13', deps: local, check: false, ancient: true  }
-          - { host: macos-12, compiler: '13.2', arch: x64_64, target: '10.13', deps: small, check: true , ancient: true  }
+          - { host: macos-12, compiler: '13.2', arch: x86_64, target: '10.13', deps: small, check: true , ancient: true  }
           - { host: macos-12, compiler: '13.2', arch: i386  , target: '10.13', deps: small, check: false, ancient: true  }
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}}

[OMPT-svn-commit] OpenMPT r21410 - in branches/OpenMPT-1.31: . contrib/libmodplug-0.8.8.5

From: <sv...@op...> - 2024-08-12 19:34:24

Author: manx
Date: Mon Aug 12 21:34:12 2024
New Revision: 21410
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21410

Log:
Merged revision(s) 21396 from trunk/OpenMPT:
[Fix] build: CI: GitHub: macOS: Makefile: Remove unsupported i386 arch.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/contrib/libmodplug-0.8.8.5/   (props changed)

[OMPT-svn-commit] OpenMPT r21409 - in branches/OpenMPT-1.31: . contrib/libmodplug-0.8.8.5

From: <sv...@op...> - 2024-08-12 19:33:49

Author: manx
Date: Mon Aug 12 21:33:37 2024
New Revision: 21409
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21409

Log:
Merged revision(s) 21392 from trunk/OpenMPT:
[Imp] build: CI: GitHub: macOS: Add builders for XCode 13.2 on macOS 12. While we cannot target macOS 10.9 due to missing libc++ features, we should be able to target 10.13.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/contrib/libmodplug-0.8.8.5/   (props changed)

[OMPT-svn-commit] OpenMPT r21408 - in branches/OpenMPT-1.31: . contrib/libmodplug-0.8.8.5

From: <sv...@op...> - 2024-08-12 19:32:50

Author: manx
Date: Mon Aug 12 21:32:39 2024
New Revision: 21408
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21408

Log:
Merged revision(s) 21391 from trunk/OpenMPT:
[Imp] build: Makefile: Add back ANCIENT=1 option to support older compilers with missing command line options.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/contrib/libmodplug-0.8.8.5/   (props changed)

[OMPT-svn-commit] OpenMPT r21407 - branches/OpenMPT-1.31/.github/workflows

From: <sv...@op...> - 2024-08-12 19:31:15

Author: manx
Date: Mon Aug 12 21:31:03 2024
New Revision: 21407
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21407

Log:
Merged revision(s) 21396 from trunk/OpenMPT:
[Fix] build: CI: GitHub: macOS: Makefile: Remove unsupported i386 arch.
........

Modified:
   branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Mon Aug 12 21:30:16 2024	(r21406)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Mon Aug 12 21:31:03 2024	(r21407)
@@ -26,17 +26,11 @@
           - { host: macos-14, compiler: '15.4', arch: x64_64, target: '11'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.15', deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.14', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: i386  , target: '10.14', deps: local, check: false, ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: i386  , target: '10.13', deps: local, check: false, ancient: false }
           - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.3', arch: i386  , target: '10.13', deps: local, check: false, ancient: false }
           - { host: macos-13, compiler: '15.2', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-13, compiler: '15.2', arch: i386  , target: '10.13', deps: local, check: false, ancient: false }
           - { host: macos-12, compiler: '14.2', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-12, compiler: '14.2', arch: i386  , target: '10.13', deps: local, check: false, ancient: false }
           - { host: macos-12, compiler: '14.2', arch: x64_64, target: '10.13', deps: small, check: true , ancient: false }
-          - { host: macos-12, compiler: '14.2', arch: i386  , target: '10.13', deps: small, check: false, ancient: false }
           - { host: macos-12, compiler: '13.2', arch: x64_64, target: '10.13', deps: local, check: true , ancient: true  }
           - { host: macos-12, compiler: '13.2', arch: i386  , target: '10.13', deps: local, check: false, ancient: true  }
           - { host: macos-12, compiler: '13.2', arch: x64_64, target: '10.13', deps: small, check: true , ancient: true  }

[OMPT-svn-commit] OpenMPT r21406 - branches/OpenMPT-1.31/.github/workflows

From: <sv...@op...> - 2024-08-12 19:30:29

Author: manx
Date: Mon Aug 12 21:30:16 2024
New Revision: 21406
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21406

Log:
Merged revision(s) 21392 from trunk/OpenMPT:
[Imp] build: CI: GitHub: macOS: Add builders for XCode 13.2 on macOS 12. While we cannot target macOS 10.9 due to missing libc++ features, we should be able to target 10.13.
........

Modified:
   branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml
   branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml	Mon Aug 12 21:25:53 2024	(r21405)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml	Mon Aug 12 21:30:16 2024	(r21406)
@@ -15,6 +15,7 @@
           - { host: macos-14, compiler: '15.3' }
           - { host: macos-13, compiler: '15.2' }
           - { host: macos-12, compiler: '14.2' }
+          - { host: macos-12, compiler: '13.2' }
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-autotools
       cancel-in-progress: true

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Mon Aug 12 21:25:53 2024	(r21405)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Mon Aug 12 21:30:16 2024	(r21406)
@@ -11,32 +11,36 @@
       fail-fast: false
       matrix:
         include:
-          - { host: macos-14, compiler: '15.4', arch: ''    , target: ''     , deps: sys  , check: true  }
-          - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: ''     , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: small, check: true  }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: ''     , deps: small, check: true  }
-          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '14'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '14'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '13'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '13'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '12'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '12'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '11'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '11'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.15', deps: local, check: true  }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.14', deps: local, check: true  }
-          - { host: macos-14, compiler: '15.4', arch: i386  , target: '10.14', deps: local, check: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.13', deps: local, check: true  }
-          - { host: macos-14, compiler: '15.4', arch: i386  , target: '10.13', deps: local, check: false }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.13', deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: i386  , target: '10.13', deps: local, check: false }
-          - { host: macos-13, compiler: '15.2', arch: x64_64, target: '10.13', deps: local, check: true  }
-          - { host: macos-13, compiler: '15.2', arch: i386  , target: '10.13', deps: local, check: false }
-          - { host: macos-12, compiler: '14.2', arch: x64_64, target: '10.13', deps: local, check: true  }
-          - { host: macos-12, compiler: '14.2', arch: i386  , target: '10.13', deps: local, check: false }
-          - { host: macos-12, compiler: '14.2', arch: x64_64, target: '10.13', deps: small, check: true  }
-          - { host: macos-12, compiler: '14.2', arch: i386  , target: '10.13', deps: small, check: false }
+          - { host: macos-14, compiler: '15.4', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.15', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.14', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: i386  , target: '10.14', deps: local, check: false, ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: i386  , target: '10.13', deps: local, check: false, ancient: false }
+          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.3', arch: i386  , target: '10.13', deps: local, check: false, ancient: false }
+          - { host: macos-13, compiler: '15.2', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-13, compiler: '15.2', arch: i386  , target: '10.13', deps: local, check: false, ancient: false }
+          - { host: macos-12, compiler: '14.2', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-12, compiler: '14.2', arch: i386  , target: '10.13', deps: local, check: false, ancient: false }
+          - { host: macos-12, compiler: '14.2', arch: x64_64, target: '10.13', deps: small, check: true , ancient: false }
+          - { host: macos-12, compiler: '14.2', arch: i386  , target: '10.13', deps: small, check: false, ancient: false }
+          - { host: macos-12, compiler: '13.2', arch: x64_64, target: '10.13', deps: local, check: true , ancient: true  }
+          - { host: macos-12, compiler: '13.2', arch: i386  , target: '10.13', deps: local, check: false, ancient: true  }
+          - { host: macos-12, compiler: '13.2', arch: x64_64, target: '10.13', deps: small, check: true , ancient: true  }
+          - { host: macos-12, compiler: '13.2', arch: i386  , target: '10.13', deps: small, check: false, ancient: true  }
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}}
       cancel-in-progress: true
@@ -59,7 +63,7 @@
     - name: setup parallel make
       run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
     - name: make
-      run: make ARCH=${{matrix.arch}} MACOSX_VERSION_MIN=${{matrix.target}} STRICT=1 ${{ (matrix.deps == 'sys') && 'FORCE_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+      run: make ${{ matrix.ancient == true && 'ANCIENT=1' || '' }} ARCH=${{matrix.arch}} MACOSX_VERSION_MIN=${{matrix.target}} STRICT=1 ${{ (matrix.deps == 'sys') && 'FORCE_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: make check
       if: ${{ matrix.check }}
-      run: make ARCH=${{matrix.arch}} MACOSX_VERSION_MIN=${{matrix.target}} STRICT=1 ${{ (matrix.deps == 'sys') && 'FORCE_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+      run: make ${{ matrix.ancient == true && 'ANCIENT=1' || '' }} ARCH=${{matrix.arch}} MACOSX_VERSION_MIN=${{matrix.target}} STRICT=1 ${{ (matrix.deps == 'sys') && 'FORCE_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check

[OMPT-svn-commit] OpenMPT r21405 - in branches/OpenMPT-1.31: . build/make

From: <sv...@op...> - 2024-08-12 19:26:05

Author: manx
Date: Mon Aug 12 21:25:53 2024
New Revision: 21405
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21405

Log:
Merged revision(s) 21391 from trunk/OpenMPT:
[Imp] build: Makefile: Add back ANCIENT=1 option to support older compilers with missing command line options.
........

Modified:
   branches/OpenMPT-1.31/Makefile
   branches/OpenMPT-1.31/build/make/warnings-clang.mk

Modified: branches/OpenMPT-1.31/Makefile
==============================================================================
--- branches/OpenMPT-1.31/Makefile	Mon Aug 12 21:21:50 2024	(r21404)
+++ branches/OpenMPT-1.31/Makefile	Mon Aug 12 21:25:53 2024	(r21405)
@@ -66,6 +66,7 @@
 #  ONLY_TEST=0         Only build the test suite.
 #  STRICT=0            Treat warnings as errors.
 #  MODERN=0            Pass more modern compiler options.
+#  ANCIENT=0           Pass compiler options compatible with older versions.
 #  NATIVE=0            Optimize for system CPU.
 #  STDCXX=c++17        C++ standard version (default depends on compiler)
 #  STDC=c17            C standard version (default depends on compiler)

Modified: branches/OpenMPT-1.31/build/make/warnings-clang.mk
==============================================================================
--- branches/OpenMPT-1.31/build/make/warnings-clang.mk	Mon Aug 12 21:21:50 2024	(r21404)
+++ branches/OpenMPT-1.31/build/make/warnings-clang.mk	Mon Aug 12 21:25:53 2024	(r21405)
@@ -2,8 +2,13 @@
 CXXFLAGS_WARNINGS += -Wcast-align -Wcast-qual -Wdouble-promotion -Wfloat-conversion -Wmissing-prototypes -Wshift-count-negative -Wshift-count-overflow -Wshift-op-parentheses -Wshift-overflow -Wshift-sign-overflow -Wundef
 CFLAGS_WARNINGS   += -Wcast-align -Wcast-qual -Wdouble-promotion -Wfloat-conversion -Wmissing-prototypes -Wshift-count-negative -Wshift-count-overflow -Wshift-op-parentheses -Wshift-overflow -Wshift-sign-overflow -Wundef
 
-CXXFLAGS_WARNINGS += -Wdeprecated -Wextra-semi -Wframe-larger-than=16000 -Wglobal-constructors -Wimplicit-fallthrough -Wmissing-declarations -Wnon-virtual-dtor -Wreserved-id-macro
-CFLAGS_WARNINGS   +=                           -Wframe-larger-than=4000
+CXXFLAGS_WARNINGS += -Wdeprecated -Wextra-semi -Wglobal-constructors -Wimplicit-fallthrough -Wmissing-declarations -Wnon-virtual-dtor -Wreserved-id-macro
+CFLAGS_WARNINGS   += 
+
+ifneq ($(ANCIENT),1)
+CXXFLAGS_WARNINGS += -Wframe-larger-than=16000
+CFLAGS_WARNINGS   += -Wframe-larger-than=4000
+endif
 
 #CXXFLAGS_WARNINGS += -Wfloat-equal
 #CXXFLAGS_WARNINGS += -Wdocumentation
@@ -21,10 +26,14 @@
 CFLAGS_SILENT += -Wno-cast-qual
 CFLAGS_SILENT += -Wno-double-promotion
 CFLAGS_SILENT += -Wno-float-conversion
+ifneq ($(ANCIENT),1)
 CFLAGS_SILENT += -Wno-frame-larger-than
+endif
 CFLAGS_SILENT += -Wno-missing-prototypes
 CFLAGS_SILENT += -Wno-sign-compare
+ifneq ($(ANCIENT),1)
 CFLAGS_SILENT += -Wno-unused-but-set-variable
+endif
 CFLAGS_SILENT += -Wno-unused-function
 CFLAGS_SILENT += -Wno-unused-parameter
 CFLAGS_SILENT += -Wno-unused-variable

[OMPT-svn-commit] OpenMPT r21404 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2024-08-12 19:22:06

Author: manx
Date: Mon Aug 12 21:21:50 2024
New Revision: 21404
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21404

Log:
Revert r21402.
Merged revision(s) 21402 from trunk/OpenMPT:
[Imp] build: CI: GitHub: macOS: Add arm64e builders.
........

Modified:
   trunk/OpenMPT/.github/workflows/macOS-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 21:04:56 2024	(r21403)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 21:21:50 2024	(r21404)
@@ -14,44 +14,32 @@
       matrix:
         include:
           - { host: macos-14, compiler: '16.0', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64e, target: ''     , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: ''     , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64e, target: ''     , deps: small, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: small, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: ''     , deps: small, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64e, target: '14'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: arm64 , target: '14'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: '14'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64e, target: '13'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: arm64 , target: '13'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: '13'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64e, target: '12'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: arm64 , target: '12'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: '12'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64e, target: '11'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: arm64 , target: '11'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: '11'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64e, target: ''     , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: ''     , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64e, target: ''     , deps: small, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: small, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: ''     , deps: small, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64e, target: '14'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: '14'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: '14'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64e, target: '13'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: '13'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: '13'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64e, target: '12'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: '12'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: '12'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64e, target: '11'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: '11'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: '11'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false }

[OMPT-svn-commit] OpenMPT r21403 - trunk/OpenMPT/mptrack

From: <sv...@op...> - 2024-08-12 19:05:08

Author: sagamusix
Date: Mon Aug 12 21:04:56 2024
New Revision: 21403
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21403

Log:
[Imp] Pattern tab: Add channel settings entry to channel context menu.

Modified:
   trunk/OpenMPT/mptrack/View_pat.cpp
   trunk/OpenMPT/mptrack/View_pat.h
   trunk/OpenMPT/mptrack/resource.h

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	Mon Aug 12 19:19:56 2024	(r21402)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	Mon Aug 12 21:04:56 2024	(r21403)
@@ -82,6 +82,7 @@
 	ON_COMMAND(ID_EDIT_SPLITKEYBOARDSETTINGS,	&CViewPattern::SetSplitKeyboardSettings)
 	ON_COMMAND(ID_EDIT_UNDO,		&CViewPattern::OnEditUndo)
 	ON_COMMAND(ID_EDIT_REDO,		&CViewPattern::OnEditRedo)
+	ON_COMMAND(ID_CHANNEL_SETTINGS,	&CViewPattern::OnChannelSettings)
 	ON_COMMAND(ID_PATTERN_CHNRESET,	&CViewPattern::OnChannelReset)
 	ON_COMMAND(ID_PATTERN_MUTE,		&CViewPattern::OnMuteFromClick)
 	ON_COMMAND(ID_PATTERN_SOLO,		&CViewPattern::OnSoloFromClick)
@@ -2740,6 +2741,16 @@
 }
 
 
+void CViewPattern::OnChannelSettings()
+{
+	CPoint pt = GetPointFromPosition(m_MenuCursor);
+	pt.x += GetChannelWidth() / 2;
+	pt.y = m_szHeader.cy / 2;
+	ClientToScreen(&pt);
+	m_quickChannelProperties.Show(GetDocument(), m_MenuCursor.GetChannel(), pt);
+}
+
+
 void CViewPattern::OnTransposeChannel()
 {
 	CInputDlg dlg(this, _T("Enter transpose amount (affects all patterns):"), -(NOTE_MAX - NOTE_MIN), (NOTE_MAX - NOTE_MIN), m_nTransposeAmount);
@@ -6732,6 +6743,8 @@
 	DWORD canRemoveChannels = (numChannels > specs.channelsMin) ? 0 : MF_GRAYED;
 
 	AppendMenu(hMenu, MF_SEPARATOR, 0, _T(""));
+	AppendMenu(hMenu, MF_STRING, ID_CHANNEL_SETTINGS, ih->GetKeyTextFromCommand(kcChannelSettings, _T("C&hannel Settings")));
+	AppendMenu(hMenu, MF_SEPARATOR, 0, _T(""));
 
 	AppendMenu(hMenu, MF_STRING, ID_PATTERN_TRANSPOSECHANNEL, ih->GetKeyTextFromCommand(kcChannelTranspose, _T("&Transpose Channel")));
 	AppendMenu(hMenu, MF_STRING | canAddChannels, ID_PATTERN_DUPLICATECHANNEL, ih->GetKeyTextFromCommand(kcChannelDuplicate, _T("&Duplicate Channel")));

Modified: trunk/OpenMPT/mptrack/View_pat.h
==============================================================================
--- trunk/OpenMPT/mptrack/View_pat.h	Mon Aug 12 19:19:56 2024	(r21402)
+++ trunk/OpenMPT/mptrack/View_pat.h	Mon Aug 12 21:04:56 2024	(r21403)
@@ -475,6 +475,7 @@
 	afx_msg void OnAddChannelAfter() { AddChannel(m_MenuCursor.GetChannel(), true); };
 	afx_msg void OnDuplicateChannel();
 	afx_msg void OnResetChannelColors();
+	afx_msg void OnChannelSettings();
 	afx_msg void OnTransposeChannel();
 	afx_msg void OnRemoveChannel();
 	afx_msg void OnRemoveChannelDialog();

Modified: trunk/OpenMPT/mptrack/resource.h
==============================================================================
--- trunk/OpenMPT/mptrack/resource.h	Mon Aug 12 19:19:56 2024	(r21402)
+++ trunk/OpenMPT/mptrack/resource.h	Mon Aug 12 21:04:56 2024	(r21403)
@@ -1250,6 +1250,7 @@
 #define ID_FILE_SAVE_COPY               43238
 #define ID_MODTREE_RENAME               43239
 #define ID_UPDATE_AVAILABLE             43240
+#define ID_CHANNEL_SETTINGS             43241
 #define ID_CHANGE_PCNOTE_PARAM          43242
 // From here: Command range [ID_CHANGE_PCNOTE_PARAM, ID_CHANGE_PCNOTE_PARAM + ModCommand::maxColumnValue]
 #define ID_MODTREE_CLOSE                44243

[OMPT-svn-commit] OpenMPT r21402 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2024-08-12 17:20:08

Author: manx
Date: Mon Aug 12 19:19:56 2024
New Revision: 21402
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21402

Log:
[Imp] build: CI: GitHub: macOS: Add arm64e builders.

Modified:
   trunk/OpenMPT/.github/workflows/macOS-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 19:13:51 2024	(r21401)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 19:19:56 2024	(r21402)
@@ -14,32 +14,44 @@
       matrix:
         include:
           - { host: macos-14, compiler: '16.0', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64e, target: ''     , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64e, target: ''     , deps: small, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: small, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64e, target: '14'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: arm64 , target: '14'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64e, target: '13'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: arm64 , target: '13'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64e, target: '12'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: arm64 , target: '12'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64e, target: '11'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: arm64 , target: '11'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: '11'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64e, target: ''     , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64e, target: ''     , deps: small, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: small, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64e, target: '14'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: '14'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64e, target: '13'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: '13'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64e, target: '12'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: '12'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64e, target: '11'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: '11'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: '11'   , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false }

[OMPT-svn-commit] OpenMPT r21401 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2024-08-12 17:13:58

Author: manx
Date: Mon Aug 12 19:13:51 2024
New Revision: 21401
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21401

Log:
[Ref] build: CI: GitHub: macOS: Makefile: Add explicit arch for XCode 13.2.

Modified:
   trunk/OpenMPT/.github/workflows/macOS-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 19:04:41 2024	(r21400)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 19:13:51 2024	(r21401)
@@ -49,8 +49,8 @@
           - { host: macos-13, compiler: '15.2', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
           - { host: macos-12, compiler: '14.2', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
           - { host: macos-12, compiler: '14.2', arch: x86_64, target: '10.13', deps: small, check: true , ancient: false }
-          - { host: macos-12, compiler: '13.2', arch: ''    , target: '10.13', deps: local, check: true , ancient: true  }
-          - { host: macos-12, compiler: '13.2', arch: ''    , target: '10.13', deps: small, check: true , ancient: true  }
+          - { host: macos-12, compiler: '13.2', arch: x86_64, target: '10.13', deps: local, check: true , ancient: true  }
+          - { host: macos-12, compiler: '13.2', arch: x86_64, target: '10.13', deps: small, check: true , ancient: true  }
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}}
       cancel-in-progress: true

[OMPT-svn-commit] OpenMPT r21400 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2024-08-12 17:04:55

Author: manx
Date: Mon Aug 12 19:04:41 2024
New Revision: 21400
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21400

Log:
[Fix] build: CI: GitHub: macOS: Makefile: Fix typo in x86_64.

Modified:
   trunk/OpenMPT/.github/workflows/macOS-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 18:09:57 2024	(r21399)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 19:04:41 2024	(r21400)
@@ -13,44 +13,44 @@
       fail-fast: false
       matrix:
         include:
-          - { host: macos-14, compiler: '16.0', arch: ''     , target: ''     , deps: sys  , check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64  , target: ''     , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: ''     , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64  , target: ''     , deps: small, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: ''     , deps: small, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64  , target: '14'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: '14'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64  , target: '13'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: '13'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64  , target: '12'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: '12'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64  , target: '11'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: '11'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: '10.15', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: '10.14', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: ''     , target: ''     , deps: sys  , check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64  , target: ''     , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: ''     , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64  , target: ''     , deps: small, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: ''     , deps: small, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64  , target: '14'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: '14'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64  , target: '13'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: '13'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64  , target: '12'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: '12'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64  , target: '11'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: '11'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: '10.15', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: '10.14', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.3', arch: x64_64h, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-13, compiler: '15.2', arch: x64_64h, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-12, compiler: '14.2', arch: x64_64h, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-12, compiler: '14.2', arch: x64_64h, target: '10.13', deps: small, check: true , ancient: false }
-          - { host: macos-12, compiler: '13.2', arch: ''     , target: '10.13', deps: local, check: true , ancient: true  }
-          - { host: macos-12, compiler: '13.2', arch: ''     , target: '10.13', deps: small, check: true , ancient: true  }
+          - { host: macos-14, compiler: '16.0', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.3', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-13, compiler: '15.2', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-12, compiler: '14.2', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-12, compiler: '14.2', arch: x86_64, target: '10.13', deps: small, check: true , ancient: false }
+          - { host: macos-12, compiler: '13.2', arch: ''    , target: '10.13', deps: local, check: true , ancient: true  }
+          - { host: macos-12, compiler: '13.2', arch: ''    , target: '10.13', deps: small, check: true , ancient: true  }
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}}
       cancel-in-progress: true

[OMPT-svn-commit] OpenMPT r21399 - in branches/OpenMPT-1.31: . soundlib src/mpt/base

From: <sv...@op...> - 2024-08-12 16:10:15

Author: manx
Date: Mon Aug 12 18:09:57 2024
New Revision: 21399
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21399

Log:
Merged revision(s) 21398 from trunk/OpenMPT:
[Ref] mpt/base/detect_compiler.hpp: Add MPT_COMPILER_QUIRK_APPLE_CLANG.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/SampleFormatMP3.cpp
   branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp

Modified: branches/OpenMPT-1.31/soundlib/SampleFormatMP3.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/SampleFormatMP3.cpp	Mon Aug 12 18:09:28 2024	(r21398)
+++ branches/OpenMPT-1.31/soundlib/SampleFormatMP3.cpp	Mon Aug 12 18:09:57 2024	(r21399)
@@ -172,7 +172,7 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wframe-larger-than=16000"
 #endif // MPT_COMPILER_GCC
-#if (MPT_CLANG_AT_LEAST(13,0,0) && !MPT_OS_MACOSX_OR_IOS) || MPT_CLANG_AT_LEAST(13,1,0)
+#if (MPT_CLANG_AT_LEAST(13,0,0) && !defined(MPT_COMPILER_QUIRK_APPLE_CLANG)) || MPT_CLANG_AT_LEAST(13,1,0)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wframe-larger-than"
 #endif // MPT_COMPILER_CLANG
@@ -180,7 +180,7 @@
 {
 	return mp3dec_decode_frame(dec, mp3, mp3_bytes, pcm, info);
 }
-#if (MPT_CLANG_AT_LEAST(13,0,0) && !MPT_OS_MACOSX_OR_IOS) || MPT_CLANG_AT_LEAST(13,1,0)
+#if (MPT_CLANG_AT_LEAST(13,0,0) && !defined(MPT_COMPILER_QUIRK_APPLE_CLANG)) || MPT_CLANG_AT_LEAST(13,1,0)
 #pragma clang diagnostic pop
 #endif // MPT_COMPILER_CLANG
 #if MPT_COMPILER_GCC

Modified: branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp
==============================================================================
--- branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp	Mon Aug 12 18:09:28 2024	(r21398)
+++ branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp	Mon Aug 12 18:09:57 2024	(r21399)
@@ -204,6 +204,16 @@
 
 
 
+// detect compiler quirks
+
+#if MPT_COMPILER_CLANG
+#if defined(__APPLE__)
+#define MPT_COMPILER_QUIRK_APPLE_CLANG
+#endif
+#endif
+
+
+
 // detect compiler setting quirks
 
 #if MPT_COMPILER_GCC

[OMPT-svn-commit] OpenMPT r21398 - in trunk/OpenMPT: soundlib src/mpt/base

From: <sv...@op...> - 2024-08-12 16:09:40

Author: manx
Date: Mon Aug 12 18:09:28 2024
New Revision: 21398
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21398

Log:
[Ref] mpt/base/detect_compiler.hpp: Add MPT_COMPILER_QUIRK_APPLE_CLANG.

Modified:
   trunk/OpenMPT/soundlib/SampleFormatMP3.cpp
   trunk/OpenMPT/src/mpt/base/detect_compiler.hpp

Modified: trunk/OpenMPT/soundlib/SampleFormatMP3.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/SampleFormatMP3.cpp	Mon Aug 12 18:08:37 2024	(r21397)
+++ trunk/OpenMPT/soundlib/SampleFormatMP3.cpp	Mon Aug 12 18:09:28 2024	(r21398)
@@ -219,7 +219,7 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wframe-larger-than=16000"
 #endif // MPT_COMPILER_GCC
-#if (MPT_CLANG_AT_LEAST(13,0,0) && !MPT_OS_MACOSX_OR_IOS) || MPT_CLANG_AT_LEAST(13,1,0)
+#if (MPT_CLANG_AT_LEAST(13,0,0) && !defined(MPT_COMPILER_QUIRK_APPLE_CLANG)) || MPT_CLANG_AT_LEAST(13,1,0)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wframe-larger-than"
 #endif // MPT_COMPILER_CLANG
@@ -227,7 +227,7 @@
 {
 	return mp3dec_decode_frame(dec, mp3, mp3_bytes, pcm, info);
 }
-#if (MPT_CLANG_AT_LEAST(13,0,0) && !MPT_OS_MACOSX_OR_IOS) || MPT_CLANG_AT_LEAST(13,1,0)
+#if (MPT_CLANG_AT_LEAST(13,0,0) && !defined(MPT_COMPILER_QUIRK_APPLE_CLANG)) || MPT_CLANG_AT_LEAST(13,1,0)
 #pragma clang diagnostic pop
 #endif // MPT_COMPILER_CLANG
 #if MPT_COMPILER_GCC

Modified: trunk/OpenMPT/src/mpt/base/detect_compiler.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/base/detect_compiler.hpp	Mon Aug 12 18:08:37 2024	(r21397)
+++ trunk/OpenMPT/src/mpt/base/detect_compiler.hpp	Mon Aug 12 18:09:28 2024	(r21398)
@@ -217,6 +217,16 @@
 
 
 
+// detect compiler quirks
+
+#if MPT_COMPILER_CLANG
+#if defined(__APPLE__)
+#define MPT_COMPILER_QUIRK_APPLE_CLANG
+#endif
+#endif
+
+
+
 // detect compiler setting quirks
 
 #if MPT_COMPILER_GCC

[OMPT-svn-commit] OpenMPT r21397 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2024-08-12 16:08:49

Author: manx
Date: Mon Aug 12 18:08:37 2024
New Revision: 21397
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21397

Log:
[Fix] build: CI: GitHub: macOS: Makefile: Use Apple-specific x86_64h arch name.

Modified:
   trunk/OpenMPT/.github/workflows/macOS-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 18:07:15 2024	(r21396)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 18:08:37 2024	(r21397)
@@ -13,44 +13,44 @@
       fail-fast: false
       matrix:
         include:
-          - { host: macos-14, compiler: '16.0', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: ''     , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: small, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: ''     , deps: small, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '14'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '14'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '13'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '13'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '12'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '12'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '11'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '11'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.15', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.14', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: ''     , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: small, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: ''     , deps: small, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '14'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '14'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '13'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '13'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '12'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '12'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '11'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '11'   , deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.15', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.14', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-13, compiler: '15.2', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-12, compiler: '14.2', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-12, compiler: '14.2', arch: x64_64, target: '10.13', deps: small, check: true , ancient: false }
-          - { host: macos-12, compiler: '13.2', arch: ''    , target: '10.13', deps: local, check: true , ancient: true  }
-          - { host: macos-12, compiler: '13.2', arch: ''    , target: '10.13', deps: small, check: true , ancient: true  }
+          - { host: macos-14, compiler: '16.0', arch: ''     , target: ''     , deps: sys  , check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64  , target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64  , target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64  , target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64  , target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64  , target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: arm64  , target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: '10.15', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: '10.14', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x64_64h, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: ''     , target: ''     , deps: sys  , check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64  , target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64  , target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64  , target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64  , target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64  , target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: arm64  , target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: '10.15', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: '10.14', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64h, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '15.3', arch: x64_64h, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-13, compiler: '15.2', arch: x64_64h, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-12, compiler: '14.2', arch: x64_64h, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-12, compiler: '14.2', arch: x64_64h, target: '10.13', deps: small, check: true , ancient: false }
+          - { host: macos-12, compiler: '13.2', arch: ''     , target: '10.13', deps: local, check: true , ancient: true  }
+          - { host: macos-12, compiler: '13.2', arch: ''     , target: '10.13', deps: small, check: true , ancient: true  }
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}}
       cancel-in-progress: true

3 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 104 105 106 107 108 .. 963 > >> (Page 106 of 963)