Skip to content

Commit

Permalink
Merge pull request #6 from OpenMPT/master
Browse files Browse the repository at this point in the history
Update
  • Loading branch information
Greedysky authored May 23, 2023
2 parents 8bb236d + d59e684 commit 833fe50
Show file tree
Hide file tree
Showing 1,074 changed files with 26,833 additions and 17,744 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ skip_branch_with_pr: true



version: 1.31-appveyor{build}
version: 1.32-appveyor{build}



Expand Down
14 changes: 7 additions & 7 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
task:
name: freebsd-13-1
name: freebsd-13-2
freebsd_instance:
image_family: freebsd-13-1
install_script: 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
image_family: freebsd-13-2
install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check

task:
name: freebsd-13-1-minimal
name: freebsd-13-2-minimal
freebsd_instance:
image_family: freebsd-13-1
install_script: 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
image_family: freebsd-13-2
install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1
test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check

Expand All @@ -33,7 +33,7 @@ task:
task:
name: macos13-xcode14
macos_instance:
image: ghcr.io/cirruslabs/macos-ventura-xcode:14.2
image: ghcr.io/cirruslabs/macos-ventura-xcode:14.3
install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1
test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/FreeBSD-12.4-Makefile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: FreeBSD 12.4 Makefile

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
build:

runs-on: macos-12

steps:
- uses: actions/checkout@v3
- uses: cross-platform-actions/action@v0.13.0
with:
architecture: x86_64
hypervisor: xhyve
operating_system: freebsd
version: '12.4'
shell: bash
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
gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
30 changes: 30 additions & 0 deletions .github/workflows/FreeBSD-13.2-Makefile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: FreeBSD 13.2 Makefile

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
build:

runs-on: macos-12

steps:
- uses: actions/checkout@v3
- uses: cross-platform-actions/action@v0.13.0
with:
architecture: x86_64
hypervisor: xhyve
operating_system: freebsd
version: '13.2'
shell: bash
run: |
sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
36 changes: 36 additions & 0 deletions .github/workflows/NetBSD-9.2-Makefile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: NetBSD 9.2 Makefile

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: cross-platform-actions/action@v0.13.0
with:
architecture: x86_64
hypervisor: qemu
operating_system: netbsd
version: '9.2'
shell: bash
run: |
sudo pkgin -y install subversion git p5-XML-XPath mawk
sudo pkgin -y install gmake pkgconf
sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2
sudo pkgin -y install gcc7-libs # for libstdc++7
sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl
sudo pkgin -y install help2man
#sudo pkgin -y install doxygen # broken
gmake -j4 STRICT=1 VERBOSE=1 AUTO_DEPS=1
gmake -j4 STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
30 changes: 30 additions & 0 deletions .github/workflows/OpenBSD-7.3-Makefile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: OpenBSD 7.3 Makefile

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
build:

runs-on: macos-12

steps:
- uses: actions/checkout@v3
- uses: cross-platform-actions/action@v0.13.0
with:
architecture: x86_64
hypervisor: xhyve
operating_system: openbsd
version: '7.3'
shell: bash
run: |
sudo pkg_add subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2
gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
4 changes: 4 additions & 0 deletions .github/workflows/Ubuntu2004-Makefile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
pull_request:
branches: [ master ]

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
build:

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/Ubuntu2204-Makefile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
pull_request:
branches: [ master ]

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
build:

Expand Down
27 changes: 27 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
/build/vs2019win10/*.user
/build/vs2019win10/.vs
/build/vs2019win10uwp/.vs
/build/vs2019win10uwp/Generated Files
/build/vs2019win10uwp/ext/Generated Files
/build/vs2019win7/*.user
/build/vs2019win7/.vs
/build/vs2019win81/*.user
Expand All @@ -59,6 +61,7 @@
/build/vs2022win10clang/ext/*.user
/build/vs2022win10uwp/*.user
/build/vs2022win10uwp/.vs
/build/vs2022win10uwp/Generated Files
/build/vs2022win10uwp/ext/.vs
/build/vs2022win10uwp/ext/Generated Files
/build/vs2022win7/*.user
Expand Down Expand Up @@ -326,6 +329,7 @@
/include/lame/mpglib/Makefile.in
/include/lame/mpglib/README
/include/lame/mpglib/depcomp
/include/lhasa/m4
/include/lhasa/test
/include/minimp3/*.d
/include/minimp3/*.o
Expand Down Expand Up @@ -513,6 +517,7 @@
/include/opus/aclocal.m4
/include/opus/celt_headers.mk
/include/opus/celt_sources.mk
/include/opus/cmake
/include/opus/compile
/include/opus/config.guess
/include/opus/config.h.cmake.in
Expand All @@ -525,6 +530,9 @@
/include/opus/install-sh
/include/opus/ltmain.sh
/include/opus/m4
/include/opus/meson
/include/opus/meson.build
/include/opus/meson_options.txt
/include/opus/missing
/include/opus/opus-uninstalled.pc.in
/include/opus/opus.m4
Expand All @@ -538,8 +546,12 @@
/include/opus/silk_sources.mk
/include/opus/test-driver
/include/opus/tests
/include/opus/celt/meson.build
/include/opus/celt/tests
/include/opus/include/meson.build
/include/opus/silk/meson.build
/include/opus/silk/tests
/include/opus/src/meson.build
/include/opus/win32/VS2015
/include/opusenc/Makefile.am
/include/opusenc/Makefile.in
Expand Down Expand Up @@ -699,6 +711,21 @@
/include/rtaudio/rtaudio_c.cpp
/include/rtaudio/rtaudio_c.h
/include/rtaudio/tests
/include/rtmidi/CMakeLists.txt
/include/rtmidi/Makefile.am
/include/rtmidi/README.md
/include/rtmidi/autogen.sh
/include/rtmidi/cmake
/include/rtmidi/configure.ac
/include/rtmidi/contrib
/include/rtmidi/doc
/include/rtmidi/m4
/include/rtmidi/msw
/include/rtmidi/rtmidi-config.in
/include/rtmidi/rtmidi.pc.in
/include/rtmidi/rtmidi_c.cpp
/include/rtmidi/rtmidi_c.h
/include/rtmidi/tests
/include/stb_vorbis/*.d
/include/stb_vorbis/*.o
/include/vorbis/CMakeLists.txt
Expand Down
Loading

0 comments on commit 833fe50

Please sign in to comment.