modplug-svn-commit — OpenMPT subversion commit notifications

[OMPT-svn-commit] OpenMPT r20284 - in branches/OpenMPT-1.29: . .github/workflows

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 13:49:46 2024
New Revision: 20284
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20284

Log:
Merged revision(s) 20273 from trunk/OpenMPT:
[Imp] build: CI: GitHub: CPA: FreeBSD:Update FreeBSD 13 to 13.3.
........

Added:
   branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.3-Makefile.yml
      - copied, changed from r20283, branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.2-Makefile.yml
Deleted:
   branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.2-Makefile.yml
Modified:
   branches/OpenMPT-1.29/   (props changed)

Copied and modified: branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.3-Makefile.yml (from r20283, branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.2-Makefile.yml)
==============================================================================
--- branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.2-Makefile.yml	Fri Mar  8 13:49:21 2024	(r20283, copy source)
+++ branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.3-Makefile.yml	Fri Mar  8 13:49:46 2024	(r20284)
@@ -1,4 +1,4 @@
-name: FreeBSD 13.2 Makefile
+name: FreeBSD 13.3 Makefile
 
 on:
   push:
@@ -17,64 +17,64 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: runner-to-vm
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
     - name: Test
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: true

[OMPT-svn-commit] OpenMPT r20283 - in branches/OpenMPT-1.30: . .github/workflows

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 13:49:21 2024
New Revision: 20283
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20283

Log:
Merged revision(s) 20273 from trunk/OpenMPT:
[Imp] build: CI: GitHub: CPA: FreeBSD:Update FreeBSD 13 to 13.3.
........

Added:
   branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.3-Makefile.yml
      - copied, changed from r20282, branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.2-Makefile.yml
Deleted:
   branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.2-Makefile.yml
Modified:
   branches/OpenMPT-1.30/   (props changed)

Copied and modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.3-Makefile.yml (from r20282, branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.2-Makefile.yml)
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.2-Makefile.yml	Fri Mar  8 13:48:39 2024	(r20282, copy source)
+++ branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.3-Makefile.yml	Fri Mar  8 13:49:21 2024	(r20283)
@@ -1,4 +1,4 @@
-name: FreeBSD 13.2 Makefile
+name: FreeBSD 13.3 Makefile
 
 on:
   push:
@@ -17,64 +17,64 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: runner-to-vm
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
     - name: Test
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: true

[OMPT-svn-commit] OpenMPT r20282 - branches/OpenMPT-1.31

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 13:48:39 2024
New Revision: 20282
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20282

Log:
Merged revision(s) 20277 from trunk/OpenMPT:
[Imp] build: CI: GitHub: CPA: OpenBSD: Add full matrix build with system/local/small dependencies.
[Imp] build: CI: GitHub: CPA: NetBSD: Add full matrix build with system/local/small dependencies.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)

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

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 13:48:11 2024
New Revision: 20281
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20281

Log:
Merged revision(s) 20277 from trunk/OpenMPT:
[Imp] build: CI: GitHub: CPA: OpenBSD: Add full matrix build with system/local/small dependencies.
[Imp] build: CI: GitHub: CPA: NetBSD: Add full matrix build with system/local/small dependencies.
........

Added:
   branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml
      - copied, changed from r20280, branches/OpenMPT-1.31/.github/workflows/NetBSD-9.3-Makefile.yml
   branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml
      - copied, changed from r20280, branches/OpenMPT-1.31/.github/workflows/OpenBSD-7.4-Makefile.yml
Deleted:
   branches/OpenMPT-1.31/.github/workflows/NetBSD-9.3-Makefile.yml
   branches/OpenMPT-1.31/.github/workflows/OpenBSD-7.4-Makefile.yml

Copied and modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml (from r20280, branches/OpenMPT-1.31/.github/workflows/NetBSD-9.3-Makefile.yml)
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/NetBSD-9.3-Makefile.yml	Fri Mar  8 13:47:12 2024	(r20280, copy source)
+++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml	Fri Mar  8 13:48:11 2024	(r20281)
@@ -1,16 +1,23 @@
-name: NetBSD 9.3 Makefile
+name: NetBSD Makefile
 
 on:
   push:
     branches: [ OpenMPT-1.31 ]
 
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
 jobs:
   build:
 
+    strategy:
+      matrix:
+        include:
+          - { version: 9.3, deps: sys   }
+          - { version: 9.3, deps: local }
+          - { version: 9.3, deps: small }
+
+    concurrency:
+      group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
+      cancel-in-progress: true
+
     runs-on: ubuntu-22.04
 
     steps:
@@ -23,7 +30,7 @@
         hypervisor: qemu
         memory: 4G
         operating_system: netbsd
-        version: '9.3'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: runner-to-vm
         shutdown_vm: false
@@ -35,7 +42,7 @@
         hypervisor: qemu
         memory: 4G
         operating_system: netbsd
-        version: '9.3'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
@@ -54,12 +61,12 @@
         hypervisor: qemu
         memory: 4G
         operating_system: netbsd
-        version: '9.3'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j4 STRICT=1 VERBOSE=1 AUTO_DEPS=1
+          gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
       uses: cross-platform-actions/action@v0.23.0
       with:
@@ -67,12 +74,12 @@
         hypervisor: qemu
         memory: 4G
         operating_system: netbsd
-        version: '9.3'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j4 STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
+          gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
       uses: cross-platform-actions/action@v0.23.0
       with:
@@ -80,7 +87,7 @@
         hypervisor: qemu
         memory: 4G
         operating_system: netbsd
-        version: '9.3'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: true

Copied and modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml (from r20280, branches/OpenMPT-1.31/.github/workflows/OpenBSD-7.4-Makefile.yml)
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/OpenBSD-7.4-Makefile.yml	Fri Mar  8 13:47:12 2024	(r20280, copy source)
+++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml	Fri Mar  8 13:48:11 2024	(r20281)
@@ -1,16 +1,23 @@
-name: OpenBSD 7.4 Makefile
+name: OpenBSD Makefile
 
 on:
   push:
     branches: [ OpenMPT-1.31 ]
 
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
 jobs:
   build:
 
+    strategy:
+      matrix:
+        include:
+          - { version: 7.4, deps: sys   }
+          - { version: 7.4, deps: local }
+          - { version: 7.4, deps: small }
+
+    concurrency:
+      group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
+      cancel-in-progress: true
+
     runs-on: ubuntu-22.04
 
     steps:
@@ -23,7 +30,7 @@
         hypervisor: qemu
         memory: 4G
         operating_system: openbsd
-        version: '7.4'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: runner-to-vm
         shutdown_vm: false
@@ -35,7 +42,7 @@
         hypervisor: qemu
         memory: 4G
         operating_system: openbsd
-        version: '7.4'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
@@ -48,12 +55,12 @@
         hypervisor: qemu
         memory: 4G
         operating_system: openbsd
-        version: '7.4'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
       uses: cross-platform-actions/action@v0.23.0
       with:
@@ -61,12 +68,12 @@
         hypervisor: qemu
         memory: 4G
         operating_system: openbsd
-        version: '7.4'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
       uses: cross-platform-actions/action@v0.23.0
       with:
@@ -74,7 +81,7 @@
         hypervisor: qemu
         memory: 4G
         operating_system: openbsd
-        version: '7.4'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: true

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

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 13:47:12 2024
New Revision: 20280
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20280

Log:
Merged revision(s) 20271-20272, 20274-20276 from trunk/OpenMPT:
[Imp] build: CI: GitHub: CPA: FreeBSD: Add full matrix build with system/local/small dependencies.
........
[Ref] build: CI: GitHub: CPA: FreeBSD: Proper filename
........
[Fix] build: CI: GitHub: CPA: FreeBSD: Hardcode CPA version in matrix build.
........
[Imp] build: CI: GitHub: CPA: FreeBSD:Update FreeBSD 13 to 13.3.
........
[Ref] build: CI: GitHub: CPA: FreeBSD: Delete non-matrix builds.
........

Added:
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml
      - copied, changed from r20272, trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml
Deleted:
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-13.3-Makefile.yml
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-14.0-Makefile.yml
Modified:
   branches/OpenMPT-1.31/   (props changed)

Copied and modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml (from r20272, trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml)
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml	Fri Mar  8 12:55:40 2024	(r20272, copy source)
+++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml	Fri Mar  8 13:47:12 2024	(r20280)
@@ -2,9 +2,7 @@
 
 on:
   push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+    branches: [ OpenMPT-1.31 ]
 
 jobs:
   build:
@@ -12,12 +10,12 @@
     strategy:
       matrix:
         include:
-          - { version: 14.0, deps: sys  , cpa: v0.23.0 }
-          - { version: 14.0, deps: local, cpa: v0.23.0 }
-          - { version: 14.0, deps: small, cpa: v0.23.0 }
-          - { version: 13.2, deps: sys  , cpa: v0.23.0 }
-          - { version: 13.2, deps: local, cpa: v0.23.0 }
-          - { version: 13.2, deps: small, cpa: v0.23.0 }
+          - { version: 14.0, deps: sys   }
+          - { version: 14.0, deps: local }
+          - { version: 14.0, deps: small }
+          - { version: 13.3, deps: sys   }
+          - { version: 13.3, deps: local }
+          - { version: 13.3, deps: small }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
@@ -29,7 +27,7 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@${{matrix.cpa}}
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -41,7 +39,7 @@
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@${{matrix.cpa}}
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -54,7 +52,7 @@
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
-      uses: cross-platform-actions/action@${{matrix.cpa}}
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -67,7 +65,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
-      uses: cross-platform-actions/action@${{matrix.cpa}}
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -80,7 +78,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
-      uses: cross-platform-actions/action@${{matrix.cpa}}
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu

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

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 13:45:11 2024
New Revision: 20279
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20279

Log:
Merged revision(s) 20256, 20260-20261, 20270 from trunk/OpenMPT:
[New] build: CI: GitHub: Add macOS 14 runner.
........
[Imp] build: CI: GitHub: macOS: Use a big matrix build with explicit host system, Xcode version, architecture, and deployment target.
........
[Fix] build: Makefile: macOS: Fix typo.
........
[Imp] build: CI: GitHub: macOS: Add builds with small dependencies.
........

Added:
   branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
      - copied, changed from r20261, trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
Deleted:
   branches/OpenMPT-1.31/.github/workflows/macOS-12-Makefile.yml
   branches/OpenMPT-1.31/.github/workflows/macOS-13-Makefile.yml
Modified:
   branches/OpenMPT-1.31/   (props changed)

Copied and modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml (from r20261, trunk/OpenMPT/.github/workflows/macOS-Makefile.yml)
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Thu Mar  7 09:44:47 2024	(r20261, copy source)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Fri Mar  8 13:45:11 2024	(r20279)
@@ -3,37 +3,39 @@
 
 on:
   push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+    branches: [ OpenMPT-1.31 ]
 
 jobs:
   build:
     strategy:
       matrix:
         include:
-          - { host: macos-14, compiler: 15.2, arch: ''    , target: ''   , deps: true,  check: true  }
-          - { host: macos-14, compiler: 15.2, arch: arm64 , target: ''   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: ''   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 14   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 14   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 13   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 13   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 12   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 12   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 11   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 11   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.15, deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.14, deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: i386  , target: 10.14, deps: false, check: false }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.13, deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: i386  , target: 10.13, deps: false, check: false }
-          - { host: macos-13, compiler: 15.2, arch: x64_64, target: 10.13, deps: false, check: true  }
-          - { host: macos-13, compiler: 15.2, arch: i386  , target: 10.13, deps: false, check: false }
-          - { host: macos-12, compiler: 14.2, arch: x64_64, target: 10.13, deps: false, check: true  }
-          - { host: macos-12, compiler: 14.2, arch: i386  , target: 10.13, deps: false, check: false }
+          - { host: macos-14, compiler: 15.2, arch: ''    , target: ''   , deps: sys,  check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: ''   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: ''   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: ''   , deps: small, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: ''   , deps: small, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 14   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 14   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 13   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 13   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 12   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 12   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 11   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 11   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.15, deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.14, deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: i386  , target: 10.14, deps: local, check: false }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.13, deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, 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}}
+      group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}}
       cancel-in-progress: true
     runs-on: ${{matrix.host}}
     steps:
@@ -51,7 +53,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 && 'FORCE_DEPS=1' || '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' }}
+      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' }}
     - 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 && 'FORCE_DEPS=1' || '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' }} 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

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

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 13:42:08 2024
New Revision: 20278
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20278

Log:
Merged revision(s) 20273 from trunk/OpenMPT:
[Imp] build: CI: GitHub: CPA: FreeBSD:Update FreeBSD 13 to 13.3.
........

Added:
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-13.3-Makefile.yml
      - copied, changed from r20277, branches/OpenMPT-1.31/.github/workflows/FreeBSD-13.2-Makefile.yml
Deleted:
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-13.2-Makefile.yml
Modified:
   branches/OpenMPT-1.31/   (props changed)

Copied and modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-13.3-Makefile.yml (from r20277, branches/OpenMPT-1.31/.github/workflows/FreeBSD-13.2-Makefile.yml)
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/FreeBSD-13.2-Makefile.yml	Fri Mar  8 13:41:03 2024	(r20277, copy source)
+++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-13.3-Makefile.yml	Fri Mar  8 13:42:08 2024	(r20278)
@@ -1,4 +1,4 @@
-name: FreeBSD 13.2 Makefile
+name: FreeBSD 13.3 Makefile
 
 on:
   push:
@@ -17,64 +17,64 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: runner-to-vm
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
     - name: Test
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: true

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

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 13:41:03 2024
New Revision: 20277
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20277

Log:
[Imp] build: CI: GitHub: CPA: OpenBSD: Add full matrix build with system/local/small dependencies.
[Imp] build: CI: GitHub: CPA: NetBSD: Add full matrix build with system/local/small dependencies.

Added:
   trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml
      - copied, changed from r20276, trunk/OpenMPT/.github/workflows/NetBSD-9.3-Makefile.yml
   trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml
      - copied, changed from r20276, trunk/OpenMPT/.github/workflows/OpenBSD-7.4-Makefile.yml
Deleted:
   trunk/OpenMPT/.github/workflows/NetBSD-9.3-Makefile.yml
   trunk/OpenMPT/.github/workflows/OpenBSD-7.4-Makefile.yml

Copied and modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml (from r20276, trunk/OpenMPT/.github/workflows/NetBSD-9.3-Makefile.yml)
==============================================================================
--- trunk/OpenMPT/.github/workflows/NetBSD-9.3-Makefile.yml	Fri Mar  8 13:36:43 2024	(r20276, copy source)
+++ trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml	Fri Mar  8 13:41:03 2024	(r20277)
@@ -1,4 +1,4 @@
-name: NetBSD 9.3 Makefile
+name: NetBSD Makefile
 
 on:
   push:
@@ -6,13 +6,20 @@
   pull_request:
     branches: [ master ]
 
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
 jobs:
   build:
 
+    strategy:
+      matrix:
+        include:
+          - { version: 9.3, deps: sys   }
+          - { version: 9.3, deps: local }
+          - { version: 9.3, deps: small }
+
+    concurrency:
+      group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
+      cancel-in-progress: true
+
     runs-on: ubuntu-22.04
 
     steps:
@@ -25,7 +32,7 @@
         hypervisor: qemu
         memory: 4G
         operating_system: netbsd
-        version: '9.3'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: runner-to-vm
         shutdown_vm: false
@@ -37,7 +44,7 @@
         hypervisor: qemu
         memory: 4G
         operating_system: netbsd
-        version: '9.3'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
@@ -56,12 +63,12 @@
         hypervisor: qemu
         memory: 4G
         operating_system: netbsd
-        version: '9.3'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j4 STRICT=1 VERBOSE=1 AUTO_DEPS=1
+          gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
       uses: cross-platform-actions/action@v0.23.0
       with:
@@ -69,12 +76,12 @@
         hypervisor: qemu
         memory: 4G
         operating_system: netbsd
-        version: '9.3'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j4 STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
+          gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
       uses: cross-platform-actions/action@v0.23.0
       with:
@@ -82,7 +89,7 @@
         hypervisor: qemu
         memory: 4G
         operating_system: netbsd
-        version: '9.3'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: true

Copied and modified: trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml (from r20276, trunk/OpenMPT/.github/workflows/OpenBSD-7.4-Makefile.yml)
==============================================================================
--- trunk/OpenMPT/.github/workflows/OpenBSD-7.4-Makefile.yml	Fri Mar  8 13:36:43 2024	(r20276, copy source)
+++ trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml	Fri Mar  8 13:41:03 2024	(r20277)
@@ -1,4 +1,4 @@
-name: OpenBSD 7.4 Makefile
+name: OpenBSD Makefile
 
 on:
   push:
@@ -6,13 +6,20 @@
   pull_request:
     branches: [ master ]
 
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
 jobs:
   build:
 
+    strategy:
+      matrix:
+        include:
+          - { version: 7.4, deps: sys   }
+          - { version: 7.4, deps: local }
+          - { version: 7.4, deps: small }
+
+    concurrency:
+      group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
+      cancel-in-progress: true
+
     runs-on: ubuntu-22.04
 
     steps:
@@ -25,7 +32,7 @@
         hypervisor: qemu
         memory: 4G
         operating_system: openbsd
-        version: '7.4'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: runner-to-vm
         shutdown_vm: false
@@ -37,7 +44,7 @@
         hypervisor: qemu
         memory: 4G
         operating_system: openbsd
-        version: '7.4'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
@@ -50,12 +57,12 @@
         hypervisor: qemu
         memory: 4G
         operating_system: openbsd
-        version: '7.4'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
       uses: cross-platform-actions/action@v0.23.0
       with:
@@ -63,12 +70,12 @@
         hypervisor: qemu
         memory: 4G
         operating_system: openbsd
-        version: '7.4'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
       uses: cross-platform-actions/action@v0.23.0
       with:
@@ -76,7 +83,7 @@
         hypervisor: qemu
         memory: 4G
         operating_system: openbsd
-        version: '7.4'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: true

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

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 13:36:43 2024
New Revision: 20276
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20276

Log:
[Ref] build: CI: GitHub: CPA: FreeBSD: Delete non-matrix builds.

Deleted:
   trunk/OpenMPT/.github/workflows/FreeBSD-13.3-Makefile.yml
   trunk/OpenMPT/.github/workflows/FreeBSD-14.0-Makefile.yml

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

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 13:36:19 2024
New Revision: 20275
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20275

Log:
[Imp] build: CI: GitHub: CPA: FreeBSD:Update FreeBSD 13 to 13.3.

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

Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml	Fri Mar  8 13:10:31 2024	(r20274)
+++ trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml	Fri Mar  8 13:36:19 2024	(r20275)
@@ -15,9 +15,9 @@
           - { version: 14.0, deps: sys   }
           - { version: 14.0, deps: local }
           - { version: 14.0, deps: small }
-          - { version: 13.2, deps: sys   }
-          - { version: 13.2, deps: local }
-          - { version: 13.2, deps: small }
+          - { version: 13.3, deps: sys   }
+          - { version: 13.3, deps: local }
+          - { version: 13.3, deps: small }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
@@ -29,7 +29,7 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -41,7 +41,7 @@
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -54,7 +54,7 @@
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -67,7 +67,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -80,7 +80,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu

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

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 13:10:31 2024
New Revision: 20274
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20274

Log:
[Fix] build: CI: GitHub: CPA: FreeBSD: Hardcode CPA version in matrix build.

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

Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml	Fri Mar  8 12:56:16 2024	(r20273)
+++ trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml	Fri Mar  8 13:10:31 2024	(r20274)
@@ -12,12 +12,12 @@
     strategy:
       matrix:
         include:
-          - { version: 14.0, deps: sys  , cpa: v0.23.0 }
-          - { version: 14.0, deps: local, cpa: v0.23.0 }
-          - { version: 14.0, deps: small, cpa: v0.23.0 }
-          - { version: 13.2, deps: sys  , cpa: v0.23.0 }
-          - { version: 13.2, deps: local, cpa: v0.23.0 }
-          - { version: 13.2, deps: small, cpa: v0.23.0 }
+          - { version: 14.0, deps: sys   }
+          - { version: 14.0, deps: local }
+          - { version: 14.0, deps: small }
+          - { version: 13.2, deps: sys   }
+          - { version: 13.2, deps: local }
+          - { version: 13.2, deps: small }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
@@ -29,7 +29,7 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@${{matrix.cpa}}
+      uses: cross-platform-actions/action@v0.23.0
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -41,7 +41,7 @@
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@${{matrix.cpa}}
+      uses: cross-platform-actions/action@v0.23.0
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -54,7 +54,7 @@
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
-      uses: cross-platform-actions/action@${{matrix.cpa}}
+      uses: cross-platform-actions/action@v0.23.0
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -67,7 +67,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
-      uses: cross-platform-actions/action@${{matrix.cpa}}
+      uses: cross-platform-actions/action@v0.23.0
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -80,7 +80,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
-      uses: cross-platform-actions/action@${{matrix.cpa}}
+      uses: cross-platform-actions/action@v0.23.0
       with:
         architecture: x86_64
         hypervisor: qemu

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

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 12:56:16 2024
New Revision: 20273
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20273

Log:
[Imp] build: CI: GitHub: CPA: FreeBSD:Update FreeBSD 13 to 13.3.

Added:
   trunk/OpenMPT/.github/workflows/FreeBSD-13.3-Makefile.yml
      - copied, changed from r20272, trunk/OpenMPT/.github/workflows/FreeBSD-13.2-Makefile.yml
Deleted:
   trunk/OpenMPT/.github/workflows/FreeBSD-13.2-Makefile.yml

Copied and modified: trunk/OpenMPT/.github/workflows/FreeBSD-13.3-Makefile.yml (from r20272, trunk/OpenMPT/.github/workflows/FreeBSD-13.2-Makefile.yml)
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-13.2-Makefile.yml	Fri Mar  8 12:55:40 2024	(r20272, copy source)
+++ trunk/OpenMPT/.github/workflows/FreeBSD-13.3-Makefile.yml	Fri Mar  8 12:56:16 2024	(r20273)
@@ -1,4 +1,4 @@
-name: FreeBSD 13.2 Makefile
+name: FreeBSD 13.3 Makefile
 
 on:
   push:
@@ -19,64 +19,64 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: runner-to-vm
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
     - name: Test
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.23.0
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '13.3'
         shell: bash
         sync_files: false
         shutdown_vm: true

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

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 12:55:40 2024
New Revision: 20272
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20272

Log:
[Ref] build: CI: GitHub: CPA: FreeBSD: Proper filename

Added:
   trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml
      - copied unchanged from r20271, trunk/OpenMPT/.github/workflows/FreeBSD.yml
Deleted:
   trunk/OpenMPT/.github/workflows/FreeBSD.yml

Copied: trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml (from r20271, trunk/OpenMPT/.github/workflows/FreeBSD.yml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml	Fri Mar  8 12:55:40 2024	(r20272, copy of r20271, trunk/OpenMPT/.github/workflows/FreeBSD.yml)
@@ -0,0 +1,93 @@
+name: FreeBSD Makefile
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    strategy:
+      matrix:
+        include:
+          - { version: 14.0, deps: sys  , cpa: v0.23.0 }
+          - { version: 14.0, deps: local, cpa: v0.23.0 }
+          - { version: 14.0, deps: small, cpa: v0.23.0 }
+          - { version: 13.2, deps: sys  , cpa: v0.23.0 }
+          - { version: 13.2, deps: local, cpa: v0.23.0 }
+          - { version: 13.2, deps: small, cpa: v0.23.0 }
+
+    concurrency:
+      group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
+      cancel-in-progress: true
+
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Startup VM
+      uses: cross-platform-actions/action@${{matrix.cpa}}
+      with:
+        architecture: x86_64
+        hypervisor: qemu
+        memory: 4G
+        operating_system: freebsd
+        version: ${{matrix.version}}
+        shell: bash
+        sync_files: runner-to-vm
+        shutdown_vm: false
+        run: true
+    - name: Install dependencies
+      uses: cross-platform-actions/action@${{matrix.cpa}}
+      with:
+        architecture: x86_64
+        hypervisor: qemu
+        memory: 4G
+        operating_system: freebsd
+        version: ${{matrix.version}}
+        shell: bash
+        sync_files: false
+        shutdown_vm: false
+        run: |
+          sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
+    - name: Build
+      uses: cross-platform-actions/action@${{matrix.cpa}}
+      with:
+        architecture: x86_64
+        hypervisor: qemu
+        memory: 4G
+        operating_system: freebsd
+        version: ${{matrix.version}}
+        shell: bash
+        sync_files: false
+        shutdown_vm: false
+        run: |
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+    - name: Test
+      uses: cross-platform-actions/action@${{matrix.cpa}}
+      with:
+        architecture: x86_64
+        hypervisor: qemu
+        memory: 4G
+        operating_system: freebsd
+        version: ${{matrix.version}}
+        shell: bash
+        sync_files: false
+        shutdown_vm: false
+        run: |
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+    - name: Shutdown VM
+      uses: cross-platform-actions/action@${{matrix.cpa}}
+      with:
+        architecture: x86_64
+        hypervisor: qemu
+        memory: 4G
+        operating_system: freebsd
+        version: ${{matrix.version}}
+        shell: bash
+        sync_files: false
+        shutdown_vm: true
+        run: true

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

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 12:53:56 2024
New Revision: 20271
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20271

Log:
[Imp] build: CI: GitHub: CPA: FreeBSD: Add full matrix build with system/local/small dependencies.

Added:
   trunk/OpenMPT/.github/workflows/FreeBSD.yml

Added: trunk/OpenMPT/.github/workflows/FreeBSD.yml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/OpenMPT/.github/workflows/FreeBSD.yml	Fri Mar  8 12:53:56 2024	(r20271)
@@ -0,0 +1,93 @@
+name: FreeBSD Makefile
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    strategy:
+      matrix:
+        include:
+          - { version: 14.0, deps: sys  , cpa: v0.23.0 }
+          - { version: 14.0, deps: local, cpa: v0.23.0 }
+          - { version: 14.0, deps: small, cpa: v0.23.0 }
+          - { version: 13.2, deps: sys  , cpa: v0.23.0 }
+          - { version: 13.2, deps: local, cpa: v0.23.0 }
+          - { version: 13.2, deps: small, cpa: v0.23.0 }
+
+    concurrency:
+      group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
+      cancel-in-progress: true
+
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Startup VM
+      uses: cross-platform-actions/action@${{matrix.cpa}}
+      with:
+        architecture: x86_64
+        hypervisor: qemu
+        memory: 4G
+        operating_system: freebsd
+        version: ${{matrix.version}}
+        shell: bash
+        sync_files: runner-to-vm
+        shutdown_vm: false
+        run: true
+    - name: Install dependencies
+      uses: cross-platform-actions/action@${{matrix.cpa}}
+      with:
+        architecture: x86_64
+        hypervisor: qemu
+        memory: 4G
+        operating_system: freebsd
+        version: ${{matrix.version}}
+        shell: bash
+        sync_files: false
+        shutdown_vm: false
+        run: |
+          sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
+    - name: Build
+      uses: cross-platform-actions/action@${{matrix.cpa}}
+      with:
+        architecture: x86_64
+        hypervisor: qemu
+        memory: 4G
+        operating_system: freebsd
+        version: ${{matrix.version}}
+        shell: bash
+        sync_files: false
+        shutdown_vm: false
+        run: |
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+    - name: Test
+      uses: cross-platform-actions/action@${{matrix.cpa}}
+      with:
+        architecture: x86_64
+        hypervisor: qemu
+        memory: 4G
+        operating_system: freebsd
+        version: ${{matrix.version}}
+        shell: bash
+        sync_files: false
+        shutdown_vm: false
+        run: |
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+    - name: Shutdown VM
+      uses: cross-platform-actions/action@${{matrix.cpa}}
+      with:
+        architecture: x86_64
+        hypervisor: qemu
+        memory: 4G
+        operating_system: freebsd
+        version: ${{matrix.version}}
+        shell: bash
+        sync_files: false
+        shutdown_vm: true
+        run: true

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

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 11:36:58 2024
New Revision: 20270
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20270

Log:
[Imp] build: CI: GitHub: macOS: Add builds with small dependencies.

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

Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Thu Mar  7 18:56:09 2024	(r20269)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Fri Mar  8 11:36:58 2024	(r20270)
@@ -12,28 +12,32 @@
     strategy:
       matrix:
         include:
-          - { host: macos-14, compiler: 15.2, arch: ''    , target: ''   , deps: true,  check: true  }
-          - { host: macos-14, compiler: 15.2, arch: arm64 , target: ''   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: ''   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 14   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 14   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 13   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 13   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 12   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 12   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 11   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 11   , deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.15, deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.14, deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: i386  , target: 10.14, deps: false, check: false }
-          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.13, deps: false, check: true  }
-          - { host: macos-14, compiler: 15.2, arch: i386  , target: 10.13, deps: false, check: false }
-          - { host: macos-13, compiler: 15.2, arch: x64_64, target: 10.13, deps: false, check: true  }
-          - { host: macos-13, compiler: 15.2, arch: i386  , target: 10.13, deps: false, check: false }
-          - { host: macos-12, compiler: 14.2, arch: x64_64, target: 10.13, deps: false, check: true  }
-          - { host: macos-12, compiler: 14.2, arch: i386  , target: 10.13, deps: false, check: false }
+          - { host: macos-14, compiler: 15.2, arch: ''    , target: ''   , deps: sys,  check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: ''   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: ''   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: ''   , deps: small, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: ''   , deps: small, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 14   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 14   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 13   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 13   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 12   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 12   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 11   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 11   , deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.15, deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.14, deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: i386  , target: 10.14, deps: local, check: false }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.13, deps: local, check: true  }
+          - { host: macos-14, compiler: 15.2, 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}}
+      group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}}
       cancel-in-progress: true
     runs-on: ${{matrix.host}}
     steps:
@@ -51,7 +55,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 && 'FORCE_DEPS=1' || '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' }}
+      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' }}
     - 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 && 'FORCE_DEPS=1' || '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' }} 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

[OMPT-svn-commit] OpenMPT r20269 - in branches/OpenMPT-1.31: . mptrack

[<sv...@op...>]

Author: sagamusix
Date: Thu Mar  7 18:56:09 2024
New Revision: 20269
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20269

Log:
Merged revision(s) 20268 from trunk/OpenMPT:
[Fix] Avoid out-of-bounds span access in sample preview (only an issue in debug builds).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/MainFrm.cpp

Modified: branches/OpenMPT-1.31/mptrack/MainFrm.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/MainFrm.cpp	Thu Mar  7 18:55:36 2024	(r20268)
+++ branches/OpenMPT-1.31/mptrack/MainFrm.cpp	Thu Mar  7 18:56:09 2024	(r20269)
@@ -1685,9 +1685,10 @@
 			m[0].instr = 1;
 		}
 		// Infinite loop on second row
-		m[1 * 2].command = CMD_POSITIONJUMP;
-		m[1 * 2 + 1].command = CMD_PATTERNBREAK;
-		m[1 * 2 + 1].param = 1;
+		m = m_WaveFile.Patterns[0].GetRow(1);
+		m[0].command = CMD_POSITIONJUMP;
+		m[1].command = CMD_PATTERNBREAK;
+		m[1].param = 1;
 	}
 	m_WaveFile.InitPlayer(true);
 }

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

[<sv...@op...>]

Author: sagamusix
Date: Thu Mar  7 18:55:36 2024
New Revision: 20268
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20268

Log:
[Fix] Avoid out-of-bounds span access in sample preview (only an issue in debug builds).

Modified:
   trunk/OpenMPT/mptrack/MainFrm.cpp

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	Thu Mar  7 12:26:20 2024	(r20267)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	Thu Mar  7 18:55:36 2024	(r20268)
@@ -1710,9 +1710,10 @@
 			m[0].instr = 1;
 		}
 		// Infinite loop on second row
-		m[1 * 2].command = CMD_POSITIONJUMP;
-		m[1 * 2 + 1].command = CMD_PATTERNBREAK;
-		m[1 * 2 + 1].param = 1;
+		m = m_WaveFile.Patterns[0].GetRow(1);
+		m[0].command = CMD_POSITIONJUMP;
+		m[1].command = CMD_PATTERNBREAK;
+		m[1].param = 1;
 	}
 	m_WaveFile.InitPlayer(true);
 }

[OMPT-svn-commit] OpenMPT r20267 - branches/OpenMPT-1.29/libopenmpt

[<sv...@op...>]

Author: manx
Date: Thu Mar  7 12:26:20 2024
New Revision: 20267
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20267

Log:
[Fix] xmp-openmpt: Fix mis-merge.

Modified:
   branches/OpenMPT-1.29/libopenmpt/xmp-openmpt.cpp

Modified: branches/OpenMPT-1.29/libopenmpt/xmp-openmpt.cpp
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/xmp-openmpt.cpp	Thu Mar  7 10:12:12 2024	(r20266)
+++ branches/OpenMPT-1.29/libopenmpt/xmp-openmpt.cpp	Thu Mar  7 12:26:20 2024	(r20267)
@@ -1067,9 +1067,8 @@
 
 	if( !self->single_subsong_mode && self->subsong_lengths.size() > 1 ) {
 		std::vector<std::string> names = self->mod->get_subsong_names();
-
 		for ( std::size_t i = 0; i < self->subsong_lengths.size(); ++i ) {
-			str << ( i == 0 ? "Subsongs\t" : "\t" ) << (i + 1) << ". " << seconds_to_string( self->subsong_lengths[i] ) << " " << self->subsong_names[i] << "\r";
+			str << ( i == 0 ? "Subsongs\t" : "\t" ) << (i + 1) << ". " << seconds_to_string( self->subsong_lengths[i] ) << " " << names[i] << "\r";
 		}
 	}
 

[OMPT-svn-commit] OpenMPT r20266 - branches/OpenMPT-1.29/libopenmpt/dox

[<sv...@op...>]

Author: manx
Date: Thu Mar  7 10:12:12 2024
New Revision: 20266
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20266

Log:
[Doc] libopenmpt: Update changelog.

Modified:
   branches/OpenMPT-1.29/libopenmpt/dox/changelog.md

Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/dox/changelog.md	Thu Mar  7 10:12:04 2024	(r20265)
+++ branches/OpenMPT-1.29/libopenmpt/dox/changelog.md	Thu Mar  7 10:12:12 2024	(r20266)
@@ -7,6 +7,8 @@
 
 ### libopenmpt 0.5.28-pre
 
+ *  xmp-openmpt: Metadata retrievel for playlist items was broken.
+
 ### libopenmpt 0.5.27 (2024-03-03)
 
  *  Setting all possible `load_skip` flags resulted in nothing being loaded at

[OMPT-svn-commit] OpenMPT r20265 - branches/OpenMPT-1.30/libopenmpt/dox

[<sv...@op...>]

Author: manx
Date: Thu Mar  7 10:12:04 2024
New Revision: 20265
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20265

Log:
[Doc] libopenmpt: Update changelog.

Modified:
   branches/OpenMPT-1.30/libopenmpt/dox/changelog.md

Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.30/libopenmpt/dox/changelog.md	Thu Mar  7 10:10:11 2024	(r20264)
+++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md	Thu Mar  7 10:12:04 2024	(r20265)
@@ -7,6 +7,8 @@
 
 ### libopenmpt 0.6.14-pre
 
+ *  xmp-openmpt: Metadata retrievel for playlist items was broken.
+
 ### libopenmpt 0.6.13 (2024-03-03)
 
  *  Setting all possible `load_skip` flags resulted in nothing being loaded at

[OMPT-svn-commit] OpenMPT r20264 - in branches/OpenMPT-1.29: . libopenmpt

[<sv...@op...>]

Author: manx
Date: Thu Mar  7 10:10:11 2024
New Revision: 20264
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20264

Log:
Merged revision(s) 20262-20263 from branches/OpenMPT-1.30:
Merged revision(s) 18550 from branches/OpenMPT-1.31/libopenmpt/xmp-openmpt:
[Imp] xmp-openmpt: Increase precision of GetSubSongs().
........
........
Merged revision(s) 20254 from branches/OpenMPT-1.31/libopenmpt/xmp-openmpt:
Merged revision(s) 20253 from trunk/OpenMPT:
[Fix] xmp-openmpt: Song metadata retrieval was completely broken for playlist entries.
........
........
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/libopenmpt/   (props changed)
   branches/OpenMPT-1.29/libopenmpt/xmp-openmpt.cpp

Modified: branches/OpenMPT-1.29/libopenmpt/xmp-openmpt.cpp
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/xmp-openmpt.cpp	Thu Mar  7 10:07:46 2024	(r20263)
+++ branches/OpenMPT-1.29/libopenmpt/xmp-openmpt.cpp	Thu Mar  7 10:10:11 2024	(r20264)
@@ -146,7 +146,7 @@
 };
 
 struct self_xmplay_t {
-	std::vector<float> subsong_lengths;
+	std::vector<double> subsong_lengths;
 	std::size_t samplerate = 48000;
 	std::size_t num_channels = 2;
 	xmp_openmpt_settings settings;
@@ -226,7 +226,7 @@
 	return str;
 }
 
-static std::string seconds_to_string( float time ) {
+static std::string seconds_to_string( double time ) {
 	std::int64_t time_ms = static_cast<std::int64_t>( time * 1000 );
 	std::int64_t seconds = ( time_ms / 1000 ) % 60;
 	std::int64_t minutes = ( time_ms / ( 1000 * 60 ) ) % 60;
@@ -692,17 +692,38 @@
 	return result;
 }
 
-static float * build_xmplay_length( const openmpt::module & /* mod */ ) {
-	float * result = static_cast<float*>( xmpfmisc->Alloc( sizeof( float ) * self->subsong_lengths.size() ) );
+static std::vector<double> build_subsong_lengths( openmpt::module & mod ) {
+	std::int32_t num_subsongs = mod.get_num_subsongs();
+	std::vector<double> subsong_lengths( num_subsongs );
+	for ( std::int32_t i = 0; i < num_subsongs; ++i ) {
+		mod.select_subsong( i );
+		subsong_lengths[i] = mod.get_duration_seconds();
+	}
+	return subsong_lengths;
+}
+
+static float * build_xmplay_length( openmpt::module & mod ) {
+	const auto subsong_lengths = build_subsong_lengths( mod );
+	float * result = static_cast<float*>( xmpfmisc->Alloc( sizeof( float ) * subsong_lengths.size() ) );
 	if ( !result ) {
 		return nullptr;
 	}
-	for ( std::size_t i = 0; i < self->subsong_lengths.size(); ++i ) {
-		result[i] = self->subsong_lengths[i];
+	for ( std::size_t i = 0; i < subsong_lengths.size(); ++i ) {
+		result[i] = static_cast<float>( subsong_lengths[i] );
 	}
 	return result;
 }
 
+static DWORD build_xmplay_file_info( openmpt::module & mod, float ** length, char ** tags ) {
+	if ( length ) {
+		*length = build_xmplay_length( mod );
+	}
+	if ( tags ) {
+		*tags = build_xmplay_tags( mod );
+	}
+	return static_cast<DWORD>( mod.get_num_subsongs() );
+}
+
 static void clear_xmplay_string( char * str ) {
 	if ( !str ) {
 		return;
@@ -812,6 +833,7 @@
 
 static DWORD WINAPI openmpt_GetFileInfo( const char * filename, XMPFILE file, float * * length, char * * tags ) {
 	static_cast<void>( filename );
+	DWORD subsongs = 0;
 	try {
 		std::map< std::string, std::string > ctls
 		{
@@ -824,12 +846,7 @@
 					case XMPFILE_TYPE_MEMORY:
 						{
 							openmpt::module mod( xmpffile->GetMemory( file ), xmpffile->GetSize( file ), std::clog, ctls );
-							if ( length ) {
-								*length = build_xmplay_length( mod );
-							}
-							if ( tags ) {
-								*tags = build_xmplay_tags( mod );
-							}
+							subsongs = build_xmplay_file_info( mod, length, tags );
 						}
 						break;
 					case XMPFILE_TYPE_FILE:
@@ -839,50 +856,30 @@
 						{
 							xmplay_istream s( file );
 							openmpt::module mod( s, std::clog, ctls );
-							if ( length ) {
-								*length = build_xmplay_length( mod );
-							}
-							if ( tags ) {
-								*tags = build_xmplay_tags( mod );
-							}
+							subsongs = build_xmplay_file_info( mod, length, tags );
 						}
 						break;
 				}
 			#else
 				if ( xmpffile->GetType( file ) == XMPFILE_TYPE_MEMORY ) {
 					openmpt::module mod( xmpffile->GetMemory( file ), xmpffile->GetSize( file ), std::clog, ctls );
-					if ( length ) {
-						*length = build_xmplay_length( mod );
-					}
-					if ( tags ) {
-						*tags = build_xmplay_tags( mod );
-					}
+					subsongs = build_xmplay_file_info( mod, length, tags );
 				} else {
 					openmpt::module mod( read_XMPFILE_vector( file ), std::clog, ctls );
-					if ( length ) {
-						*length = build_xmplay_length( mod );
-					}
-					if ( tags ) {
-						*tags = build_xmplay_tags( mod );
-					}
+					subsongs = build_xmplay_file_info( mod, length, tags );
 				}
 			#endif
 		#else
 			std::ifstream s( filename, std::ios_base::binary );
 			openmpt::module mod( s, std::clog, ctls );
-			if ( length ) {
-				*length = build_xmplay_length( mod );
-			}
-			if ( tags ) {
-				*tags = build_xmplay_tags( mod );
-			}
-		#endif
+			subsongs = build_xmplay_file_info( mod, length, tags );
+#endif
 	} catch ( ... ) {
 		if ( length ) *length = nullptr;
 		if ( tags ) *tags = nullptr;
 		return 0;
 	}
-	return self->subsong_lengths.size() + XMPIN_INFO_NOSUBTAGS;
+	return subsongs;
 }
 
 // open a file for playback
@@ -929,17 +926,12 @@
 		reset_timeinfos();
 		apply_options();
 
-		std::int32_t num_subsongs = self->mod->get_num_subsongs();
-		self->subsong_lengths.resize( num_subsongs );
-		for ( std::int32_t i = 0; i < num_subsongs; ++i ) {
-			self->mod->select_subsong( i );
-			self->subsong_lengths[i] = static_cast<float>( self->mod->get_duration_seconds() );
-		}
+		self->subsong_lengths = build_subsong_lengths( *self->mod );
 		self->mod->select_subsong( 0 );
 		self->tempo_factor = 0;
 		self->pitch_factor = 0;
 
-		xmpfin->SetLength( self->subsong_lengths[0], TRUE );
+		xmpfin->SetLength( static_cast<float>( self->subsong_lengths[0] ), TRUE );
 		return 2;
 	} catch ( ... ) {
 		self->delete_mod();
@@ -1077,7 +1069,7 @@
 		std::vector<std::string> names = self->mod->get_subsong_names();
 
 		for ( std::size_t i = 0; i < self->subsong_lengths.size(); ++i ) {
-			str << ( i == 0 ? "Subsongs\t" : "\t" ) << (i + 1) << ". " << seconds_to_string( self->subsong_lengths[i]) << " " << names[i] << "\r";
+			str << ( i == 0 ? "Subsongs\t" : "\t" ) << (i + 1) << ". " << seconds_to_string( self->subsong_lengths[i] ) << " " << self->subsong_names[i] << "\r";
 		}
 	}
 
@@ -1222,11 +1214,11 @@
 }
 
 static DWORD WINAPI openmpt_GetSubSongs( float * length ) {
-	*length = 0.0f;
+	double tmp = 0.0;
 	for ( auto sub_length : self->subsong_lengths ) {
-		*length += sub_length;
+		tmp += sub_length;
 	}
-
+	*length = static_cast<float>( tmp );
 	return static_cast<DWORD>( self->subsong_lengths.size() );
 }
 

[OMPT-svn-commit] OpenMPT r20263 - branches/OpenMPT-1.30/libopenmpt

[<sv...@op...>]

Author: manx
Date: Thu Mar  7 10:07:46 2024
New Revision: 20263
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20263

Log:
Merged revision(s) 20254 from branches/OpenMPT-1.31/libopenmpt/xmp-openmpt:
Merged revision(s) 20253 from trunk/OpenMPT:
[Fix] xmp-openmpt: Song metadata retrieval was completely broken for playlist entries.
........
........

Modified:
   branches/OpenMPT-1.30/libopenmpt/   (props changed)
   branches/OpenMPT-1.30/libopenmpt/xmp-openmpt.cpp

Modified: branches/OpenMPT-1.30/libopenmpt/xmp-openmpt.cpp
==============================================================================
--- branches/OpenMPT-1.30/libopenmpt/xmp-openmpt.cpp	Thu Mar  7 10:06:12 2024	(r20262)
+++ branches/OpenMPT-1.30/libopenmpt/xmp-openmpt.cpp	Thu Mar  7 10:07:46 2024	(r20263)
@@ -765,17 +765,38 @@
 	return result;
 }
 
-static float * build_xmplay_length( const openmpt::module & /* mod */ ) {
-	float * result = static_cast<float*>( xmpfmisc->Alloc( sizeof( float ) * self->subsong_lengths.size() ) );
+static std::vector<double> build_subsong_lengths( openmpt::module & mod ) {
+	std::int32_t num_subsongs = mod.get_num_subsongs();
+	std::vector<double> subsong_lengths( num_subsongs );
+	for ( std::int32_t i = 0; i < num_subsongs; ++i ) {
+		mod.select_subsong( i );
+		subsong_lengths[i] = mod.get_duration_seconds();
+	}
+	return subsong_lengths;
+}
+
+static float * build_xmplay_length( openmpt::module & mod ) {
+	const auto subsong_lengths = build_subsong_lengths( mod );
+	float * result = static_cast<float*>( xmpfmisc->Alloc( sizeof( float ) * subsong_lengths.size() ) );
 	if ( !result ) {
 		return nullptr;
 	}
-	for ( std::size_t i = 0; i < self->subsong_lengths.size(); ++i ) {
-		result[i] = static_cast<float>( self->subsong_lengths[i] );
+	for ( std::size_t i = 0; i < subsong_lengths.size(); ++i ) {
+		result[i] = static_cast<float>( subsong_lengths[i] );
 	}
 	return result;
 }
 
+static DWORD build_xmplay_file_info( openmpt::module & mod, float ** length, char ** tags ) {
+	if ( length ) {
+		*length = build_xmplay_length( mod );
+	}
+	if ( tags ) {
+		*tags = build_xmplay_tags( mod );
+	}
+	return static_cast<DWORD>( mod.get_num_subsongs() );
+}
+
 static void clear_xmplay_string( char * str ) {
 	if ( !str ) {
 		return;
@@ -885,6 +906,7 @@
 
 static DWORD WINAPI openmpt_GetFileInfo( const char * filename, XMPFILE file, float * * length, char * * tags ) {
 	static_cast<void>( filename );
+	DWORD subsongs = 0;
 	try {
 		std::map< std::string, std::string > ctls
 		{
@@ -897,12 +919,7 @@
 					case XMPFILE_TYPE_MEMORY:
 						{
 							openmpt::module mod( xmpffile->GetMemory( file ), xmpffile->GetSize( file ), std::clog, ctls );
-							if ( length ) {
-								*length = build_xmplay_length( mod );
-							}
-							if ( tags ) {
-								*tags = build_xmplay_tags( mod );
-							}
+							subsongs = build_xmplay_file_info( mod, length, tags );
 						}
 						break;
 					case XMPFILE_TYPE_FILE:
@@ -912,50 +929,30 @@
 						{
 							xmplay_istream s( file );
 							openmpt::module mod( s, std::clog, ctls );
-							if ( length ) {
-								*length = build_xmplay_length( mod );
-							}
-							if ( tags ) {
-								*tags = build_xmplay_tags( mod );
-							}
+							subsongs = build_xmplay_file_info( mod, length, tags );
 						}
 						break;
 				}
 			#else
 				if ( xmpffile->GetType( file ) == XMPFILE_TYPE_MEMORY ) {
 					openmpt::module mod( xmpffile->GetMemory( file ), xmpffile->GetSize( file ), std::clog, ctls );
-					if ( length ) {
-						*length = build_xmplay_length( mod );
-					}
-					if ( tags ) {
-						*tags = build_xmplay_tags( mod );
-					}
+					subsongs = build_xmplay_file_info( mod, length, tags );
 				} else {
 					openmpt::module mod( read_XMPFILE_vector( file ), std::clog, ctls );
-					if ( length ) {
-						*length = build_xmplay_length( mod );
-					}
-					if ( tags ) {
-						*tags = build_xmplay_tags( mod );
-					}
+					subsongs = build_xmplay_file_info( mod, length, tags );
 				}
 			#endif
 		#else
 			std::ifstream s( filename, std::ios_base::binary );
 			openmpt::module mod( s, std::clog, ctls );
-			if ( length ) {
-				*length = build_xmplay_length( mod );
-			}
-			if ( tags ) {
-				*tags = build_xmplay_tags( mod );
-			}
-		#endif
+			subsongs = build_xmplay_file_info( mod, length, tags );
+#endif
 	} catch ( ... ) {
 		if ( length ) *length = nullptr;
 		if ( tags ) *tags = nullptr;
 		return 0;
 	}
-	return self->subsong_lengths.size() + XMPIN_INFO_NOSUBTAGS;
+	return subsongs;
 }
 
 // open a file for playback
@@ -1002,12 +999,7 @@
 		reset_timeinfos();
 		apply_options();
 
-		std::int32_t num_subsongs = self->mod->get_num_subsongs();
-		self->subsong_lengths.resize( num_subsongs );
-		for ( std::int32_t i = 0; i < num_subsongs; ++i ) {
-			self->mod->select_subsong( i );
-			self->subsong_lengths[i] = self->mod->get_duration_seconds();
-		}
+		self->subsong_lengths = build_subsong_lengths( *self->mod );
 		self->subsong_names = self->mod->get_subsong_names();
 		self->mod->select_subsong( 0 );
 		self->tempo_factor = 0;

[OMPT-svn-commit] OpenMPT r20262 - branches/OpenMPT-1.30/libopenmpt

[<sv...@op...>]

Author: manx
Date: Thu Mar  7 10:06:12 2024
New Revision: 20262
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20262

Log:
Merged revision(s) 18550 from branches/OpenMPT-1.31/libopenmpt/xmp-openmpt:
[Imp] xmp-openmpt: Increase precision of GetSubSongs().
........

Modified:
   branches/OpenMPT-1.30/libopenmpt/   (props changed)
   branches/OpenMPT-1.30/libopenmpt/xmp-openmpt.cpp

Modified: branches/OpenMPT-1.30/libopenmpt/xmp-openmpt.cpp
==============================================================================
--- branches/OpenMPT-1.30/libopenmpt/xmp-openmpt.cpp	Thu Mar  7 09:44:47 2024	(r20261)
+++ branches/OpenMPT-1.30/libopenmpt/xmp-openmpt.cpp	Thu Mar  7 10:06:12 2024	(r20262)
@@ -180,7 +180,7 @@
 };
 
 struct self_xmplay_t {
-	std::vector<float> subsong_lengths;
+	std::vector<double> subsong_lengths;
 	std::vector<std::string> subsong_names;
 	std::size_t samplerate = 48000;
 	std::size_t num_channels = 2;
@@ -277,7 +277,7 @@
 	return str;
 }
 
-static std::string seconds_to_string( float time ) {
+static std::string seconds_to_string( double time ) {
 	std::int64_t time_ms = static_cast<std::int64_t>( time * 1000 );
 	std::int64_t seconds = ( time_ms / 1000 ) % 60;
 	std::int64_t minutes = ( time_ms / ( 1000 * 60 ) ) % 60;
@@ -771,7 +771,7 @@
 		return nullptr;
 	}
 	for ( std::size_t i = 0; i < self->subsong_lengths.size(); ++i ) {
-		result[i] = self->subsong_lengths[i];
+		result[i] = static_cast<float>( self->subsong_lengths[i] );
 	}
 	return result;
 }
@@ -1006,14 +1006,14 @@
 		self->subsong_lengths.resize( num_subsongs );
 		for ( std::int32_t i = 0; i < num_subsongs; ++i ) {
 			self->mod->select_subsong( i );
-			self->subsong_lengths[i] = static_cast<float>( self->mod->get_duration_seconds() );
+			self->subsong_lengths[i] = self->mod->get_duration_seconds();
 		}
 		self->subsong_names = self->mod->get_subsong_names();
 		self->mod->select_subsong( 0 );
 		self->tempo_factor = 0;
 		self->pitch_factor = 0;
 
-		xmpfin->SetLength( self->subsong_lengths[0], TRUE );
+		xmpfin->SetLength( static_cast<float>( self->subsong_lengths[0] ), TRUE );
 		return 2;
 	} catch ( ... ) {
 		self->delete_mod();
@@ -1149,7 +1149,7 @@
 
 	if( !self->single_subsong_mode && self->subsong_lengths.size() > 1 ) {
 		for ( std::size_t i = 0; i < self->subsong_lengths.size(); ++i ) {
-			str << ( i == 0 ? "Subsongs\t" : "\t" ) << (i + 1) << ". " << seconds_to_string( self->subsong_lengths[i]) << " " << self->subsong_names[i] << "\r";
+			str << ( i == 0 ? "Subsongs\t" : "\t" ) << (i + 1) << ". " << seconds_to_string( self->subsong_lengths[i] ) << " " << self->subsong_names[i] << "\r";
 		}
 	}
 
@@ -1296,11 +1296,11 @@
 }
 
 static DWORD WINAPI openmpt_GetSubSongs( float * length ) {
-	*length = 0.0f;
+	double tmp = 0.0;
 	for ( auto sub_length : self->subsong_lengths ) {
-		*length += sub_length;
+		tmp += sub_length;
 	}
-
+	*length = static_cast<float>( tmp );
 	return static_cast<DWORD>( self->subsong_lengths.size() );
 }
 

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

[<sv...@op...>]

Author: manx
Date: Thu Mar  7 09:44:47 2024
New Revision: 20261
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20261

Log:
[Fix] build: Makefile: macOS: Fix typo.

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

Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Thu Mar  7 09:13:27 2024	(r20260)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Thu Mar  7 09:44:47 2024	(r20261)
@@ -3,9 +3,9 @@
 
 on:
   push:
-    branches: [ macos-action-test ]
+    branches: [ master ]
   pull_request:
-    branches: [ macos-action-test ]
+    branches: [ master ]
 
 jobs:
   build:

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

[<sv...@op...>]

Author: manx
Date: Thu Mar  7 09:13:27 2024
New Revision: 20260
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20260

Log:
[Imp] build: CI: GitHub: macOS: Use a big matrix build with explicit host system, Xcode version, architecture, and deployment target.

Added:
   trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
Deleted:
   trunk/OpenMPT/.github/workflows/macOS-12-Makefile.yml
   trunk/OpenMPT/.github/workflows/macOS-13-Makefile.yml
   trunk/OpenMPT/.github/workflows/macOS-14-Makefile.yml

Added: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Thu Mar  7 09:13:27 2024	(r20260)
@@ -0,0 +1,57 @@
+
+name: macOS Makefile
+
+on:
+  push:
+    branches: [ macos-action-test ]
+  pull_request:
+    branches: [ macos-action-test ]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        include:
+          - { host: macos-14, compiler: 15.2, arch: ''    , target: ''   , deps: true,  check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: ''   , deps: false, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: ''   , deps: false, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 14   , deps: false, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 14   , deps: false, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 13   , deps: false, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 13   , deps: false, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 12   , deps: false, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 12   , deps: false, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: arm64 , target: 11   , deps: false, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 11   , deps: false, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.15, deps: false, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.14, deps: false, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: i386  , target: 10.14, deps: false, check: false }
+          - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.13, deps: false, check: true  }
+          - { host: macos-14, compiler: 15.2, arch: i386  , target: 10.13, deps: false, check: false }
+          - { host: macos-13, compiler: 15.2, arch: x64_64, target: 10.13, deps: false, check: true  }
+          - { host: macos-13, compiler: 15.2, arch: i386  , target: 10.13, deps: false, check: false }
+          - { host: macos-12, compiler: 14.2, arch: x64_64, target: 10.13, deps: false, check: true  }
+          - { host: macos-12, compiler: 14.2, arch: i386  , target: 10.13, deps: false, check: false }
+    concurrency:
+      group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}
+      cancel-in-progress: true
+    runs-on: ${{matrix.host}}
+    steps:
+    - uses: actions/checkout@v4
+    - name: fixup GitHub Homebrew node breakage
+      if: ${{ matrix.host == 'macos-12' }}
+      run: brew unlink node@18 && brew unlink node && brew link --overwrite node
+    - name: fixup GitHub Homebrew python breakage
+      if: ${{ matrix.host == 'macos-12' || matrix.host == 'macos-13' }}
+      run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
+    - name: install dependencies
+      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
+    - name: selecting Xcode version
+      run: sudo xcode-select --switch /Applications/Xcode_${{matrix.compiler}}.app
+    - 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 && 'FORCE_DEPS=1' || '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' }}
+    - 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 && 'FORCE_DEPS=1' || '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' }} check