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

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 (154)	Sep	Oct	Nov	Dec

Flat | Threaded

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

[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

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

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

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

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

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 16:29:11 2024	(r21395)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 18:07:15 2024	(r21396)
@@ -28,9 +28,7 @@
           - { 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: i386  , target: '10.14', deps: local, check: false, ancient: false }
           - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: i386  , target: '10.13', deps: local, check: false, 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 }
@@ -46,17 +44,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: ''    , 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:

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

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

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

Log:
Merged revision(s) 21394 from trunk/OpenMPT:
[Fix] Work-around broken Apple Clang 13.0 version number.
........

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

Modified: branches/OpenMPT-1.31/soundlib/SampleFormatMP3.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/SampleFormatMP3.cpp	Mon Aug 12 16:28:38 2024	(r21394)
+++ branches/OpenMPT-1.31/soundlib/SampleFormatMP3.cpp	Mon Aug 12 16:29:11 2024	(r21395)
@@ -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)
+#if (MPT_CLANG_AT_LEAST(13,0,0) && !MPT_OS_MACOSX_OR_IOS) || 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)
+#if (MPT_CLANG_AT_LEAST(13,0,0) && !MPT_OS_MACOSX_OR_IOS) || MPT_CLANG_AT_LEAST(13,1,0)
 #pragma clang diagnostic pop
 #endif // MPT_COMPILER_CLANG
 #if MPT_COMPILER_GCC

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

From: <sv...@op...> - 2024-08-12 14:28:51

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

Log:
[Fix] Work-around broken Apple Clang 13.0 version number.

Modified:
   trunk/OpenMPT/soundlib/SampleFormatMP3.cpp

Modified: trunk/OpenMPT/soundlib/SampleFormatMP3.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/SampleFormatMP3.cpp	Mon Aug 12 16:23:28 2024	(r21393)
+++ trunk/OpenMPT/soundlib/SampleFormatMP3.cpp	Mon Aug 12 16:28:38 2024	(r21394)
@@ -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)
+#if (MPT_CLANG_AT_LEAST(13,0,0) && !MPT_OS_MACOSX_OR_IOS) || 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)
+#if (MPT_CLANG_AT_LEAST(13,0,0) && !MPT_OS_MACOSX_OR_IOS) || MPT_CLANG_AT_LEAST(13,1,0)
 #pragma clang diagnostic pop
 #endif // MPT_COMPILER_CLANG
 #if MPT_COMPILER_GCC

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

From: <sv...@op...> - 2024-08-12 14:23:38

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

Log:
[Fix] build: CI: GitHub: macOS: Makefile: Do not specify target 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 15:26:32 2024	(r21392)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 16:23:28 2024	(r21393)
@@ -57,10 +57,8 @@
           - { 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  }
+          - { 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 r21392 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2024-08-12 13:26:44

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

Log:
[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:
   trunk/OpenMPT/.github/workflows/macOS-Autotools.yml
   trunk/OpenMPT/.github/workflows/macOS-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Mon Aug 12 15:25:09 2024	(r21391)
+++ trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Mon Aug 12 15:26:32 2024	(r21392)
@@ -17,6 +17,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: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 15:25:09 2024	(r21391)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 15:26:32 2024	(r21392)
@@ -13,50 +13,54 @@
       fail-fast: false
       matrix:
         include:
-          - { host: macos-14, compiler: '16.0', arch: ''    , target: ''     , deps: sys  , check: true  }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: ''     , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: small, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: ''     , deps: small, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '14'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '14'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '13'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '13'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '12'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '12'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '11'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '11'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.15', deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.14', deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: i386  , target: '10.14', deps: local, check: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.13', deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: i386  , target: '10.13', deps: local, check: false }
-          - { 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: '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: i386  , target: '10.14', deps: local, check: false, ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: i386  , target: '10.13', deps: local, check: false, 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: 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
@@ -79,7 +83,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 r21391 - in trunk/OpenMPT: . build/make

From: <sv...@op...> - 2024-08-12 13:25:21

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

Log:
[Imp] build: Makefile: Add back ANCIENT=1 option to support older compilers with missing command line options.

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

Modified: trunk/OpenMPT/Makefile
==============================================================================
--- trunk/OpenMPT/Makefile	Mon Aug 12 15:06:03 2024	(r21390)
+++ trunk/OpenMPT/Makefile	Mon Aug 12 15:25:09 2024	(r21391)
@@ -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: trunk/OpenMPT/build/make/warnings-clang.mk
==============================================================================
--- trunk/OpenMPT/build/make/warnings-clang.mk	Mon Aug 12 15:06:03 2024	(r21390)
+++ trunk/OpenMPT/build/make/warnings-clang.mk	Mon Aug 12 15:25:09 2024	(r21391)
@@ -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 -Wexit-time-destructors -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 -Wexit-time-destructors -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 r21390 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2024-08-12 13:06:15

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

Log:
[Fix] build: CI: GitHub: macOS: Remove XCode 13.2 again.

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

Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Mon Aug 12 15:02:59 2024	(r21389)
+++ trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Mon Aug 12 15:06:03 2024	(r21390)
@@ -17,7 +17,6 @@
           - { 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

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

From: <sv...@op...> - 2024-08-12 13:03:11

Author: manx
Date: Mon Aug 12 15:02:59 2024
New Revision: 21389
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21389

Log:
Merged revision(s) 21385-21386 from trunk/OpenMPT:
[Fix] build: CI: GitHub: Fix referencing matrix variables in conditions.
........
[Fix] build: CI: GitHub: Work-around GitHub syntax brokenness.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   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 15:00:04 2024	(r21388)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Mon Aug 12 15:02:59 2024	(r21389)
@@ -59,7 +59,7 @@
     - name: setup parallel make
       run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
     - name: make
-      run: make ${{ matrix.arch == '' && '' || join('ARCH=',matrix.arch) }} ${{ matrix.target == '' && '' || join('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 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 ${{ matrix.arch == '' && '' || join('ARCH=',matrix.arch) }} ${{ matrix.target == '' && '' || join('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 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 r21388 - trunk/OpenMPT/build/make

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

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

Log:
Revert r21384 and r21382.
Merged revision(s) 21384, 21382 from trunk/OpenMPT:
[Fix] build: Makefile: Clang: Fix ANCIENT=1.
........
[Imp] build: Makefile: Add back ANCIENT=1 optio to support older compilers with missing command line options.
........

Modified:
   trunk/OpenMPT/build/make/warnings-clang.mk

Modified: trunk/OpenMPT/build/make/warnings-clang.mk
==============================================================================
--- trunk/OpenMPT/build/make/warnings-clang.mk	Mon Aug 12 14:58:58 2024	(r21387)
+++ trunk/OpenMPT/build/make/warnings-clang.mk	Mon Aug 12 15:00:04 2024	(r21388)
@@ -2,13 +2,8 @@
 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 -Wexit-time-destructors -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 += -Wdeprecated -Wexit-time-destructors -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 += -Wfloat-equal
 #CXXFLAGS_WARNINGS += -Wdocumentation
@@ -26,19 +21,12 @@
 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
 
-
-
-
 FASTMATH_STYLE=clang

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

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

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

Log:
[Fix] build: CI: GitHub: macOS: Remove XCode 13.2 again, this is not supportable.

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 14:37:01 2024	(r21386)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 14:58:58 2024	(r21387)
@@ -13,54 +13,50 @@
       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: i386  , target: '10.14', deps: local, check: false, ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
-          - { host: macos-14, compiler: '16.0', arch: i386  , target: '10.13', deps: local, check: false, 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: 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.9' , deps: local, check: true , ancient: true  }
-          - { host: macos-12, compiler: '13.2', arch: i386  , target: '10.9' , deps: local, check: false, ancient: true  }
-          - { host: macos-12, compiler: '13.2', arch: x64_64, target: '10.9' , deps: small, check: true , ancient: true  }
-          - { host: macos-12, compiler: '13.2', arch: i386  , target: '10.9' , deps: small, check: false, ancient: true  }
+          - { host: macos-14, compiler: '16.0', arch: ''    , target: ''     , deps: sys  , check: true  }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: ''     , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: small, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: ''     , deps: small, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '14'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '14'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '13'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '13'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '12'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '12'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '11'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '11'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.15', deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.14', deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: i386  , target: '10.14', deps: local, check: false }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.13', deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: i386  , target: '10.13', deps: local, check: false }
+          - { 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 }
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}}
       cancel-in-progress: true
@@ -83,7 +79,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 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 ${{ 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 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 r21386 - trunk/OpenMPT/.github/workflows

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

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

Log:
[Fix] build: CI: GitHub: Work-around GitHub syntax brokenness.

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 14:09:20 2024	(r21385)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 14:37:01 2024	(r21386)
@@ -83,7 +83,7 @@
     - name: setup parallel make
       run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
     - name: make
-      run: make ${{ matrix.ancient == true && 'ANCIENT=1' || '' }} ${{ matrix.arch == '' && '' || join('ARCH=',${{matrix.arch}}) }} ${{ matrix.target == '' && '' || join('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 ${{ matrix.ancient == true && 'ANCIENT=1' || '' }} ${{ matrix.arch == '' && '' || join('ARCH=',${{matrix.arch}}) }} ${{ matrix.target == '' && '' || join('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 r21385 - trunk/OpenMPT/.github/workflows

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

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

Log:
[Fix] build: CI: GitHub: Fix referencing matrix variables in conditions.

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 14:07:47 2024	(r21384)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 14:09:20 2024	(r21385)
@@ -83,7 +83,7 @@
     - name: setup parallel make
       run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
     - name: make
-      run: make ${{ matrix.ancient == true && 'ANCIENT=1' || '' }} ${{ matrix.arch == '' && '' || join('ARCH=',matrix.arch) }} ${{ matrix.target == '' && '' || join('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' || '' }} ${{ matrix.arch == '' && '' || join('ARCH=',${{matrix.arch}}) }} ${{ matrix.target == '' && '' || join('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 ${{ matrix.ancient == true && 'ANCIENT=1' || '' }} ${{ matrix.arch == '' && '' || join('ARCH=',matrix.arch) }} ${{ matrix.target == '' && '' || join('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' || '' }} ${{ matrix.arch == '' && '' || join('ARCH=',${{matrix.arch}}) }} ${{ matrix.target == '' && '' || join('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 r21384 - trunk/OpenMPT/build/make

From: <sv...@op...> - 2024-08-12 12:07:54

Author: manx
Date: Mon Aug 12 14:07:47 2024
New Revision: 21384
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21384

Log:
[Fix] build: Makefile: Clang: Fix ANCIENT=1.

Modified:
   trunk/OpenMPT/build/make/warnings-clang.mk

Modified: trunk/OpenMPT/build/make/warnings-clang.mk
==============================================================================
--- trunk/OpenMPT/build/make/warnings-clang.mk	Mon Aug 12 12:50:20 2024	(r21383)
+++ trunk/OpenMPT/build/make/warnings-clang.mk	Mon Aug 12 14:07:47 2024	(r21384)
@@ -26,17 +26,18 @@
 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
 
-ifneq ($(ANCIENT),1)
-CFLAGS_SILENT += -Wno-unused-but-set-variable
-endif

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

From: <sv...@op...> - 2024-08-12 10:50:33

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

Log:
[Fix] build: CI: GitHub: macOS: Set ANCIENT=1 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 12:49:53 2024	(r21382)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 12:50:20 2024	(r21383)
@@ -13,54 +13,54 @@
       fail-fast: false
       matrix:
         include:
-          - { host: macos-14, compiler: '16.0', arch: ''    , target: ''     , deps: sys  , check: true  }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: ''     , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: small, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: ''     , deps: small, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '14'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '14'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '13'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '13'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '12'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '12'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '11'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '11'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.15', deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.14', deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: i386  , target: '10.14', deps: local, check: false }
-          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.13', deps: local, check: true  }
-          - { host: macos-14, compiler: '16.0', arch: i386  , target: '10.13', deps: local, check: false }
-          - { 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-12, compiler: '13.2', arch: x64_64, target: '10.9' , deps: local, check: true  }
-          - { host: macos-12, compiler: '13.2', arch: i386  , target: '10.9' , deps: local, check: false }
-          - { host: macos-12, compiler: '13.2', arch: x64_64, target: '10.9' , deps: small, check: true  }
-          - { host: macos-12, compiler: '13.2', arch: i386  , target: '10.9' , deps: small, check: false }
+          - { 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: i386  , target: '10.14', deps: local, check: false, ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16.0', arch: i386  , target: '10.13', deps: local, check: false, 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: 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.9' , deps: local, check: true , ancient: true  }
+          - { host: macos-12, compiler: '13.2', arch: i386  , target: '10.9' , deps: local, check: false, ancient: true  }
+          - { host: macos-12, compiler: '13.2', arch: x64_64, target: '10.9' , deps: small, check: true , ancient: true  }
+          - { host: macos-12, compiler: '13.2', arch: i386  , target: '10.9' , 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
@@ -83,7 +83,7 @@
     - name: setup parallel make
       run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
     - name: make
-      run: make ${{ matrix.arch == '' && '' || join('ARCH=',matrix.arch) }} ${{ matrix.target == '' && '' || join('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' || '' }} ${{ matrix.arch == '' && '' || join('ARCH=',matrix.arch) }} ${{ matrix.target == '' && '' || join('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 ${{ matrix.arch == '' && '' || join('ARCH=',matrix.arch) }} ${{ matrix.target == '' && '' || join('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' || '' }} ${{ matrix.arch == '' && '' || join('ARCH=',matrix.arch) }} ${{ matrix.target == '' && '' || join('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 r21382 - trunk/OpenMPT/build/make

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

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

Log:
[Imp] build: Makefile: Add back ANCIENT=1 optio to support older compilers with missing command line options.

Modified:
   trunk/OpenMPT/build/make/warnings-clang.mk

Modified: trunk/OpenMPT/build/make/warnings-clang.mk
==============================================================================
--- trunk/OpenMPT/build/make/warnings-clang.mk	Mon Aug 12 11:55:14 2024	(r21381)
+++ trunk/OpenMPT/build/make/warnings-clang.mk	Mon Aug 12 12:49:53 2024	(r21382)
@@ -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 -Wexit-time-destructors -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 -Wexit-time-destructors -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
@@ -29,4 +34,10 @@
 CFLAGS_SILENT += -Wno-unused-parameter
 CFLAGS_SILENT += -Wno-unused-variable
 
+ifneq ($(ANCIENT),1)
+CFLAGS_SILENT += -Wno-unused-but-set-variable
+endif
+
+
+
 FASTMATH_STYLE=clang

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

From: <sv...@op...> - 2024-08-12 09:55:27

Author: manx
Date: Mon Aug 12 11:55:14 2024
New Revision: 21381
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21381

Log:
[Imp] build: CI: GitHub: macOS: Add builders targeting macOS 10.9 with XCode 13.2 on macOS 12.

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

Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Sun Aug 11 19:51:21 2024	(r21380)
+++ trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Mon Aug 12 11:55:14 2024	(r21381)
@@ -17,6 +17,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: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Sun Aug 11 19:51:21 2024	(r21380)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Mon Aug 12 11:55:14 2024	(r21381)
@@ -57,6 +57,10 @@
           - { 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-12, compiler: '13.2', arch: x64_64, target: '10.9' , deps: local, check: true  }
+          - { host: macos-12, compiler: '13.2', arch: i386  , target: '10.9' , deps: local, check: false }
+          - { host: macos-12, compiler: '13.2', arch: x64_64, target: '10.9' , deps: small, check: true  }
+          - { host: macos-12, compiler: '13.2', arch: i386  , target: '10.9' , deps: small, check: false }
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}}
       cancel-in-progress: true

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

From: <sv...@op...> - 2024-08-11 17:51:33

Author: sagamusix
Date: Sun Aug 11 19:51:21 2024
New Revision: 21380
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21380

Log:
[Ref] Remove CSoundFile::SetModSpecsPointer.

Modified:
   trunk/OpenMPT/soundlib/Sndfile.cpp
   trunk/OpenMPT/soundlib/Sndfile.h

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	Sun Aug 11 09:38:54 2024	(r21379)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	Sun Aug 11 19:51:21 2024	(r21380)
@@ -183,7 +183,7 @@
 		// This is such an odd behaviour that it's unlikely that any of the other formats will need it by default. Re-enable as needed.
 		m_playBehaviour.reset(kITInitialNoteMemory);
 	}
-	SetModSpecsPointer(m_pModSpecs, bestType);
+	m_pModSpecs = &GetModSpecifications(bestType);
 
 	// Delete instruments in case some previously called loader already created them.
 	for(INSTRUMENTINDEX i = 1; i <= m_nInstruments; i++)
@@ -709,7 +709,7 @@
 		return false;
 	}
 
-	SetModSpecsPointer(m_pModSpecs, GetBestSaveFormat());
+	m_pModSpecs = &GetModSpecifications(GetBestSaveFormat());
 
 	// When reading a file made with an older version of MPT, it might be necessary to upgrade some settings automatically.
 	if(m_dwLastSavedWithVersion)
@@ -1660,29 +1660,29 @@
 #endif // MODPLUG_TRACKER
 
 
-void CSoundFile::SetModSpecsPointer(const CModSpecifications*& pModSpecs, const MODTYPE type)
+const CModSpecifications &CSoundFile::GetModSpecifications(const MODTYPE type)
 {
 	switch(type)
 	{
 		case MOD_TYPE_MPT:
-			pModSpecs = &ModSpecs::mptm;
+			return ModSpecs::mptm;
 		break;
 
 		case MOD_TYPE_IT:
-			pModSpecs = &ModSpecs::itEx;
+			return ModSpecs::itEx;
 		break;
 
 		case MOD_TYPE_XM:
-			pModSpecs = &ModSpecs::xmEx;
+			return ModSpecs::xmEx;
 		break;
 
 		case MOD_TYPE_S3M:
-			pModSpecs = &ModSpecs::s3mEx;
+			return ModSpecs::s3mEx;
 		break;
 
 		case MOD_TYPE_MOD:
 		default:
-			pModSpecs = &ModSpecs::mod;
+			return ModSpecs::mod;
 			break;
 	}
 }
@@ -1692,7 +1692,7 @@
 {
 	m_nType = type;
 	m_playBehaviour = GetDefaultPlaybackBehaviour(GetBestSaveFormat());
-	SetModSpecsPointer(m_pModSpecs, GetBestSaveFormat());
+	m_pModSpecs = &GetModSpecifications(GetBestSaveFormat());
 }
 
 
@@ -1702,7 +1702,7 @@
 {
 	const MODTYPE oldType = GetType();
 	m_nType = newType;
-	SetModSpecsPointer(m_pModSpecs, m_nType);
+	m_pModSpecs = &GetModSpecifications(m_nType);
 
 	if(oldType == newType || !adjust)
 		return;
@@ -1901,14 +1901,6 @@
 }
 
 
-const CModSpecifications& CSoundFile::GetModSpecifications(const MODTYPE type)
-{
-	const CModSpecifications* p = nullptr;
-	SetModSpecsPointer(p, type);
-	return *p;
-}
-
-
 ChannelFlags CSoundFile::GetChannelMuteFlag()
 {
 #ifdef MODPLUG_TRACKER

Modified: trunk/OpenMPT/soundlib/Sndfile.h
==============================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h	Sun Aug 11 09:38:54 2024	(r21379)
+++ trunk/OpenMPT/soundlib/Sndfile.h	Sun Aug 11 19:51:21 2024	(r21380)
@@ -443,9 +443,6 @@
 private:
 	CTuningCollection* m_pTuningsTuneSpecific = nullptr;
 
-private: //Misc private methods.
-	static void SetModSpecsPointer(const CModSpecifications* &pModSpecs, const MODTYPE type);
-
 private: //Misc data
 	const CModSpecifications *m_pModSpecs;

[OMPT-svn-commit] OpenMPT r21379 - in trunk/OpenMPT: mptrack soundlib test

From: <sv...@op...> - 2024-08-11 07:39:07

Author: manx
Date: Sun Aug 11 09:38:54 2024
New Revision: 21379
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21379

Log:
[Ref] Playback Test: Factor out PlaybackTestSettings.

Modified:
   trunk/OpenMPT/mptrack/MainFrm.cpp
   trunk/OpenMPT/soundlib/Sndfile.h
   trunk/OpenMPT/test/PlaybackTest.cpp
   trunk/OpenMPT/test/PlaybackTest.h

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	Sat Aug 10 08:41:08 2024	(r21378)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	Sun Aug 11 09:38:54 2024	(r21379)
@@ -3265,7 +3265,7 @@
 			continue;
 		if(!sndFile->Create(GetFileReader(f)))
 			continue;
-		auto playTest = sndFile->CreatePlaybackTest();
+		auto playTest = sndFile->CreatePlaybackTest(PlaybackTestSettings{});
 		mpt::ofstream outFile(fileName + P_(".testdata.gz"), std::ios::binary | std::ios::trunc);
 		if(outFile)
 			playTest.Serialize(outFile, fileName.GetFilename().ToUnicode() + U_(".testdata"));
@@ -3303,7 +3303,7 @@
 			auto sndFile = std::make_unique<CSoundFile>();
 			sndFile->Create(GetFileReader(modFile));
 
-			const auto result = playTest.Compare(*sndFile);
+			const auto result = PlaybackTest::Compare(playTest, sndFile->CreatePlaybackTest(playTest.GetSettings()));
 			if(!result.empty())
 			{
 				InfoDialog infoDlg{this};

Modified: trunk/OpenMPT/soundlib/Sndfile.h
==============================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h	Sat Aug 10 08:41:08 2024	(r21378)
+++ trunk/OpenMPT/soundlib/Sndfile.h	Sun Aug 11 09:38:54 2024	(r21379)
@@ -376,6 +376,30 @@
 using NoteName = mpt::uchar[4];
 
 
+struct PlaybackTestSettings
+{
+	uint32 mixingFreq = 48000;
+	uint32 outputChannels = 2;
+	uint32 mixerChannels = MAX_CHANNELS;
+	ResamplingMode srcMode = SRCMODE_CUBIC;
+	void Sanitize()
+	{
+		if(mixingFreq < 1000)
+		{
+			mixingFreq = 48000;
+		}
+		if(outputChannels != 1 && outputChannels != 2 && outputChannels != 4)
+		{
+			outputChannels = 2;
+		}
+		if(mixerChannels < 1)
+		{
+			mixerChannels = MAX_CHANNELS;
+		}
+	}
+};
+
+
 class CSoundFile
 {
 	friend class GetLengthMemory;
@@ -1244,7 +1268,7 @@
 public:
 	PLUGINDEX GetBestPlugin(const PlayState &playState, CHANNELINDEX nChn, PluginPriority priority, PluginMutePriority respectMutes) const;
 
-	PlaybackTest CreatePlaybackTest(uint32 mixingFreq = 0, uint32 outputChannels = 0, uint32 mixerChannels = 0, ResamplingMode srcMode = SRCMODE_CUBIC);
+	PlaybackTest CreatePlaybackTest(PlaybackTestSettings settings);
 };
 
 

Modified: trunk/OpenMPT/test/PlaybackTest.cpp
==============================================================================
--- trunk/OpenMPT/test/PlaybackTest.cpp	Sat Aug 10 08:41:08 2024	(r21378)
+++ trunk/OpenMPT/test/PlaybackTest.cpp	Sun Aug 11 09:38:54 2024	(r21379)
@@ -121,6 +121,16 @@
 	TestDataHeader header;
 	std::vector<SampleDataHash> sampleDataHashes;
 	std::vector<Row> rows;
+
+	PlaybackTestSettings GetSettings() const
+	{
+		PlaybackTestSettings result;
+		result.mixingFreq = header.mixingFreq;
+		result.outputChannels = header.outputChannels;
+		result.mixerChannels = header.mixerChannels;
+		result.srcMode = Resampling::ToKnownMode(header.srcMode);
+		return result;
+	}
 };
 
 
@@ -469,6 +479,13 @@
 }
 
 
+PlaybackTestSettings PlaybackTest::GetSettings() const noexcept
+{
+	return m_testData->GetSettings();
+}
+
+
+
 static bool FuzzyEquals(const double left, const double right, const double epsilon) noexcept
 {
 	return std::abs(left - right) <= std::min(std::abs(left), std::abs(right)) * epsilon;
@@ -484,9 +501,9 @@
 	errors.push_back(mpt::ToUnicode(mpt::Charset::UTF8, MPT_AFORMAT("{} differs in test row {} (order {}, row {}, tick {}), channel {}: {} vs {}") \
 		(propName, row, lRow.header.order, lRow.header.row, lTick, chn, left, right)));
 
-std::vector<mpt::ustring> PlaybackTest::Compare(CSoundFile &sndFile) const
+std::vector<mpt::ustring> PlaybackTest::Compare(const PlaybackTest &lhs, const PlaybackTest &rhs)
 {
-	return Compare(sndFile.CreatePlaybackTest(m_testData->header.mixingFreq, m_testData->header.outputChannels, m_testData->header.mixerChannels, Resampling::ToKnownMode(m_testData->header.srcMode)));
+	return lhs.Compare(rhs);
 }
 
 std::vector<mpt::ustring> PlaybackTest::Compare(const PlaybackTest &otherTest) const
@@ -605,26 +622,21 @@
 }
 
 
-PlaybackTest CSoundFile::CreatePlaybackTest(uint32 mixingFreq, uint32 outputChannels, uint32 mixerChannels, ResamplingMode srcMode)
+PlaybackTest CSoundFile::CreatePlaybackTest(PlaybackTestSettings settings)
 {
-	PlaybackTestData testData{};
+	settings.Sanitize();
 
-	if(mixingFreq < 1000)
-		mixingFreq = 48000;
-	if(outputChannels != 1 && outputChannels != 2 && outputChannels != 4)
-		outputChannels = 2;
-	if(mixerChannels < 1)
-		mixerChannels = MAX_CHANNELS;
+	PlaybackTestData testData{};
 
 	m_bIsRendering = true;
 	const auto origResamplerSettings = m_Resampler.m_Settings;
-	m_Resampler.m_Settings.SrcMode = srcMode;
+	m_Resampler.m_Settings.SrcMode = settings.srcMode;
 	m_Resampler.m_Settings.emulateAmiga = m_SongFlags[SONG_ISAMIGA] ? Resampling::AmigaFilter::A1200 : Resampling::AmigaFilter::Off;
 	const auto origMixerSettings = m_MixerSettings;
 	MixerSettings testSettings;
-	testSettings.gdwMixingFreq = mixingFreq;
-	testSettings.gnChannels = outputChannels;
-	testSettings.m_nMaxMixChannels = mixerChannels;
+	testSettings.gdwMixingFreq = settings.mixingFreq;
+	testSettings.gnChannels = settings.outputChannels;
+	testSettings.m_nMaxMixChannels = settings.mixerChannels;
 	testSettings.VolumeRampUpMicroseconds = 0;
 	testSettings.VolumeRampDownMicroseconds = 0;
 	SetMixerSettings(testSettings);
@@ -649,7 +661,7 @@
 	header.isAmiga = m_SongFlags[SONG_ISAMIGA] ? 1 : 0;
 	header.positionPrecisionBits = static_cast<uint8>(mpt::bit_width(static_cast<typename std::make_unsigned<SamplePosition::value_t>::type>(SamplePosition{1, 0}.GetRaw())) - 1);
 	header.filterPrecisionBits = MIXING_FILTER_PRECISION;
-	header.srcMode = srcMode;
+	header.srcMode = m_Resampler.m_Settings.SrcMode;
 	header.outputChannels = static_cast<uint8>(m_MixerSettings.gnChannels);
 	header.mixerChannels = static_cast<uint16>(m_MixerSettings.m_nMaxMixChannels);
 	header.synthVolume = static_cast<uint16>(m_nVSTiVolume);

Modified: trunk/OpenMPT/test/PlaybackTest.h
==============================================================================
--- trunk/OpenMPT/test/PlaybackTest.h	Sat Aug 10 08:41:08 2024	(r21378)
+++ trunk/OpenMPT/test/PlaybackTest.h	Sun Aug 11 09:38:54 2024	(r21379)
@@ -18,6 +18,7 @@
 OPENMPT_NAMESPACE_BEGIN
 
 struct PlaybackTestData;
+struct PlaybackTestSettings;
 class CSoundFile;
 
 class PlaybackTest
@@ -36,7 +37,11 @@
 	void Serialize(std::ostream &output, const mpt::ustring &filename) const noexcept(false);
 	void ToTSV(std::ostream &output) const noexcept(false);
 
-	std::vector<mpt::ustring> Compare(CSoundFile &sndFile) const;
+	PlaybackTestSettings GetSettings() const noexcept;
+
+	static std::vector<mpt::ustring> Compare(const PlaybackTest &lhs, const PlaybackTest &rhs);
+
+private:
 	std::vector<mpt::ustring> Compare(const PlaybackTest &otherTest) const;
 
 private:

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

From: <sv...@op...> - 2024-08-10 06:41:15

Author: manx
Date: Sat Aug 10 08:41:08 2024
New Revision: 21378
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21378

Log:
Merged revision(s) 21377 from trunk/OpenMPT:
[Ref] Silence GCC -Wconversion warnings.
........

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

Modified: branches/OpenMPT-1.31/soundlib/Load_med.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_med.cpp	Sat Aug 10 08:38:59 2024	(r21377)
+++ branches/OpenMPT-1.31/soundlib/Load_med.cpp	Sat Aug 10 08:41:08 2024	(r21378)
@@ -1467,7 +1467,7 @@
 			}
 			Patterns[pat].WriteEffect(EffectWriter(CMD_POSITIONJUMP, mpt::saturate_cast<ModCommand::PARAM>(to)).Row(Patterns[pat].GetNumRows() - 1).RetryPreviousRow());
 			if(pat >= basePattern && (pat - basePattern) >= numPatterns)
-				numPatterns = pat - basePattern + 1;
+				numPatterns = static_cast<PATTERNINDEX>(pat - basePattern + 1);
 		}
 
 		if(numSongs > 1)
@@ -1481,7 +1481,7 @@
 					Patterns[firstPat].WriteEffect(EffectWriter(CMD_PANNING8, mpt::saturate_cast<ModCommand::PARAM>(ChnSettings[chn].nPan)).Channel(chn).RetryNextRow());
 				}
 				if(firstPat >= basePattern && (firstPat - basePattern) >= numPatterns)
-					numPatterns = firstPat - basePattern + 1;
+					numPatterns = static_cast<PATTERNINDEX>(firstPat - basePattern + 1);
 			}
 		}

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

From: <sv...@op...> - 2024-08-10 06:39:13

Author: manx
Date: Sat Aug 10 08:38:59 2024
New Revision: 21377
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21377

Log:
[Ref] Silence GCC -Wconversion warnings.

Modified:
   trunk/OpenMPT/soundlib/Load_med.cpp

Modified: trunk/OpenMPT/soundlib/Load_med.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_med.cpp	Fri Aug  9 20:11:24 2024	(r21376)
+++ trunk/OpenMPT/soundlib/Load_med.cpp	Sat Aug 10 08:38:59 2024	(r21377)
@@ -1652,7 +1652,7 @@
 			}
 			Patterns[pat].WriteEffect(EffectWriter(CMD_POSITIONJUMP, mpt::saturate_cast<ModCommand::PARAM>(to)).Row(Patterns[pat].GetNumRows() - 1).RetryPreviousRow());
 			if(pat >= basePattern && (pat - basePattern) >= numPatterns)
-				numPatterns = pat - basePattern + 1;
+				numPatterns = static_cast<PATTERNINDEX>(pat - basePattern + 1);
 		}
 
 		if(numSongs > 1)
@@ -1666,7 +1666,7 @@
 					Patterns[firstPat].WriteEffect(EffectWriter(CMD_PANNING8, mpt::saturate_cast<ModCommand::PARAM>(ChnSettings[chn].nPan)).Channel(chn).RetryNextRow());
 				}
 				if(firstPat >= basePattern && (firstPat - basePattern) >= numPatterns)
-					numPatterns = firstPat - basePattern + 1;
+					numPatterns = static_cast<PATTERNINDEX>(firstPat - basePattern + 1);
 			}
 		}

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

From: <sv...@op...> - 2024-08-09 18:11:35

Author: sagamusix
Date: Fri Aug  9 20:11:24 2024
New Revision: 21376
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21376

Log:
Merged revision(s) 21375 from trunk/OpenMPT:
[Fix] MED: For MOD-style vibrato, a speed parameter of 0 was not treated as effect memory, and the speed "fixup" was incorrect anyway. For both vibrato types, the speed is now correct (position incremented on every tick). Fixes Untitled6.med by Apollon (https://www.un4seen.com/forum/?topic=15448.msg143464#msg143464).
........

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

Modified: branches/OpenMPT-1.31/soundlib/Load_med.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_med.cpp	Fri Aug  9 20:10:02 2024	(r21375)
+++ branches/OpenMPT-1.31/soundlib/Load_med.cpp	Fri Aug  9 20:11:24 2024	(r21376)
@@ -411,7 +411,7 @@
 	switch(command)
 	{
 	case 0x04:  // Vibrato (twice as deep as in ProTracker)
-		m.SetEffectCommand(CMD_VIBRATO, (std::min<uint8>(param >> 3, 0x0F) << 4) | std::min<uint8>((param & 0x0F) * 2, 0x0F));
+		m.SetEffectCommand(CMD_VIBRATO, (param & 0xF0) | std::min<uint8>((param & 0x0F) * 2, 0x0F));
 		break;
 	case 0x08:  // Hold and decay
 		break;
@@ -491,7 +491,7 @@
 		m.SetEffectCommand(CMD_MODCMDEX, 0x20 | nibbleLo);
 		break;
 	case 0x14:  // Vibrato (ProTracker compatible depth, but faster)
-		m.SetEffectCommand(CMD_VIBRATO, (std::min<uint8>((param >> 4) + 1, 0x0F) << 4) | (param & 0x0F));
+		m.SetEffectCommand(CMD_VIBRATO, param);
 		break;
 	case 0x15:  // Set finetune
 		m.SetEffectCommand(CMD_MODCMDEX, 0x50 | (param & 0x0F));

Modified: branches/OpenMPT-1.31/soundlib/Sndmix.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Sndmix.cpp	Fri Aug  9 20:10:02 2024	(r21375)
+++ branches/OpenMPT-1.31/soundlib/Sndmix.cpp	Fri Aug  9 20:11:24 2024	(r21376)
@@ -1643,7 +1643,7 @@
 
 	if(chn.dwFlags[CHN_VIBRATO])
 	{
-		const bool advancePosition = !m_SongFlags[SONG_FIRSTTICK] || ((GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT)) && !(m_SongFlags[SONG_ITOLDEFFECTS]));
+		const bool advancePosition = !m_SongFlags[SONG_FIRSTTICK] || ((GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT | MOD_TYPE_MED)) && !(m_SongFlags[SONG_ITOLDEFFECTS]));
 
 		if(GetType() == MOD_TYPE_669)
 		{

[OMPT-svn-commit] OpenMPT r21375 - svn:log

From: <sv...@op...> - 2024-08-09 18:10:48

Author: sagamusix
Revision: 21375
Property Name: svn:log
Action: modified

Property diff:
--- old property value
+++ new property value
@@ -1 +1 @@
-[Fix] MED: For MOD-style vibrato, a speed parameter of 0 was not treated as effect memory, and the speed "fixup" was incorrect anyway. For both vibrato types, the speed is now correct (position incremented on every tick).
\ No newline at end of file
+[Fix] MED: For MOD-style vibrato, a speed parameter of 0 was not treated as effect memory, and the speed "fixup" was incorrect anyway. For both vibrato types, the speed is now correct (position incremented on every tick). Fixes Untitled6.med by Apollon (https://www.un4seen.com/forum/?topic=15448.msg143464#msg143464).
\ No newline at end of file

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

From: <sv...@op...> - 2024-08-09 18:10:14

Author: sagamusix
Date: Fri Aug  9 20:10:02 2024
New Revision: 21375
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21375

Log:
[Fix] MED: For MOD-style vibrato, a speed parameter of 0 was not treated as effect memory, and the speed "fixup" was incorrect anyway. For both vibrato types, the speed is now correct (position incremented on every tick).

Modified:
   trunk/OpenMPT/soundlib/Load_med.cpp
   trunk/OpenMPT/soundlib/Sndmix.cpp

Modified: trunk/OpenMPT/soundlib/Load_med.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_med.cpp	Fri Aug  9 19:39:56 2024	(r21374)
+++ trunk/OpenMPT/soundlib/Load_med.cpp	Fri Aug  9 20:10:02 2024	(r21375)
@@ -434,7 +434,7 @@
 	switch(command)
 	{
 	case 0x04:  // Vibrato (twice as deep as in ProTracker)
-		m.SetEffectCommand(CMD_VIBRATO, (std::min<uint8>(param >> 3, 0x0F) << 4) | std::min<uint8>((param & 0x0F) * 2, 0x0F));
+		m.SetEffectCommand(CMD_VIBRATO, (param & 0xF0) | std::min<uint8>((param & 0x0F) * 2, 0x0F));
 		break;
 	case 0x08:  // Hold and decay
 		break;
@@ -514,7 +514,7 @@
 		m.SetEffectCommand(CMD_MODCMDEX, 0x20 | nibbleLo);
 		break;
 	case 0x14:  // Vibrato (ProTracker compatible depth, but faster)
-		m.SetEffectCommand(CMD_VIBRATO, (std::min<uint8>((param >> 4) + 1, 0x0F) << 4) | (param & 0x0F));
+		m.SetEffectCommand(CMD_VIBRATO, param);
 		break;
 	case 0x15:  // Set finetune
 		m.SetEffectCommand(CMD_MODCMDEX, 0x50 | (param & 0x0F));

Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp	Fri Aug  9 19:39:56 2024	(r21374)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp	Fri Aug  9 20:10:02 2024	(r21375)
@@ -1646,7 +1646,7 @@
 
 	if(chn.dwFlags[CHN_VIBRATO])
 	{
-		const bool advancePosition = !m_PlayState.m_flags[SONG_FIRSTTICK] || ((GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT)) && !(m_SongFlags[SONG_ITOLDEFFECTS]));
+		const bool advancePosition = !m_PlayState.m_flags[SONG_FIRSTTICK] || ((GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT | MOD_TYPE_MED)) && !(m_SongFlags[SONG_ITOLDEFFECTS]));
 
 		if(GetType() == MOD_TYPE_669)
 		{

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

Flat | Threaded

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