Menu
▾
▴
modplug-svn-commit — OpenMPT subversion commit notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
| 2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
| 2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
| 2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
| 2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
| 2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
| 2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
| 2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
| 2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
| 2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
| 2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
| 2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
| 2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
| 2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
| 2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
| 2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
| 2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
| 2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(403) |
Jul
(213) |
Aug
(187) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-04-05 13:01:26
|
Author: manx Date: Fri Apr 5 15:01:13 2024 New Revision: 20507 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20507 Log: [Fix] build: Autotools: Assume bsdtar on BSD. Modified: trunk/OpenMPT/build/autotools/autoconfiscate.sh Modified: trunk/OpenMPT/build/autotools/autoconfiscate.sh ============================================================================== --- trunk/OpenMPT/build/autotools/autoconfiscate.sh Fri Apr 5 14:51:16 2024 (r20506) +++ trunk/OpenMPT/build/autotools/autoconfiscate.sh Fri Apr 5 15:01:13 2024 (r20507) @@ -12,8 +12,10 @@ echo "Detecting OS ..." UNAME_S="$(uname -s)" if [[ $UNAME_S == *"BSD"* ]]; then + BSD=1 MAKE=gmake else + BSD=0 MAKE=make fi @@ -268,6 +270,10 @@ rm -rf libopenmpt mkdir -p libopenmpt/src.autotools/$MPT_LIBOPENMPT_VERSION/ cp *.tar.gz libopenmpt/src.autotools/$MPT_LIBOPENMPT_VERSION/ -tar -cv --numeric-owner --owner=0 --group=0 -f ../dist-autotools.tar libopenmpt +if [[ $BSD == "1" ]]; then + tar -cv --numeric-owner --uname "" --gname "" --uid 0 --gid 0 -f ../dist-autotools.tar libopenmpt +else + tar -cv --numeric-owner --owner=0 --group=0 -f ../dist-autotools.tar libopenmpt +fi cd ../.. |
|
From: <sv...@op...> - 2024-04-05 12:51:23
|
Author: manx Date: Fri Apr 5 14:51:16 2024 New Revision: 20506 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20506 Log: [Ref] build: CI: GitHub: CPA: NetBSD: Try to cleanup dependency installation. Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Fri Apr 5 14:49:55 2024 (r20505) +++ trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Fri Apr 5 14:51:16 2024 (r20506) @@ -56,10 +56,8 @@ 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 + sudo pkgin -y install doxygen help2man - name: Build uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: |
|
From: <sv...@op...> - 2024-04-05 12:50:11
|
Author: manx Date: Fri Apr 5 14:49:55 2024 New Revision: 20505 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20505 Log: [Reg] build: CI: GitHub: CPA: Remove Autotools builders for OpenBSD and NetBSD again. Deleted: trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml |
|
From: <sv...@op...> - 2024-04-05 11:42:42
|
Author: manx Date: Fri Apr 5 13:42:35 2024 New Revision: 20504 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20504 Log: [New] build: CI: GitHub: CPA: Add Autotools builders for FreeBSD, OpenBSD, and NetBSD. Added: trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml - copied, changed from r20503, trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml - copied, changed from r20503, trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml - copied, changed from r20503, trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Copied and modified: trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml (from r20503, trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml) ============================================================================== --- trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml Thu Apr 4 20:15:18 2024 (r20503, copy source) +++ trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml Fri Apr 5 13:42:35 2024 (r20504) @@ -1,4 +1,4 @@ -name: FreeBSD Makefile +name: FreeBSD Autotools on: push: @@ -13,15 +13,11 @@ fail-fast: false matrix: include: - - { 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 } + - { version: '14.0' } + - { version: '13.3' } concurrency: - group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} + group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools cancel-in-progress: true runs-on: ubuntu-22.04 @@ -66,20 +62,7 @@ sync_files: false shutdown_vm: false run: | - gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - - name: Test - uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9 - 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 + ./build/autotools/autoconfiscate.sh - name: Shutdown VM uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9 with: Copied and modified: trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml (from r20503, trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml) ============================================================================== --- trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Thu Apr 4 20:15:18 2024 (r20503, copy source) +++ trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml Fri Apr 5 13:42:35 2024 (r20504) @@ -1,4 +1,4 @@ -name: NetBSD Makefile +name: NetBSD Autotools on: push: @@ -13,15 +13,11 @@ fail-fast: false matrix: include: - - { version: '10.0', deps: sys } - - { version: '10.0', deps: local } - - { version: '10.0', deps: small } - - { version: '9.3' , deps: sys } - - { version: '9.3' , deps: local } - - { version: '9.3' , deps: small } + - { version: '10.0' } + - { version: '9.3' } concurrency: - group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} + group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools cancel-in-progress: true runs-on: ubuntu-22.04 @@ -72,20 +68,7 @@ sync_files: false shutdown_vm: false run: | - gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - - name: Test - uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 - with: - architecture: x86_64 - hypervisor: qemu - memory: 4G - operating_system: netbsd - version: ${{matrix.version}} - shell: bash - sync_files: false - shutdown_vm: false - run: | - gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check + ./build/autotools/autoconfiscate.sh - name: Shutdown VM uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: Copied and modified: trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml (from r20503, trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml) ============================================================================== --- trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Thu Apr 4 20:15:18 2024 (r20503, copy source) +++ trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml Fri Apr 5 13:42:35 2024 (r20504) @@ -1,4 +1,4 @@ -name: OpenBSD Makefile +name: OpenBSD Autotools on: push: @@ -13,12 +13,10 @@ fail-fast: false matrix: include: - - { version: '7.4', deps: sys } - - { version: '7.4', deps: local } - - { version: '7.4', deps: small } + - { version: '7.4' } concurrency: - group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} + group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools cancel-in-progress: true runs-on: ubuntu-22.04 @@ -63,20 +61,7 @@ sync_files: false shutdown_vm: false run: | - gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - - name: Test - uses: cross-platform-actions/action@v0.23.0 - with: - architecture: x86_64 - hypervisor: qemu - memory: 4G - operating_system: openbsd - 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 + ./build/autotools/autoconfiscate.sh - name: Shutdown VM uses: cross-platform-actions/action@v0.23.0 with: |
|
From: <sv...@op...> - 2024-04-04 18:15:30
|
Author: manx Date: Thu Apr 4 20:15:18 2024 New Revision: 20503 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20503 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Thu Apr 4 20:15:00 2024 (r20502) +++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Thu Apr 4 20:15:18 2024 (r20503) @@ -7,6 +7,8 @@ ### libopenmpt 0.4.42-pre + * mpg123: Update to v1.32.6 (2024-04-04). + ### libopenmpt 0.4.41 (2024-03-24) * [**Sec**] Undefined behaviour in song length calculation with nested loops |
|
From: <sv...@op...> - 2024-04-04 18:15:11
|
Author: manx Date: Thu Apr 4 20:15:00 2024 New Revision: 20502 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20502 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 Apr 4 20:14:44 2024 (r20501) +++ branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Thu Apr 4 20:15:00 2024 (r20502) @@ -7,6 +7,8 @@ ### libopenmpt 0.5.30-pre + * mpg123: Update to v1.32.6 (2024-04-04). + ### libopenmpt 0.5.29 (2024-03-24) * [**Sec**] Undefined behaviour in song length calculation with nested loops |
|
From: <sv...@op...> - 2024-04-04 18:14:51
|
Author: manx Date: Thu Apr 4 20:14:44 2024 New Revision: 20501 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20501 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 Apr 4 20:14:22 2024 (r20500) +++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Thu Apr 4 20:14:44 2024 (r20501) @@ -7,6 +7,8 @@ ### libopenmpt 0.6.16-pre + * mpg123: Update to v1.32.6 (2024-04-04). + ### libopenmpt 0.6.15 (2024-03-24) * [**Sec**] Potential heap out-of-bounds read or write past sample end with |
|
From: <sv...@op...> - 2024-04-04 18:14:33
|
Author: manx Date: Thu Apr 4 20:14:22 2024 New Revision: 20500 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20500 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Thu Apr 4 20:13:44 2024 (r20499) +++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Thu Apr 4 20:14:22 2024 (r20500) @@ -7,6 +7,8 @@ ### libopenmpt 0.7.7-pre + * mpg123: Update to v1.32.6 (2024-04-04). + ### libopenmpt 0.7.6 (2024-03-24) * [**Sec**] Potential heap out-of-bounds read or write past sample end with |
|
From: <sv...@op...> - 2024-04-04 18:13:54
|
Author: manx Date: Thu Apr 4 20:13:44 2024 New Revision: 20499 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20499 Log: Merged revision(s) 20495 from trunk/OpenMPT: [Var] mpg123: Update to 1.32.6 (2024-04-04). ........ Modified: branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt branches/OpenMPT-1.28/include/mpg123/src/libmpg123/lfs_wrap.c branches/OpenMPT-1.28/include/mpg123/src/libmpg123/libmpg123.c branches/OpenMPT-1.28/include/mpg123/src/libmpg123/mpg123lib_intern.h branches/OpenMPT-1.28/include/mpg123/src/version.h Modified: branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt Thu Apr 4 20:13:24 2024 (r20498) +++ branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt Thu Apr 4 20:13:44 2024 (r20499) @@ -1,4 +1,4 @@ -libmpg123 library version 1.32.5 (2024-02-17). +libmpg123 library version 1.32.6 (2024-04-04). The following changes have been made: * `ports/MSVC++/config.h` has been added for MSVC builds. * `ports/Xcode/config.h` has been retained from older versions. Modified: branches/OpenMPT-1.28/include/mpg123/src/libmpg123/lfs_wrap.c ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/libmpg123/lfs_wrap.c Thu Apr 4 20:13:24 2024 (r20498) +++ branches/OpenMPT-1.28/include/mpg123/src/libmpg123/lfs_wrap.c Thu Apr 4 20:13:44 2024 (r20499) @@ -25,7 +25,7 @@ // Only activate the explicit largefile stuff here. The rest of the code shall // work with abstract 64 bit offsets, or just plain default off_t (possibly -// using _FILE_OFFSET_BYTES magic). +// using _FILE_OFFSET_BITS magic). // Note that this macro does not influence normal off_t-using code. #ifdef LFS_LARGEFILE_64 #define _LARGEFILE64_SOURCE @@ -208,10 +208,13 @@ /* After settling the data... start with some simple wrappers. */ // The fist block of wrappers is always present, using the native off_t width. +// (Exception: If explicitly disabled using FORCED_OFF_64.) // A second block mirrors that in case of sizeof(off_t)==4 with _32 suffix. // A third block follows if 64 bit off_t is available with _64 suffix, just aliasing // the int64_t functions. +#ifndef FORCED_OFF_64 + #define OFF_CONV(value, variable, handle) \ if((value) >= OFF_MIN && (value) <= OFF_MAX) \ variable = (off_t)(value); \ @@ -399,6 +402,8 @@ return MPG123_OK; } +#endif // FORCED_OFF_64 + // _32 aliases only for native 32 bit off_t // Will compilers be smart enough to optimize away the extra function call? #if SIZEOF_OFF_T == 4 @@ -523,6 +528,10 @@ #define OFF64 off_t #endif +#ifndef FORCED_OFF_64 +// When 64 bit offsets are enforced, libmpg123.c defines the _64 functions directly. +// There is no actual wrapper work, anyway. + int attribute_align_arg mpg123_open_64(mpg123_handle *mh, const char *path) { return mpg123_open(mh, path); @@ -543,6 +552,8 @@ { return mpg123_open_handle(mh, iohandle); } +#endif + int attribute_align_arg mpg123_framebyframe_decode_64(mpg123_handle *mh, OFF64 *num, unsigned char **audio, size_t *bytes) { @@ -860,6 +871,13 @@ return read(fd, buf, count); } +// In forced 64 bit offset mode, the only definitions of these are +// the _64 ones. +#ifdef FORCED_OFF_64 +#define mpg123_replace_reader mpg123_replace_reader_64 +#define mpg123_replace_reader_handle mpg123_replace_reader_handle_64 +#endif + /* Reader replacement prepares the hidden handle storage for next mpg123_open_fd() or plain mpg123_open(). */ int attribute_align_arg mpg123_replace_reader(mpg123_handle *mh, mpg123_ssize_t (*r_read) (int, void *, size_t), off_t (*r_lseek)(int, off_t, int) ) { @@ -978,6 +996,8 @@ #elif SIZEOF_OFF_T == 8 +// If 64 bit off_t is enforced, libmpg123.c already defines the _64 functions. +#ifndef FORCED_OFF_64 int attribute_align_arg mpg123_replace_reader_64(mpg123_handle *mh, mpg123_ssize_t (*r_read) (int, void *, size_t), off_t (*r_lseek)(int, off_t, int) ) { return mpg123_replace_reader(mh, r_read, r_lseek); @@ -987,5 +1007,6 @@ { return mpg123_replace_reader_handle(mh, r_read, r_lseek, cleanup); } +#endif #endif Modified: branches/OpenMPT-1.28/include/mpg123/src/libmpg123/libmpg123.c ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/libmpg123/libmpg123.c Thu Apr 4 20:13:24 2024 (r20498) +++ branches/OpenMPT-1.28/include/mpg123/src/libmpg123/libmpg123.c Thu Apr 4 20:13:44 2024 (r20499) @@ -560,6 +560,15 @@ } #ifndef PORTABLE_API + +#ifdef FORCED_OFF_64 +// Only _64 symbols for a system-wide enforced _FILE_OFFSET_BITS=64. +#define mpg123_open mpg123_open_64 +#define mpg123_open_fixed mpg123_open_fixed_64 +#define mpg123_open_fd mpg123_open_fd_64 +#define mpg123_open_handle mpg123_open_handle_64 +#endif + /* plain file access, no http! */ int attribute_align_arg mpg123_open(mpg123_handle *mh, const char *path) { @@ -579,7 +588,9 @@ // The convenience function mpg123_open_fixed() wraps over acual mpg123_open // and hence needs to have the exact same code in lfs_wrap.c. The flesh is // in INT123_open_fixed_pre() and INT123_open_fixed_post(), wich are only defined here. -int INT123_open_fixed_pre(mpg123_handle *mh, int channels, int encoding) +// Update: The open routines are just alias calls now, since the conversion to +// int64_t internally. +static int INT123_open_fixed_pre(mpg123_handle *mh, int channels, int encoding) { if(!mh) return MPG123_BAD_HANDLE; @@ -590,7 +601,7 @@ return err; } -int INT123_open_fixed_post(mpg123_handle *mh, int channels, int encoding) +static int INT123_open_fixed_post(mpg123_handle *mh, int channels, int encoding) { if(!mh) return MPG123_BAD_HANDLE; @@ -637,7 +648,7 @@ ret = INT123_open_stream_handle(mh, mh->wrapperdata); return ret; } -#endif +#endif // PORTABLE_API int attribute_align_arg mpg123_open_handle(mpg123_handle *mh, void *iohandle) { Modified: branches/OpenMPT-1.28/include/mpg123/src/libmpg123/mpg123lib_intern.h ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/libmpg123/mpg123lib_intern.h Thu Apr 4 20:13:24 2024 (r20498) +++ branches/OpenMPT-1.28/include/mpg123/src/libmpg123/mpg123lib_intern.h Thu Apr 4 20:13:44 2024 (r20499) @@ -323,9 +323,6 @@ /* Postprocessing format conversion of freshly decoded buffer. */ void INT123_postprocess_buffer(mpg123_handle *fr); -int INT123_open_fixed_pre(mpg123_handle *mh, int channels, int encoding); -int INT123_open_fixed_post(mpg123_handle *mh, int channels, int encoding); - /* If networking is enabled and we really mean internal networking, the timeout_read function is available. */ #if defined (NETWORK) && !defined (WANT_WIN32_SOCKETS) /* Does not work with win32 */ Modified: branches/OpenMPT-1.28/include/mpg123/src/version.h ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/version.h Thu Apr 4 20:13:24 2024 (r20498) +++ branches/OpenMPT-1.28/include/mpg123/src/version.h Thu Apr 4 20:13:44 2024 (r20499) @@ -16,7 +16,7 @@ // only single spaces as separator to ease parsing by build scripts #define MPG123_MAJOR 1 #define MPG123_MINOR 32 -#define MPG123_PATCH 5 +#define MPG123_PATCH 6 // Don't get too wild with that to avoid confusing m4. No brackets. // Also, it should fit well into a sane file name for the tarball. #define MPG123_SUFFIX "" |
|
From: <sv...@op...> - 2024-04-04 18:13:31
|
Author: manx Date: Thu Apr 4 20:13:24 2024 New Revision: 20498 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20498 Log: Merged revision(s) 20495 from trunk/OpenMPT: [Var] mpg123: Update to 1.32.6 (2024-04-04). ........ Modified: branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt branches/OpenMPT-1.29/include/mpg123/src/libmpg123/lfs_wrap.c branches/OpenMPT-1.29/include/mpg123/src/libmpg123/libmpg123.c branches/OpenMPT-1.29/include/mpg123/src/libmpg123/mpg123lib_intern.h branches/OpenMPT-1.29/include/mpg123/src/version.h Modified: branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt Thu Apr 4 20:13:01 2024 (r20497) +++ branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt Thu Apr 4 20:13:24 2024 (r20498) @@ -1,4 +1,4 @@ -libmpg123 library version 1.32.5 (2024-02-17). +libmpg123 library version 1.32.6 (2024-04-04). The following changes have been made: * `ports/makefile/config.h` has been added for plain `Makefile` builds. * `ports/MSVC++/config.h` has been added for MSVC builds. Modified: branches/OpenMPT-1.29/include/mpg123/src/libmpg123/lfs_wrap.c ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/src/libmpg123/lfs_wrap.c Thu Apr 4 20:13:01 2024 (r20497) +++ branches/OpenMPT-1.29/include/mpg123/src/libmpg123/lfs_wrap.c Thu Apr 4 20:13:24 2024 (r20498) @@ -25,7 +25,7 @@ // Only activate the explicit largefile stuff here. The rest of the code shall // work with abstract 64 bit offsets, or just plain default off_t (possibly -// using _FILE_OFFSET_BYTES magic). +// using _FILE_OFFSET_BITS magic). // Note that this macro does not influence normal off_t-using code. #ifdef LFS_LARGEFILE_64 #define _LARGEFILE64_SOURCE @@ -208,10 +208,13 @@ /* After settling the data... start with some simple wrappers. */ // The fist block of wrappers is always present, using the native off_t width. +// (Exception: If explicitly disabled using FORCED_OFF_64.) // A second block mirrors that in case of sizeof(off_t)==4 with _32 suffix. // A third block follows if 64 bit off_t is available with _64 suffix, just aliasing // the int64_t functions. +#ifndef FORCED_OFF_64 + #define OFF_CONV(value, variable, handle) \ if((value) >= OFF_MIN && (value) <= OFF_MAX) \ variable = (off_t)(value); \ @@ -399,6 +402,8 @@ return MPG123_OK; } +#endif // FORCED_OFF_64 + // _32 aliases only for native 32 bit off_t // Will compilers be smart enough to optimize away the extra function call? #if SIZEOF_OFF_T == 4 @@ -523,6 +528,10 @@ #define OFF64 off_t #endif +#ifndef FORCED_OFF_64 +// When 64 bit offsets are enforced, libmpg123.c defines the _64 functions directly. +// There is no actual wrapper work, anyway. + int attribute_align_arg mpg123_open_64(mpg123_handle *mh, const char *path) { return mpg123_open(mh, path); @@ -543,6 +552,8 @@ { return mpg123_open_handle(mh, iohandle); } +#endif + int attribute_align_arg mpg123_framebyframe_decode_64(mpg123_handle *mh, OFF64 *num, unsigned char **audio, size_t *bytes) { @@ -860,6 +871,13 @@ return read(fd, buf, count); } +// In forced 64 bit offset mode, the only definitions of these are +// the _64 ones. +#ifdef FORCED_OFF_64 +#define mpg123_replace_reader mpg123_replace_reader_64 +#define mpg123_replace_reader_handle mpg123_replace_reader_handle_64 +#endif + /* Reader replacement prepares the hidden handle storage for next mpg123_open_fd() or plain mpg123_open(). */ int attribute_align_arg mpg123_replace_reader(mpg123_handle *mh, mpg123_ssize_t (*r_read) (int, void *, size_t), off_t (*r_lseek)(int, off_t, int) ) { @@ -978,6 +996,8 @@ #elif SIZEOF_OFF_T == 8 +// If 64 bit off_t is enforced, libmpg123.c already defines the _64 functions. +#ifndef FORCED_OFF_64 int attribute_align_arg mpg123_replace_reader_64(mpg123_handle *mh, mpg123_ssize_t (*r_read) (int, void *, size_t), off_t (*r_lseek)(int, off_t, int) ) { return mpg123_replace_reader(mh, r_read, r_lseek); @@ -987,5 +1007,6 @@ { return mpg123_replace_reader_handle(mh, r_read, r_lseek, cleanup); } +#endif #endif Modified: branches/OpenMPT-1.29/include/mpg123/src/libmpg123/libmpg123.c ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/src/libmpg123/libmpg123.c Thu Apr 4 20:13:01 2024 (r20497) +++ branches/OpenMPT-1.29/include/mpg123/src/libmpg123/libmpg123.c Thu Apr 4 20:13:24 2024 (r20498) @@ -560,6 +560,15 @@ } #ifndef PORTABLE_API + +#ifdef FORCED_OFF_64 +// Only _64 symbols for a system-wide enforced _FILE_OFFSET_BITS=64. +#define mpg123_open mpg123_open_64 +#define mpg123_open_fixed mpg123_open_fixed_64 +#define mpg123_open_fd mpg123_open_fd_64 +#define mpg123_open_handle mpg123_open_handle_64 +#endif + /* plain file access, no http! */ int attribute_align_arg mpg123_open(mpg123_handle *mh, const char *path) { @@ -579,7 +588,9 @@ // The convenience function mpg123_open_fixed() wraps over acual mpg123_open // and hence needs to have the exact same code in lfs_wrap.c. The flesh is // in INT123_open_fixed_pre() and INT123_open_fixed_post(), wich are only defined here. -int INT123_open_fixed_pre(mpg123_handle *mh, int channels, int encoding) +// Update: The open routines are just alias calls now, since the conversion to +// int64_t internally. +static int INT123_open_fixed_pre(mpg123_handle *mh, int channels, int encoding) { if(!mh) return MPG123_BAD_HANDLE; @@ -590,7 +601,7 @@ return err; } -int INT123_open_fixed_post(mpg123_handle *mh, int channels, int encoding) +static int INT123_open_fixed_post(mpg123_handle *mh, int channels, int encoding) { if(!mh) return MPG123_BAD_HANDLE; @@ -637,7 +648,7 @@ ret = INT123_open_stream_handle(mh, mh->wrapperdata); return ret; } -#endif +#endif // PORTABLE_API int attribute_align_arg mpg123_open_handle(mpg123_handle *mh, void *iohandle) { Modified: branches/OpenMPT-1.29/include/mpg123/src/libmpg123/mpg123lib_intern.h ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/src/libmpg123/mpg123lib_intern.h Thu Apr 4 20:13:01 2024 (r20497) +++ branches/OpenMPT-1.29/include/mpg123/src/libmpg123/mpg123lib_intern.h Thu Apr 4 20:13:24 2024 (r20498) @@ -323,9 +323,6 @@ /* Postprocessing format conversion of freshly decoded buffer. */ void INT123_postprocess_buffer(mpg123_handle *fr); -int INT123_open_fixed_pre(mpg123_handle *mh, int channels, int encoding); -int INT123_open_fixed_post(mpg123_handle *mh, int channels, int encoding); - /* If networking is enabled and we really mean internal networking, the timeout_read function is available. */ #if defined (NETWORK) && !defined (WANT_WIN32_SOCKETS) /* Does not work with win32 */ Modified: branches/OpenMPT-1.29/include/mpg123/src/version.h ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/src/version.h Thu Apr 4 20:13:01 2024 (r20497) +++ branches/OpenMPT-1.29/include/mpg123/src/version.h Thu Apr 4 20:13:24 2024 (r20498) @@ -16,7 +16,7 @@ // only single spaces as separator to ease parsing by build scripts #define MPG123_MAJOR 1 #define MPG123_MINOR 32 -#define MPG123_PATCH 5 +#define MPG123_PATCH 6 // Don't get too wild with that to avoid confusing m4. No brackets. // Also, it should fit well into a sane file name for the tarball. #define MPG123_SUFFIX "" |
|
From: <sv...@op...> - 2024-04-04 18:13:08
|
Author: manx Date: Thu Apr 4 20:13:01 2024 New Revision: 20497 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20497 Log: Merged revision(s) 20495 from trunk/OpenMPT: [Var] mpg123: Update to 1.32.6 (2024-04-04). ........ Modified: branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt branches/OpenMPT-1.30/include/mpg123/src/libmpg123/lfs_wrap.c branches/OpenMPT-1.30/include/mpg123/src/libmpg123/libmpg123.c branches/OpenMPT-1.30/include/mpg123/src/libmpg123/mpg123lib_intern.h branches/OpenMPT-1.30/include/mpg123/src/version.h Modified: branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt Thu Apr 4 20:12:41 2024 (r20496) +++ branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt Thu Apr 4 20:13:01 2024 (r20497) @@ -1,4 +1,4 @@ -libmpg123 library version 1.32.5 (2024-02-17). +libmpg123 library version 1.32.6 (2024-04-04). The following changes have been made: * `ports/makefile/config.h` has been added for plain `Makefile` builds. * `ports/MSVC++/config.h` has been added for MSVC builds. Modified: branches/OpenMPT-1.30/include/mpg123/src/libmpg123/lfs_wrap.c ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/src/libmpg123/lfs_wrap.c Thu Apr 4 20:12:41 2024 (r20496) +++ branches/OpenMPT-1.30/include/mpg123/src/libmpg123/lfs_wrap.c Thu Apr 4 20:13:01 2024 (r20497) @@ -25,7 +25,7 @@ // Only activate the explicit largefile stuff here. The rest of the code shall // work with abstract 64 bit offsets, or just plain default off_t (possibly -// using _FILE_OFFSET_BYTES magic). +// using _FILE_OFFSET_BITS magic). // Note that this macro does not influence normal off_t-using code. #ifdef LFS_LARGEFILE_64 #define _LARGEFILE64_SOURCE @@ -208,10 +208,13 @@ /* After settling the data... start with some simple wrappers. */ // The fist block of wrappers is always present, using the native off_t width. +// (Exception: If explicitly disabled using FORCED_OFF_64.) // A second block mirrors that in case of sizeof(off_t)==4 with _32 suffix. // A third block follows if 64 bit off_t is available with _64 suffix, just aliasing // the int64_t functions. +#ifndef FORCED_OFF_64 + #define OFF_CONV(value, variable, handle) \ if((value) >= OFF_MIN && (value) <= OFF_MAX) \ variable = (off_t)(value); \ @@ -399,6 +402,8 @@ return MPG123_OK; } +#endif // FORCED_OFF_64 + // _32 aliases only for native 32 bit off_t // Will compilers be smart enough to optimize away the extra function call? #if SIZEOF_OFF_T == 4 @@ -523,6 +528,10 @@ #define OFF64 off_t #endif +#ifndef FORCED_OFF_64 +// When 64 bit offsets are enforced, libmpg123.c defines the _64 functions directly. +// There is no actual wrapper work, anyway. + int attribute_align_arg mpg123_open_64(mpg123_handle *mh, const char *path) { return mpg123_open(mh, path); @@ -543,6 +552,8 @@ { return mpg123_open_handle(mh, iohandle); } +#endif + int attribute_align_arg mpg123_framebyframe_decode_64(mpg123_handle *mh, OFF64 *num, unsigned char **audio, size_t *bytes) { @@ -860,6 +871,13 @@ return read(fd, buf, count); } +// In forced 64 bit offset mode, the only definitions of these are +// the _64 ones. +#ifdef FORCED_OFF_64 +#define mpg123_replace_reader mpg123_replace_reader_64 +#define mpg123_replace_reader_handle mpg123_replace_reader_handle_64 +#endif + /* Reader replacement prepares the hidden handle storage for next mpg123_open_fd() or plain mpg123_open(). */ int attribute_align_arg mpg123_replace_reader(mpg123_handle *mh, mpg123_ssize_t (*r_read) (int, void *, size_t), off_t (*r_lseek)(int, off_t, int) ) { @@ -978,6 +996,8 @@ #elif SIZEOF_OFF_T == 8 +// If 64 bit off_t is enforced, libmpg123.c already defines the _64 functions. +#ifndef FORCED_OFF_64 int attribute_align_arg mpg123_replace_reader_64(mpg123_handle *mh, mpg123_ssize_t (*r_read) (int, void *, size_t), off_t (*r_lseek)(int, off_t, int) ) { return mpg123_replace_reader(mh, r_read, r_lseek); @@ -987,5 +1007,6 @@ { return mpg123_replace_reader_handle(mh, r_read, r_lseek, cleanup); } +#endif #endif Modified: branches/OpenMPT-1.30/include/mpg123/src/libmpg123/libmpg123.c ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/src/libmpg123/libmpg123.c Thu Apr 4 20:12:41 2024 (r20496) +++ branches/OpenMPT-1.30/include/mpg123/src/libmpg123/libmpg123.c Thu Apr 4 20:13:01 2024 (r20497) @@ -560,6 +560,15 @@ } #ifndef PORTABLE_API + +#ifdef FORCED_OFF_64 +// Only _64 symbols for a system-wide enforced _FILE_OFFSET_BITS=64. +#define mpg123_open mpg123_open_64 +#define mpg123_open_fixed mpg123_open_fixed_64 +#define mpg123_open_fd mpg123_open_fd_64 +#define mpg123_open_handle mpg123_open_handle_64 +#endif + /* plain file access, no http! */ int attribute_align_arg mpg123_open(mpg123_handle *mh, const char *path) { @@ -579,7 +588,9 @@ // The convenience function mpg123_open_fixed() wraps over acual mpg123_open // and hence needs to have the exact same code in lfs_wrap.c. The flesh is // in INT123_open_fixed_pre() and INT123_open_fixed_post(), wich are only defined here. -int INT123_open_fixed_pre(mpg123_handle *mh, int channels, int encoding) +// Update: The open routines are just alias calls now, since the conversion to +// int64_t internally. +static int INT123_open_fixed_pre(mpg123_handle *mh, int channels, int encoding) { if(!mh) return MPG123_BAD_HANDLE; @@ -590,7 +601,7 @@ return err; } -int INT123_open_fixed_post(mpg123_handle *mh, int channels, int encoding) +static int INT123_open_fixed_post(mpg123_handle *mh, int channels, int encoding) { if(!mh) return MPG123_BAD_HANDLE; @@ -637,7 +648,7 @@ ret = INT123_open_stream_handle(mh, mh->wrapperdata); return ret; } -#endif +#endif // PORTABLE_API int attribute_align_arg mpg123_open_handle(mpg123_handle *mh, void *iohandle) { Modified: branches/OpenMPT-1.30/include/mpg123/src/libmpg123/mpg123lib_intern.h ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/src/libmpg123/mpg123lib_intern.h Thu Apr 4 20:12:41 2024 (r20496) +++ branches/OpenMPT-1.30/include/mpg123/src/libmpg123/mpg123lib_intern.h Thu Apr 4 20:13:01 2024 (r20497) @@ -323,9 +323,6 @@ /* Postprocessing format conversion of freshly decoded buffer. */ void INT123_postprocess_buffer(mpg123_handle *fr); -int INT123_open_fixed_pre(mpg123_handle *mh, int channels, int encoding); -int INT123_open_fixed_post(mpg123_handle *mh, int channels, int encoding); - /* If networking is enabled and we really mean internal networking, the timeout_read function is available. */ #if defined (NETWORK) && !defined (WANT_WIN32_SOCKETS) /* Does not work with win32 */ Modified: branches/OpenMPT-1.30/include/mpg123/src/version.h ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/src/version.h Thu Apr 4 20:12:41 2024 (r20496) +++ branches/OpenMPT-1.30/include/mpg123/src/version.h Thu Apr 4 20:13:01 2024 (r20497) @@ -16,7 +16,7 @@ // only single spaces as separator to ease parsing by build scripts #define MPG123_MAJOR 1 #define MPG123_MINOR 32 -#define MPG123_PATCH 5 +#define MPG123_PATCH 6 // Don't get too wild with that to avoid confusing m4. No brackets. // Also, it should fit well into a sane file name for the tarball. #define MPG123_SUFFIX "" |
|
From: <sv...@op...> - 2024-04-04 18:12:53
|
Author: manx Date: Thu Apr 4 20:12:41 2024 New Revision: 20496 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20496 Log: Merged revision(s) 20495 from trunk/OpenMPT: [Var] mpg123: Update to 1.32.6 (2024-04-04). ........ Modified: branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt branches/OpenMPT-1.31/include/mpg123/src/libmpg123/lfs_wrap.c branches/OpenMPT-1.31/include/mpg123/src/libmpg123/libmpg123.c branches/OpenMPT-1.31/include/mpg123/src/libmpg123/mpg123lib_intern.h branches/OpenMPT-1.31/include/mpg123/src/version.h Modified: branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Thu Apr 4 20:12:19 2024 (r20495) +++ branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Thu Apr 4 20:12:41 2024 (r20496) @@ -1,4 +1,4 @@ -libmpg123 library version 1.32.5 (2024-02-17). +libmpg123 library version 1.32.6 (2024-04-04). The following changes have been made: * `ports/makefile/config.h` has been added for plain `Makefile` builds. * `ports/MSVC++/config.h` has been added for MSVC builds. Modified: branches/OpenMPT-1.31/include/mpg123/src/libmpg123/lfs_wrap.c ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/lfs_wrap.c Thu Apr 4 20:12:19 2024 (r20495) +++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/lfs_wrap.c Thu Apr 4 20:12:41 2024 (r20496) @@ -25,7 +25,7 @@ // Only activate the explicit largefile stuff here. The rest of the code shall // work with abstract 64 bit offsets, or just plain default off_t (possibly -// using _FILE_OFFSET_BYTES magic). +// using _FILE_OFFSET_BITS magic). // Note that this macro does not influence normal off_t-using code. #ifdef LFS_LARGEFILE_64 #define _LARGEFILE64_SOURCE @@ -208,10 +208,13 @@ /* After settling the data... start with some simple wrappers. */ // The fist block of wrappers is always present, using the native off_t width. +// (Exception: If explicitly disabled using FORCED_OFF_64.) // A second block mirrors that in case of sizeof(off_t)==4 with _32 suffix. // A third block follows if 64 bit off_t is available with _64 suffix, just aliasing // the int64_t functions. +#ifndef FORCED_OFF_64 + #define OFF_CONV(value, variable, handle) \ if((value) >= OFF_MIN && (value) <= OFF_MAX) \ variable = (off_t)(value); \ @@ -399,6 +402,8 @@ return MPG123_OK; } +#endif // FORCED_OFF_64 + // _32 aliases only for native 32 bit off_t // Will compilers be smart enough to optimize away the extra function call? #if SIZEOF_OFF_T == 4 @@ -523,6 +528,10 @@ #define OFF64 off_t #endif +#ifndef FORCED_OFF_64 +// When 64 bit offsets are enforced, libmpg123.c defines the _64 functions directly. +// There is no actual wrapper work, anyway. + int attribute_align_arg mpg123_open_64(mpg123_handle *mh, const char *path) { return mpg123_open(mh, path); @@ -543,6 +552,8 @@ { return mpg123_open_handle(mh, iohandle); } +#endif + int attribute_align_arg mpg123_framebyframe_decode_64(mpg123_handle *mh, OFF64 *num, unsigned char **audio, size_t *bytes) { @@ -860,6 +871,13 @@ return read(fd, buf, count); } +// In forced 64 bit offset mode, the only definitions of these are +// the _64 ones. +#ifdef FORCED_OFF_64 +#define mpg123_replace_reader mpg123_replace_reader_64 +#define mpg123_replace_reader_handle mpg123_replace_reader_handle_64 +#endif + /* Reader replacement prepares the hidden handle storage for next mpg123_open_fd() or plain mpg123_open(). */ int attribute_align_arg mpg123_replace_reader(mpg123_handle *mh, mpg123_ssize_t (*r_read) (int, void *, size_t), off_t (*r_lseek)(int, off_t, int) ) { @@ -978,6 +996,8 @@ #elif SIZEOF_OFF_T == 8 +// If 64 bit off_t is enforced, libmpg123.c already defines the _64 functions. +#ifndef FORCED_OFF_64 int attribute_align_arg mpg123_replace_reader_64(mpg123_handle *mh, mpg123_ssize_t (*r_read) (int, void *, size_t), off_t (*r_lseek)(int, off_t, int) ) { return mpg123_replace_reader(mh, r_read, r_lseek); @@ -987,5 +1007,6 @@ { return mpg123_replace_reader_handle(mh, r_read, r_lseek, cleanup); } +#endif #endif Modified: branches/OpenMPT-1.31/include/mpg123/src/libmpg123/libmpg123.c ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/libmpg123.c Thu Apr 4 20:12:19 2024 (r20495) +++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/libmpg123.c Thu Apr 4 20:12:41 2024 (r20496) @@ -560,6 +560,15 @@ } #ifndef PORTABLE_API + +#ifdef FORCED_OFF_64 +// Only _64 symbols for a system-wide enforced _FILE_OFFSET_BITS=64. +#define mpg123_open mpg123_open_64 +#define mpg123_open_fixed mpg123_open_fixed_64 +#define mpg123_open_fd mpg123_open_fd_64 +#define mpg123_open_handle mpg123_open_handle_64 +#endif + /* plain file access, no http! */ int attribute_align_arg mpg123_open(mpg123_handle *mh, const char *path) { @@ -579,7 +588,9 @@ // The convenience function mpg123_open_fixed() wraps over acual mpg123_open // and hence needs to have the exact same code in lfs_wrap.c. The flesh is // in INT123_open_fixed_pre() and INT123_open_fixed_post(), wich are only defined here. -int INT123_open_fixed_pre(mpg123_handle *mh, int channels, int encoding) +// Update: The open routines are just alias calls now, since the conversion to +// int64_t internally. +static int INT123_open_fixed_pre(mpg123_handle *mh, int channels, int encoding) { if(!mh) return MPG123_BAD_HANDLE; @@ -590,7 +601,7 @@ return err; } -int INT123_open_fixed_post(mpg123_handle *mh, int channels, int encoding) +static int INT123_open_fixed_post(mpg123_handle *mh, int channels, int encoding) { if(!mh) return MPG123_BAD_HANDLE; @@ -637,7 +648,7 @@ ret = INT123_open_stream_handle(mh, mh->wrapperdata); return ret; } -#endif +#endif // PORTABLE_API int attribute_align_arg mpg123_open_handle(mpg123_handle *mh, void *iohandle) { Modified: branches/OpenMPT-1.31/include/mpg123/src/libmpg123/mpg123lib_intern.h ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/mpg123lib_intern.h Thu Apr 4 20:12:19 2024 (r20495) +++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/mpg123lib_intern.h Thu Apr 4 20:12:41 2024 (r20496) @@ -323,9 +323,6 @@ /* Postprocessing format conversion of freshly decoded buffer. */ void INT123_postprocess_buffer(mpg123_handle *fr); -int INT123_open_fixed_pre(mpg123_handle *mh, int channels, int encoding); -int INT123_open_fixed_post(mpg123_handle *mh, int channels, int encoding); - /* If networking is enabled and we really mean internal networking, the timeout_read function is available. */ #if defined (NETWORK) && !defined (WANT_WIN32_SOCKETS) /* Does not work with win32 */ Modified: branches/OpenMPT-1.31/include/mpg123/src/version.h ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/version.h Thu Apr 4 20:12:19 2024 (r20495) +++ branches/OpenMPT-1.31/include/mpg123/src/version.h Thu Apr 4 20:12:41 2024 (r20496) @@ -16,7 +16,7 @@ // only single spaces as separator to ease parsing by build scripts #define MPG123_MAJOR 1 #define MPG123_MINOR 32 -#define MPG123_PATCH 5 +#define MPG123_PATCH 6 // Don't get too wild with that to avoid confusing m4. No brackets. // Also, it should fit well into a sane file name for the tarball. #define MPG123_SUFFIX "" |
|
From: <sv...@op...> - 2024-04-04 18:12:31
|
Author: manx Date: Thu Apr 4 20:12:19 2024 New Revision: 20495 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20495 Log: [Var] mpg123: Update to 1.32.6 (2024-04-04). Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt trunk/OpenMPT/include/mpg123/src/libmpg123/lfs_wrap.c trunk/OpenMPT/include/mpg123/src/libmpg123/libmpg123.c trunk/OpenMPT/include/mpg123/src/libmpg123/mpg123lib_intern.h trunk/OpenMPT/include/mpg123/src/version.h Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/mpg123/OpenMPT.txt Thu Apr 4 20:08:32 2024 (r20494) +++ trunk/OpenMPT/include/mpg123/OpenMPT.txt Thu Apr 4 20:12:19 2024 (r20495) @@ -1,4 +1,4 @@ -libmpg123 library version 1.32.5 (2024-02-17). +libmpg123 library version 1.32.6 (2024-04-04). The following changes have been made: * `ports/makefile/config.h` has been added for plain `Makefile` builds. * `ports/MSVC++/config.h` has been added for MSVC builds. Modified: trunk/OpenMPT/include/mpg123/src/libmpg123/lfs_wrap.c ============================================================================== --- trunk/OpenMPT/include/mpg123/src/libmpg123/lfs_wrap.c Thu Apr 4 20:08:32 2024 (r20494) +++ trunk/OpenMPT/include/mpg123/src/libmpg123/lfs_wrap.c Thu Apr 4 20:12:19 2024 (r20495) @@ -25,7 +25,7 @@ // Only activate the explicit largefile stuff here. The rest of the code shall // work with abstract 64 bit offsets, or just plain default off_t (possibly -// using _FILE_OFFSET_BYTES magic). +// using _FILE_OFFSET_BITS magic). // Note that this macro does not influence normal off_t-using code. #ifdef LFS_LARGEFILE_64 #define _LARGEFILE64_SOURCE @@ -208,10 +208,13 @@ /* After settling the data... start with some simple wrappers. */ // The fist block of wrappers is always present, using the native off_t width. +// (Exception: If explicitly disabled using FORCED_OFF_64.) // A second block mirrors that in case of sizeof(off_t)==4 with _32 suffix. // A third block follows if 64 bit off_t is available with _64 suffix, just aliasing // the int64_t functions. +#ifndef FORCED_OFF_64 + #define OFF_CONV(value, variable, handle) \ if((value) >= OFF_MIN && (value) <= OFF_MAX) \ variable = (off_t)(value); \ @@ -399,6 +402,8 @@ return MPG123_OK; } +#endif // FORCED_OFF_64 + // _32 aliases only for native 32 bit off_t // Will compilers be smart enough to optimize away the extra function call? #if SIZEOF_OFF_T == 4 @@ -523,6 +528,10 @@ #define OFF64 off_t #endif +#ifndef FORCED_OFF_64 +// When 64 bit offsets are enforced, libmpg123.c defines the _64 functions directly. +// There is no actual wrapper work, anyway. + int attribute_align_arg mpg123_open_64(mpg123_handle *mh, const char *path) { return mpg123_open(mh, path); @@ -543,6 +552,8 @@ { return mpg123_open_handle(mh, iohandle); } +#endif + int attribute_align_arg mpg123_framebyframe_decode_64(mpg123_handle *mh, OFF64 *num, unsigned char **audio, size_t *bytes) { @@ -860,6 +871,13 @@ return read(fd, buf, count); } +// In forced 64 bit offset mode, the only definitions of these are +// the _64 ones. +#ifdef FORCED_OFF_64 +#define mpg123_replace_reader mpg123_replace_reader_64 +#define mpg123_replace_reader_handle mpg123_replace_reader_handle_64 +#endif + /* Reader replacement prepares the hidden handle storage for next mpg123_open_fd() or plain mpg123_open(). */ int attribute_align_arg mpg123_replace_reader(mpg123_handle *mh, mpg123_ssize_t (*r_read) (int, void *, size_t), off_t (*r_lseek)(int, off_t, int) ) { @@ -978,6 +996,8 @@ #elif SIZEOF_OFF_T == 8 +// If 64 bit off_t is enforced, libmpg123.c already defines the _64 functions. +#ifndef FORCED_OFF_64 int attribute_align_arg mpg123_replace_reader_64(mpg123_handle *mh, mpg123_ssize_t (*r_read) (int, void *, size_t), off_t (*r_lseek)(int, off_t, int) ) { return mpg123_replace_reader(mh, r_read, r_lseek); @@ -987,5 +1007,6 @@ { return mpg123_replace_reader_handle(mh, r_read, r_lseek, cleanup); } +#endif #endif Modified: trunk/OpenMPT/include/mpg123/src/libmpg123/libmpg123.c ============================================================================== --- trunk/OpenMPT/include/mpg123/src/libmpg123/libmpg123.c Thu Apr 4 20:08:32 2024 (r20494) +++ trunk/OpenMPT/include/mpg123/src/libmpg123/libmpg123.c Thu Apr 4 20:12:19 2024 (r20495) @@ -560,6 +560,15 @@ } #ifndef PORTABLE_API + +#ifdef FORCED_OFF_64 +// Only _64 symbols for a system-wide enforced _FILE_OFFSET_BITS=64. +#define mpg123_open mpg123_open_64 +#define mpg123_open_fixed mpg123_open_fixed_64 +#define mpg123_open_fd mpg123_open_fd_64 +#define mpg123_open_handle mpg123_open_handle_64 +#endif + /* plain file access, no http! */ int attribute_align_arg mpg123_open(mpg123_handle *mh, const char *path) { @@ -579,7 +588,9 @@ // The convenience function mpg123_open_fixed() wraps over acual mpg123_open // and hence needs to have the exact same code in lfs_wrap.c. The flesh is // in INT123_open_fixed_pre() and INT123_open_fixed_post(), wich are only defined here. -int INT123_open_fixed_pre(mpg123_handle *mh, int channels, int encoding) +// Update: The open routines are just alias calls now, since the conversion to +// int64_t internally. +static int INT123_open_fixed_pre(mpg123_handle *mh, int channels, int encoding) { if(!mh) return MPG123_BAD_HANDLE; @@ -590,7 +601,7 @@ return err; } -int INT123_open_fixed_post(mpg123_handle *mh, int channels, int encoding) +static int INT123_open_fixed_post(mpg123_handle *mh, int channels, int encoding) { if(!mh) return MPG123_BAD_HANDLE; @@ -637,7 +648,7 @@ ret = INT123_open_stream_handle(mh, mh->wrapperdata); return ret; } -#endif +#endif // PORTABLE_API int attribute_align_arg mpg123_open_handle(mpg123_handle *mh, void *iohandle) { Modified: trunk/OpenMPT/include/mpg123/src/libmpg123/mpg123lib_intern.h ============================================================================== --- trunk/OpenMPT/include/mpg123/src/libmpg123/mpg123lib_intern.h Thu Apr 4 20:08:32 2024 (r20494) +++ trunk/OpenMPT/include/mpg123/src/libmpg123/mpg123lib_intern.h Thu Apr 4 20:12:19 2024 (r20495) @@ -323,9 +323,6 @@ /* Postprocessing format conversion of freshly decoded buffer. */ void INT123_postprocess_buffer(mpg123_handle *fr); -int INT123_open_fixed_pre(mpg123_handle *mh, int channels, int encoding); -int INT123_open_fixed_post(mpg123_handle *mh, int channels, int encoding); - /* If networking is enabled and we really mean internal networking, the timeout_read function is available. */ #if defined (NETWORK) && !defined (WANT_WIN32_SOCKETS) /* Does not work with win32 */ Modified: trunk/OpenMPT/include/mpg123/src/version.h ============================================================================== --- trunk/OpenMPT/include/mpg123/src/version.h Thu Apr 4 20:08:32 2024 (r20494) +++ trunk/OpenMPT/include/mpg123/src/version.h Thu Apr 4 20:12:19 2024 (r20495) @@ -16,7 +16,7 @@ // only single spaces as separator to ease parsing by build scripts #define MPG123_MAJOR 1 #define MPG123_MINOR 32 -#define MPG123_PATCH 5 +#define MPG123_PATCH 6 // Don't get too wild with that to avoid confusing m4. No brackets. // Also, it should fit well into a sane file name for the tarball. #define MPG123_SUFFIX "" |
|
From: <sv...@op...> - 2024-04-04 18:08:42
|
Author: manx Date: Thu Apr 4 20:08:32 2024 New Revision: 20494 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20494 Log: [Imp] build: Autotools: Support running autoconfiscate on BSD system. Modified: trunk/OpenMPT/build/autotools/autoconfiscate.sh Modified: trunk/OpenMPT/build/autotools/autoconfiscate.sh ============================================================================== --- trunk/OpenMPT/build/autotools/autoconfiscate.sh Thu Apr 4 17:35:16 2024 (r20493) +++ trunk/OpenMPT/build/autotools/autoconfiscate.sh Thu Apr 4 20:08:32 2024 (r20494) @@ -9,11 +9,19 @@ # checkout. The invests no effort in verifying this precondition. # +echo "Detecting OS ..." +UNAME_S="$(uname -s)" +if [[ $UNAME_S == *"BSD"* ]]; then + MAKE=gmake +else + MAKE=make +fi + echo "Gathering version ..." . libopenmpt/libopenmpt_version.mk echo "Cleaning local build ..." -make clean +$MAKE clean echo "Cleaning dist-autotools.tar ..." rm -rf bin/dist-autotools.tar || true @@ -188,14 +196,14 @@ echo " BUILD_SVNDATE=${BUILD_SVNDATE}" echo "Building man pages ..." -make bin/openmpt123.1 +$MAKE bin/openmpt123.1 echo "Copying man pages ..." mkdir bin/dist-autotools/man cp bin/openmpt123.1 bin/dist-autotools/man/openmpt123.1 echo "Cleaning local buid ..." -make clean +$MAKE clean echo "Changing to autotools package directory ..." OLDDIR="$(pwd)" @@ -239,24 +247,23 @@ ./configure echo "Running 'make dist' ..." -make dist +$MAKE dist echo "Running 'make distcheck' ..." -#make distcheck ( - make distcheck 3>&1 1>&2 2>&3 | ( grep -v 'libtool: install: warning:' || true ) | ( grep -v 'libtool: warning: remember to run' || true ) | ( grep -v "libtool: warning: '.*la' has not been installed" || true ) + $MAKE distcheck 3>&1 1>&2 2>&3 | ( grep -v 'libtool: install: warning:' || true ) | ( grep -v 'libtool: warning: remember to run' || true ) | ( grep -v "libtool: warning: '.*la' has not been installed" || true ) exit ${PIPESTATUS[0]} ) 3>&1 1>&2 2>&3 echo "Running 'make' ..." -make +$MAKE echo "Running 'make check' ..." -make check +$MAKE check echo "Building dist-autotools.tar ..." cd "$OLDDIR" -MPT_LIBOPENMPT_VERSION=$(make distversion-tarball) +MPT_LIBOPENMPT_VERSION=$($MAKE distversion-tarball) cd bin/dist-autotools rm -rf libopenmpt mkdir -p libopenmpt/src.autotools/$MPT_LIBOPENMPT_VERSION/ |
|
From: <sv...@op...> - 2024-04-04 15:35:28
|
Author: manx Date: Thu Apr 4 17:35:16 2024 New Revision: 20493 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20493 Log: Merged revision(s) 20491-20492 from trunk/OpenMPT: [Mod] build: CI: GitHub: Update NetBSD CPA to commit 141cc293701219fd2f72b3abd9ca1fc322cf7d84. [Mod] build: CI: GitHub: Update NetBSD to 10.0. ........ [Mod] build: CI: GitHub: Add NetBSD 9.3 back. ........ Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Thu Apr 4 16:08:09 2024 (r20492) +++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Thu Apr 4 17:35:16 2024 (r20493) @@ -11,9 +11,12 @@ fail-fast: false matrix: include: - - { version: '9.3', deps: sys } - - { version: '9.3', deps: local } - - { version: '9.3', deps: small } + - { version: '10.0', deps: sys } + - { version: '10.0', deps: local } + - { version: '10.0', deps: small } + - { 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}} @@ -25,7 +28,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: architecture: x86_64 hypervisor: qemu @@ -37,7 +40,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: architecture: x86_64 hypervisor: qemu @@ -56,7 +59,7 @@ sudo pkgin -y install help2man #sudo pkgin -y install doxygen # broken - name: Build - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: architecture: x86_64 hypervisor: qemu @@ -69,7 +72,7 @@ run: | gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - name: Test - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: architecture: x86_64 hypervisor: qemu @@ -82,7 +85,7 @@ run: | gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check - name: Shutdown VM - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: architecture: x86_64 hypervisor: qemu |
|
From: <sv...@op...> - 2024-04-04 14:08:16
|
Author: manx Date: Thu Apr 4 16:08:09 2024 New Revision: 20492 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20492 Log: [Mod] build: CI: GitHub: Add NetBSD 9.3 back. Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Thu Apr 4 15:40:15 2024 (r20491) +++ trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Thu Apr 4 16:08:09 2024 (r20492) @@ -16,6 +16,9 @@ - { version: '10.0', deps: sys } - { version: '10.0', deps: local } - { version: '10.0', deps: small } + - { 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}} |
|
From: <sv...@op...> - 2024-04-04 13:40:27
|
Author: manx Date: Thu Apr 4 15:40:15 2024 New Revision: 20491 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20491 Log: [Mod] build: CI: GitHub: Update NetBSD CPA to commit 141cc293701219fd2f72b3abd9ca1fc322cf7d84. [Mod] build: CI: GitHub: Update NetBSD to 10.0. Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Wed Apr 3 20:27:21 2024 (r20490) +++ trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Thu Apr 4 15:40:15 2024 (r20491) @@ -13,9 +13,9 @@ fail-fast: false matrix: include: - - { version: '9.3', deps: sys } - - { version: '9.3', deps: local } - - { version: '9.3', deps: small } + - { version: '10.0', deps: sys } + - { version: '10.0', deps: local } + - { version: '10.0', deps: small } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} @@ -27,7 +27,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: architecture: x86_64 hypervisor: qemu @@ -39,7 +39,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: architecture: x86_64 hypervisor: qemu @@ -58,7 +58,7 @@ sudo pkgin -y install help2man #sudo pkgin -y install doxygen # broken - name: Build - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: architecture: x86_64 hypervisor: qemu @@ -71,7 +71,7 @@ run: | gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - name: Test - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: architecture: x86_64 hypervisor: qemu @@ -84,7 +84,7 @@ run: | gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check - name: Shutdown VM - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: architecture: x86_64 hypervisor: qemu |
|
From: <sv...@op...> - 2024-04-03 18:29:45
|
Author: sagamusix Revision: 20490 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,2 @@ -[Ref] Add harder-to-misuse overload for CInputHandler::GetKeyEventType. \ No newline at end of file +[Ref] Add harder-to-misuse overload for CInputHandler::GetKeyEventType. +[Mod] Add a few more keys to exception list of common keys used for typing in CInputHandler::IsKeyPressHandledByTextBox. \ No newline at end of file |
|
From: <sv...@op...> - 2024-04-03 18:27:33
|
Author: sagamusix Date: Wed Apr 3 20:27:21 2024 New Revision: 20490 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20490 Log: [Ref] Add harder-to-misuse overload for CInputHandler::GetKeyEventType. Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp trunk/OpenMPT/mptrack/InputHandler.cpp trunk/OpenMPT/mptrack/InputHandler.h trunk/OpenMPT/mptrack/view_com.cpp Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_ins.cpp Wed Apr 3 20:24:00 2024 (r20489) +++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp Wed Apr 3 20:27:21 2024 (r20490) @@ -95,11 +95,8 @@ //The key was not handled by a command, but it might still be useful if (pMsg->message == WM_CHAR) //key is a character { - UINT nFlags = HIWORD(pMsg->lParam); - KeyEventType kT = CMainFrame::GetInputHandler()->GetKeyEventType(nFlags); - - if (kT == kKeyEventDown) - if (HandleChar(wParam)) + if(CInputHandler::GetKeyEventType(*pMsg) == kKeyEventDown) + if(HandleChar(wParam)) return true; } else if (pMsg->message == WM_KEYDOWN) //key is not a character Modified: trunk/OpenMPT/mptrack/InputHandler.cpp ============================================================================== --- trunk/OpenMPT/mptrack/InputHandler.cpp Wed Apr 3 20:24:00 2024 (r20489) +++ trunk/OpenMPT/mptrack/InputHandler.cpp Wed Apr 3 20:27:21 2024 (r20490) @@ -348,6 +348,12 @@ } +KeyEventType CInputHandler::GetKeyEventType(const MSG &msg) +{ + return GetKeyEventType(HIWORD(msg.lParam)); +} + + KeyEventType CInputHandler::GetKeyEventType(UINT nFlags) { if (nFlags & TRANSITIONBIT) @@ -637,9 +643,11 @@ if(!GetModifierMask().test_any_except(ModShift)) { if((key >= 'A' && key <= 'Z') || (key >= '0' && key <= '9') - || key == VK_DIVIDE || key == VK_MULTIPLY || key == VK_SPACE || key == VK_CAPITAL + || (key >= VK_MULTIPLY && key <= VK_DIVIDE) || key == VK_SPACE || key == VK_CAPITAL || (key >= VK_OEM_1 && key <= VK_OEM_3) || (key >= VK_OEM_4 && key <= VK_OEM_8)) return true; + if((key >= VK_NUMPAD0 && key <= VK_NUMPAD9) && GetModifierMask() == ModNone) + return true; if(key == VK_RETURN && (GetWindowLong(hWnd, GWL_STYLE) & ES_MULTILINE)) return true; } Modified: trunk/OpenMPT/mptrack/InputHandler.h ============================================================================== --- trunk/OpenMPT/mptrack/InputHandler.h Wed Apr 3 20:24:00 2024 (r20489) +++ trunk/OpenMPT/mptrack/InputHandler.h Wed Apr 3 20:27:21 2024 (r20490) @@ -52,6 +52,7 @@ CommandID GeneralKeyEvent(InputTargetContext context, int code, WPARAM wParam, LPARAM lParam); CommandID KeyEvent(const InputTargetContext context, const KeyboardEvent &event, CWnd *pSourceWnd = nullptr); static KeyboardEvent Translate(const MSG &msg); + static KeyEventType GetKeyEventType(const MSG &msg); static KeyEventType GetKeyEventType(UINT nFlags); bool IsKeyPressHandledByTextBox(DWORD wparam, HWND hWnd) const; CommandID HandleMIDIMessage(InputTargetContext context, uint32 message); Modified: trunk/OpenMPT/mptrack/view_com.cpp ============================================================================== --- trunk/OpenMPT/mptrack/view_com.cpp Wed Apr 3 20:24:00 2024 (r20489) +++ trunk/OpenMPT/mptrack/view_com.cpp Wed Apr 3 20:27:21 2024 (r20490) @@ -272,7 +272,7 @@ } else if(pMsg->message == WM_CHAR) { // Avoid Windows warning sound when holding note key - if(!CMainFrame::GetInputHandler()->IsBypassed() && CInputHandler::GetKeyEventType(HIWORD(pMsg->lParam)) == kKeyEventRepeat) + if(!CMainFrame::GetInputHandler()->IsBypassed() && CInputHandler::GetKeyEventType(*pMsg) == kKeyEventRepeat) return TRUE; } } |
|
From: <sv...@op...> - 2024-04-03 18:24:06
|
Author: sagamusix Date: Wed Apr 3 20:24:00 2024 New Revision: 20489 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20489 Log: Merged revision(s) 20488 from trunk/OpenMPT: [Fix] Comments tab: Sample / instrument name editing was broken since r18909 (tx SoDa7). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/mptrack/view_com.cpp Modified: branches/OpenMPT-1.31/mptrack/view_com.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/view_com.cpp Wed Apr 3 20:23:36 2024 (r20488) +++ branches/OpenMPT-1.31/mptrack/view_com.cpp Wed Apr 3 20:24:00 2024 (r20489) @@ -272,7 +272,8 @@ } else if(pMsg->message == WM_CHAR) { // Avoid Windows warning sound when holding note key - return TRUE; + if(!CMainFrame::GetInputHandler()->IsBypassed() && CInputHandler::GetKeyEventType(HIWORD(pMsg->lParam)) == kKeyEventRepeat) + return TRUE; } } |
|
From: <sv...@op...> - 2024-04-03 18:23:43
|
Author: sagamusix Date: Wed Apr 3 20:23:36 2024 New Revision: 20488 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20488 Log: [Fix] Comments tab: Sample / instrument name editing was broken since r18909 (tx SoDa7). Modified: trunk/OpenMPT/mptrack/view_com.cpp Modified: trunk/OpenMPT/mptrack/view_com.cpp ============================================================================== --- trunk/OpenMPT/mptrack/view_com.cpp Tue Apr 2 23:18:43 2024 (r20487) +++ trunk/OpenMPT/mptrack/view_com.cpp Wed Apr 3 20:23:36 2024 (r20488) @@ -272,7 +272,8 @@ } else if(pMsg->message == WM_CHAR) { // Avoid Windows warning sound when holding note key - return TRUE; + if(!CMainFrame::GetInputHandler()->IsBypassed() && CInputHandler::GetKeyEventType(HIWORD(pMsg->lParam)) == kKeyEventRepeat) + return TRUE; } } |
|
From: <sv...@op...> - 2024-04-02 21:18:51
|
Author: sagamusix Date: Tue Apr 2 23:18:43 2024 New Revision: 20487 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20487 Log: Merged revision(s) 20101, 20486 from trunk/OpenMPT: [Mod] MOD: Change VBlank timing heuristic to always assume CIA timing when long samples (= unsupported by original ProTracker) are found. ........ [Fix] MOD: Avoid NoiseTracker detection if emnpty sample slots have a default volume other than 0 (https://bugs.openmpt.org/view.php?id=1765). [Fix] MOD: 7-bit panning detection may have returned incorrect results for MODs with a channel count other than 4 (in particular with 1-3 channels, it was possible that sample data could have influenced the heuristic). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_mod.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_mod.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_mod.cpp Tue Apr 2 23:14:08 2024 (r20486) +++ branches/OpenMPT-1.31/soundlib/Load_mod.cpp Tue Apr 2 23:18:43 2024 (r20487) @@ -885,6 +885,7 @@ SmpLength totalSampleLen = 0, wowSampleLen = 0; m_nSamples = 31; uint32 invalidBytes = 0; + bool hasLongSamples = false; for(SAMPLEINDEX smp = 1; smp <= 31; smp++) { MODSampleHeader sampleHeader = ReadAndSwap<MODSampleHeader>(file, modMagicResult.swapBytes); @@ -894,7 +895,7 @@ if(isHMNT) Samples[smp].nFineTune = -static_cast<int8>(sampleHeader.finetune << 3); else if(Samples[smp].nLength > 65535) - isNoiseTracker = false; + hasLongSamples = true; if(sampleHeader.length && !sampleHeader.loopLength) hasRepLen0 = true; @@ -994,7 +995,7 @@ // Before loading patterns, apply some heuristics: // - Scan patterns to check if file could be a NoiseTracker file in disguise. - // In this case, the parameter of Dxx commands needs to be ignored. + // In this case, the parameter of Dxx commands needs to be ignored (see 1.11song2.mod, 2-3song6.mod). // - Use the same code to find notes that would be out-of-range on Amiga. // - Detect 7-bit panning and whether 8xx / E8x commands should be interpreted as panning at all. bool onlyAmigaNotes = true; @@ -1003,13 +1004,13 @@ const uint8 ENABLE_MOD_PANNING_THRESHOLD = 0x30; if(!isNoiseTracker) { + const uint32 patternLength = m_nChannels * 64; bool leftPanning = false, extendedPanning = false; // For detecting 800-880 panning - isNoiseTracker = isMdKd; + isNoiseTracker = isMdKd && !hasEmptySampleWithVolume && !hasLongSamples; for(PATTERNINDEX pat = 0; pat < numPatterns; pat++) { uint16 patternBreaks = 0; - - for(uint32 i = 0; i < 256; i++) + for(uint32 i = 0; i < patternLength; i++) { ModCommand m; const auto data = ReadAndSwap<std::array<uint8, 4>>(file, modMagicResult.swapBytes && pat == 0); @@ -1044,9 +1045,10 @@ } file.Seek(modMagicResult.patternDataOffset); - const CHANNELINDEX readChannels = (isFLT8 ? 4 : m_nChannels); // 4 channels per pattern in FLT8 format. - if(isFLT8) numPatterns++; // as one logical pattern consists of two real patterns in FLT8 format, the highest pattern number has to be increased by one. - bool hasTempoCommands = false, definitelyCIA = false; // for detecting VBlank MODs + const CHANNELINDEX readChannels = (isFLT8 ? 4 : m_nChannels); // 4 channels per pattern in FLT8 format. + if(isFLT8) + numPatterns++; // as one logical pattern consists of two real patterns in FLT8 format, the highest pattern number has to be increased by one. + bool hasTempoCommands = false, definitelyCIA = hasLongSamples; // for detecting VBlank MODs // Heuristic for rejecting E0x commands that are most likely not intended to actually toggle the Amiga LED filter, like in naen_leijasi_ptk.mod by ilmarque bool filterState = false; int filterTransitions = 0; @@ -1245,6 +1247,8 @@ file.Seek(nextSample); } } + if(isMdKd && file.ReadArray<char, 9>() == std::array<char, 9>{0x00, 0x11, 0x55, 0x33, 0x22, 0x11, 0x04, 0x01, 0x01}) + modMagicResult.madeWithTracker = UL_("Tetramed"); } #if defined(MPT_EXTERNAL_SAMPLES) || defined(MPT_BUILD_FUZZER) @@ -1361,8 +1365,7 @@ // Check if a name string is valid (i.e. doesn't contain binary garbage data) -template <size_t N> -static uint32 CountInvalidChars(const char (&name)[N]) +static uint32 CountInvalidChars(const mpt::span<const char> name) { uint32 invalidChars = 0; for(int8 c : name) // char can be signed or unsigned |
|
From: <sv...@op...> - 2024-04-02 21:14:17
|
Author: sagamusix Date: Tue Apr 2 23:14:08 2024 New Revision: 20486 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20486 Log: [Fix] MOD: Avoid NoiseTracker detection if emnpty sample slots have a default volume other than 0 (https://bugs.openmpt.org/view.php?id=1765). [Fix] MOD: 7-bit panning detection may have returned incorrect results for MODs with a channel count other than 4 (in particular with 1-3 channels, it was possible that sample data could have influenced the heuristic). Modified: trunk/OpenMPT/soundlib/Load_mod.cpp Modified: trunk/OpenMPT/soundlib/Load_mod.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_mod.cpp Mon Apr 1 11:30:15 2024 (r20485) +++ trunk/OpenMPT/soundlib/Load_mod.cpp Tue Apr 2 23:14:08 2024 (r20486) @@ -893,13 +893,9 @@ totalSampleLen += Samples[smp].nLength; if(isHMNT) - { Samples[smp].nFineTune = -static_cast<int8>(sampleHeader.finetune << 3); - } else if(Samples[smp].nLength > 65535) - { - isNoiseTracker = false; + else if(Samples[smp].nLength > 65535) hasLongSamples = true; - } if(sampleHeader.length && !sampleHeader.loopLength) hasRepLen0 = true; @@ -999,7 +995,7 @@ // Before loading patterns, apply some heuristics: // - Scan patterns to check if file could be a NoiseTracker file in disguise. - // In this case, the parameter of Dxx commands needs to be ignored. + // In this case, the parameter of Dxx commands needs to be ignored (see 1.11song2.mod, 2-3song6.mod). // - Use the same code to find notes that would be out-of-range on Amiga. // - Detect 7-bit panning and whether 8xx / E8x commands should be interpreted as panning at all. bool onlyAmigaNotes = true; @@ -1008,13 +1004,13 @@ const uint8 ENABLE_MOD_PANNING_THRESHOLD = 0x30; if(!isNoiseTracker) { + const uint32 patternLength = m_nChannels * 64; bool leftPanning = false, extendedPanning = false; // For detecting 800-880 panning - isNoiseTracker = isMdKd; + isNoiseTracker = isMdKd && !hasEmptySampleWithVolume && !hasLongSamples; for(PATTERNINDEX pat = 0; pat < numPatterns; pat++) { uint16 patternBreaks = 0; - - for(uint32 i = 0; i < 256; i++) + for(uint32 i = 0; i < patternLength; i++) { ModCommand m; const auto data = ReadAndSwap<std::array<uint8, 4>>(file, modMagicResult.swapBytes && pat == 0); @@ -1251,6 +1247,8 @@ file.Seek(nextSample); } } + if(isMdKd && file.ReadArray<char, 9>() == std::array<char, 9>{0x00, 0x11, 0x55, 0x33, 0x22, 0x11, 0x04, 0x01, 0x01}) + modMagicResult.madeWithTracker = UL_("Tetramed"); } #if defined(MPT_EXTERNAL_SAMPLES) || defined(MPT_BUILD_FUZZER) |
|
From: <sv...@op...> - 2024-04-01 09:30:27
|
Author: manx Date: Mon Apr 1 11:30:15 2024 New Revision: 20485 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20485 Log: Merged revision(s) 20484 from trunk/OpenMPT: [Var] ancient: Update commit reference to git master. ........ Modified: branches/OpenMPT-1.31/include/ancient/OpenMPT.txt Modified: branches/OpenMPT-1.31/include/ancient/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/ancient/OpenMPT.txt Mon Apr 1 11:29:40 2024 (r20484) +++ branches/OpenMPT-1.31/include/ancient/OpenMPT.txt Mon Apr 1 11:30:15 2024 (r20485) @@ -1,5 +1,3 @@ * ancient <https://github.com/temisu/ancient> commit - c6038c179aeac138667c4319e997d6dd5a25a4be (2024-03-23) - * <https://github.com/temisu/ancient/commit/35e1f2883b246de860dc3fe7dc2de2a75a840b90> - has been applied. + 1a176949acdebefb6303d69e315837fc0d8bb166 (2024-03-26) * Unnecssary files have been removed. |
|
From: <sv...@op...> - 2024-04-01 09:29:48
|
Author: manx Date: Mon Apr 1 11:29:40 2024 New Revision: 20484 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20484 Log: [Var] ancient: Update commit reference to git master. Modified: trunk/OpenMPT/include/ancient/OpenMPT.txt Modified: trunk/OpenMPT/include/ancient/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/ancient/OpenMPT.txt Sat Mar 30 10:58:03 2024 (r20483) +++ trunk/OpenMPT/include/ancient/OpenMPT.txt Mon Apr 1 11:29:40 2024 (r20484) @@ -1,5 +1,3 @@ * ancient <https://github.com/temisu/ancient> commit - c6038c179aeac138667c4319e997d6dd5a25a4be (2024-03-23) - * <https://github.com/temisu/ancient/commit/35e1f2883b246de860dc3fe7dc2de2a75a840b90> - has been applied. + 1a176949acdebefb6303d69e315837fc0d8bb166 (2024-03-26) * Unnecssary files have been removed. |
3 messages has been excluded from this view by a project administrator.
