From 2f2e75ee02d5cf19f33e88893563e8a43ce26ee1 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sun, 23 Apr 2023 18:13:23 +0000 Subject: [PATCH] ALL: Add libmikmod dependency --- check-versions/config.py | 1 + toolchains/amigaos4/Dockerfile.m4 | 2 ++ .../amigaos4/packages/libmikmod/build.sh | 13 ++++++++++++ toolchains/caanoo/Dockerfile.m4 | 3 +++ toolchains/common/packages/libmikmod/build.sh | 15 ++++++++++++++ toolchains/devkit3ds/Dockerfile.m4 | 2 ++ toolchains/devkitppc/Dockerfile.m4 | 2 ++ toolchains/devkitswitch/Dockerfile.m4 | 2 ++ toolchains/gcw0/Dockerfile.m4 | 3 +++ toolchains/gcw0/packages/libmikmod/build.sh | 20 +++++++++++++++++++ toolchains/m4/android/packages_list.m4 | 2 ++ toolchains/m4/apple/macosx.m4 | 2 ++ toolchains/m4/apple/xos.m4 | 2 ++ toolchains/miyoo/Dockerfile.m4 | 2 ++ toolchains/mxe/Dockerfile.m4 | 2 ++ toolchains/opendingux-beta/Dockerfile.m4 | 2 ++ .../packages/toolchain/build.sh | 1 + toolchains/opendingux/Dockerfile.m4 | 2 ++ toolchains/openpandora/Dockerfile.m4 | 2 ++ toolchains/raspberrypi/Dockerfile.m4 | 1 + toolchains/riscos/Dockerfile.m4 | 2 ++ toolchains/vita/Dockerfile.m4 | 2 ++ toolchains/windows-9x/Dockerfile.m4 | 2 ++ workers/m4/debian-libraries.m4 | 1 + 24 files changed, 88 insertions(+) create mode 100755 toolchains/amigaos4/packages/libmikmod/build.sh create mode 100755 toolchains/common/packages/libmikmod/build.sh create mode 100755 toolchains/gcw0/packages/libmikmod/build.sh diff --git a/check-versions/config.py b/check-versions/config.py index 0804a50..b01b885 100644 --- a/check-versions/config.py +++ b/check-versions/config.py @@ -318,6 +318,7 @@ VERSIONS = { ('./toolchains/gcw0/packages/libglib2/build.sh', 'GLIB2'): 'ignore', ('./toolchains/gcw0/packages/libiconv/build.sh', 'LIBICONV'): 'ignore', ('./toolchains/gcw0/packages/libjpeg/build.sh', 'JPEG'): 'ignore', + ('./toolchains/gcw0/packages/libmikmod/build.sh', 'LIBMIKMOD'): 'ignore', ('./toolchains/gcw0/packages/libogg/build.sh', 'LIBOGG'): 'ignore', ('./toolchains/gcw0/packages/libpng/build.sh', 'LIBPNG'): 'ignore', ('./toolchains/gcw0/packages/libsdl/build.sh', 'SDL'): 'ignore', diff --git a/toolchains/amigaos4/Dockerfile.m4 b/toolchains/amigaos4/Dockerfile.m4 index 079758f..13e7010 100644 --- a/toolchains/amigaos4/Dockerfile.m4 +++ b/toolchains/amigaos4/Dockerfile.m4 @@ -68,6 +68,8 @@ local_package(libvorbis) local_package(libflac) +local_package(libmikmod) + local_package(libmpeg2) local_package(liba52) diff --git a/toolchains/amigaos4/packages/libmikmod/build.sh b/toolchains/amigaos4/packages/libmikmod/build.sh new file mode 100755 index 0000000..3dad1ea --- /dev/null +++ b/toolchains/amigaos4/packages/libmikmod/build.sh @@ -0,0 +1,13 @@ +#! /bin/sh + +PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +HELPERS_DIR=$PACKAGE_DIR/../.. +. $HELPERS_DIR/functions.sh + +do_make_bdir + +do_lha_fetch audio/libmikmod "libmikmod-*/SDK" + +do_lha_install + +do_clean_bdir diff --git a/toolchains/caanoo/Dockerfile.m4 b/toolchains/caanoo/Dockerfile.m4 index ce12798..3893d72 100644 --- a/toolchains/caanoo/Dockerfile.m4 +++ b/toolchains/caanoo/Dockerfile.m4 @@ -66,6 +66,9 @@ helpers_package(libvorbisidec) # No FLAC in the original toolchain build ours statically helpers_package(flac) +# No libmikmod in the original toolchain build ours statically +helpers_package(libmikmod) + # No mpeg2dec in the original toolchain build ours statically helpers_package(mpeg2dec) diff --git a/toolchains/common/packages/libmikmod/build.sh b/toolchains/common/packages/libmikmod/build.sh new file mode 100755 index 0000000..aae9e00 --- /dev/null +++ b/toolchains/common/packages/libmikmod/build.sh @@ -0,0 +1,15 @@ +#! /bin/sh + +PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +HELPERS_DIR=$PACKAGE_DIR/../.. +. $HELPERS_DIR/functions.sh + +do_make_bdir + +do_pkg_fetch libmikmod + +do_configure --disable-doc --disable-alldrv --disable-threads --disable-dl +do_make +do_make install + +do_clean_bdir diff --git a/toolchains/devkit3ds/Dockerfile.m4 b/toolchains/devkit3ds/Dockerfile.m4 index c9cf761..5316ebc 100644 --- a/toolchains/devkit3ds/Dockerfile.m4 +++ b/toolchains/devkit3ds/Dockerfile.m4 @@ -57,6 +57,8 @@ helpers_package(faad2) # flac is already installed in original toolchain +# libmikmod is already installed in original toolchain + helpers_package(mpeg2dec) helpers_package(a52dec) diff --git a/toolchains/devkitppc/Dockerfile.m4 b/toolchains/devkitppc/Dockerfile.m4 index bb821b6..c613170 100644 --- a/toolchains/devkitppc/Dockerfile.m4 +++ b/toolchains/devkitppc/Dockerfile.m4 @@ -71,6 +71,8 @@ helpers_package(faad2) # flac is already installed in original-toolchain +helpers_package(libmikmod) + helpers_package(mpeg2dec, , CFLAGS="$CFLAGS -mno-altivec") helpers_package(a52dec) diff --git a/toolchains/devkitswitch/Dockerfile.m4 b/toolchains/devkitswitch/Dockerfile.m4 index 97102f1..144b9bb 100644 --- a/toolchains/devkitswitch/Dockerfile.m4 +++ b/toolchains/devkitswitch/Dockerfile.m4 @@ -69,6 +69,8 @@ helpers_package(faad2) # flac is already installed in original toolchain +# libmikmod is already installed in original toolchain + helpers_package(mpeg2dec) helpers_package(a52dec) diff --git a/toolchains/gcw0/Dockerfile.m4 b/toolchains/gcw0/Dockerfile.m4 index 5dd41ce..c077dc1 100644 --- a/toolchains/gcw0/Dockerfile.m4 +++ b/toolchains/gcw0/Dockerfile.m4 @@ -78,6 +78,9 @@ local_package(libvorbisidec) # Use same version as official toolchain local_package(flac) +# Use same version as official toolchain +local_package(libmikmod) + # No mpeg2dec in the original toolchain build ours statically helpers_package(mpeg2dec) diff --git a/toolchains/gcw0/packages/libmikmod/build.sh b/toolchains/gcw0/packages/libmikmod/build.sh new file mode 100755 index 0000000..222a661 --- /dev/null +++ b/toolchains/gcw0/packages/libmikmod/build.sh @@ -0,0 +1,20 @@ +#! /bin/sh + +# Stick with toolchain version +LIBMIKMOD_VERSION=3.3.6 + +PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +HELPERS_DIR=$PACKAGE_DIR/../.. +. $HELPERS_DIR/functions.sh + +do_make_bdir + +do_http_fetch libmikmod "https://download.sourceforge.net/project/mikmod/outdated_versions/libmikmod/${LIBMIKMOD_VERSION}/libmikmod-${LIBMIKMOD_VERSION}.tar.gz" \ + 'tar xzf' + +autoreconf -i +do_configure_shared --localstatedir=/var --disable-esd +do_make +do_make install + +do_clean_bdir diff --git a/toolchains/m4/android/packages_list.m4 b/toolchains/m4/android/packages_list.m4 index 896de8a..15b5777 100644 --- a/toolchains/m4/android/packages_list.m4 +++ b/toolchains/m4/android/packages_list.m4 @@ -28,6 +28,8 @@ helpers_package(mpeg2dec) helpers_package(a52dec) +helpers_package(libmikmod) + # --as is used for x86* and overrides AS environment variable: exactly what we want # Fix build with nasm COPY --from=android-helpers /lib-helpers/packages/libvpx lib-helpers/packages/libvpx diff --git a/toolchains/m4/apple/macosx.m4 b/toolchains/m4/apple/macosx.m4 index f70189c..d752813 100644 --- a/toolchains/m4/apple/macosx.m4 +++ b/toolchains/m4/apple/macosx.m4 @@ -123,6 +123,8 @@ ports_package(libtheora) ports_package(libvorbis) +ports_package(libmikmod) + helpers_package(flac) # mpeg2dec in ports comes with dependencies on X11 and SDL diff --git a/toolchains/m4/apple/xos.m4 b/toolchains/m4/apple/xos.m4 index 652eefa..82b5a8f 100644 --- a/toolchains/m4/apple/xos.m4 +++ b/toolchains/m4/apple/xos.m4 @@ -111,6 +111,8 @@ helpers_package(libvorbis) helpers_package(flac) +helpers_package(libmikmod) + # Don't enable assembly part: it doesn't build COPY --from=apple-common /lib-helpers/packages/mpeg2dec lib-helpers/packages/mpeg2dec helpers_package(mpeg2dec) diff --git a/toolchains/miyoo/Dockerfile.m4 b/toolchains/miyoo/Dockerfile.m4 index 3f09806..5b90fd3 100644 --- a/toolchains/miyoo/Dockerfile.m4 +++ b/toolchains/miyoo/Dockerfile.m4 @@ -52,6 +52,8 @@ ENV \ # flac is already installed in original toolchain +helpers_package(libmikmod) + helpers_package(faad2) helpers_package(mpeg2dec) diff --git a/toolchains/mxe/Dockerfile.m4 b/toolchains/mxe/Dockerfile.m4 index 3ff8077..dbd8a2f 100644 --- a/toolchains/mxe/Dockerfile.m4 +++ b/toolchains/mxe/Dockerfile.m4 @@ -79,6 +79,8 @@ mxe_package(theora) mxe_package(flac) +mxe_package(libmikmod) + local_mxe_package(libmpeg2) mxe_package(a52dec) diff --git a/toolchains/opendingux-beta/Dockerfile.m4 b/toolchains/opendingux-beta/Dockerfile.m4 index b83d623..73e9e50 100644 --- a/toolchains/opendingux-beta/Dockerfile.m4 +++ b/toolchains/opendingux-beta/Dockerfile.m4 @@ -48,6 +48,8 @@ helpers_package(giflib) # flac is already installed in original toolchain +# libmikmod is already installed in original toolchain + helpers_package(faad2) helpers_package(mpeg2dec) diff --git a/toolchains/opendingux-beta/packages/toolchain/build.sh b/toolchains/opendingux-beta/packages/toolchain/build.sh index 57f7a24..04b79a9 100755 --- a/toolchains/opendingux-beta/packages/toolchain/build.sh +++ b/toolchains/opendingux-beta/packages/toolchain/build.sh @@ -33,6 +33,7 @@ WHITELIST=$(cat <<-"EOF" SDL2_NET ALSA_LIB.* LIBMAD + LIBMIKMOD LIBVORBIS TREMOR FREETYPE diff --git a/toolchains/opendingux/Dockerfile.m4 b/toolchains/opendingux/Dockerfile.m4 index 1963235..1bc0910 100644 --- a/toolchains/opendingux/Dockerfile.m4 +++ b/toolchains/opendingux/Dockerfile.m4 @@ -72,6 +72,8 @@ local_package(libvorbisidec) # Use same version as official toolchain local_package(flac) +# TODO: Add libmikmod from official toolchain + # No mpeg2dec in the original toolchain build ours statically helpers_package(mpeg2dec) diff --git a/toolchains/openpandora/Dockerfile.m4 b/toolchains/openpandora/Dockerfile.m4 index b9f4c8b..c585be1 100644 --- a/toolchains/openpandora/Dockerfile.m4 +++ b/toolchains/openpandora/Dockerfile.m4 @@ -67,6 +67,8 @@ local_package(libvorbis) # Use same version as official toolchain local_package(flac) +# TODO: Add libmikmod from official toolchain + # No mpeg2dec in the original toolchain build ours statically helpers_package(mpeg2dec) diff --git a/toolchains/raspberrypi/Dockerfile.m4 b/toolchains/raspberrypi/Dockerfile.m4 index df33473..50d132a 100644 --- a/toolchains/raspberrypi/Dockerfile.m4 +++ b/toolchains/raspberrypi/Dockerfile.m4 @@ -31,6 +31,7 @@ multistrap_package(libgif-dev) multistrap_package(libgtk-3-dev) multistrap_package(libjpeg62-turbo-dev) multistrap_package(libmad0-dev) +multistrap_package(libmikmod-dev) multistrap_package(libmpeg2-4-dev) multistrap_package(libogg-dev) multistrap_package(libpng-dev) diff --git a/toolchains/riscos/Dockerfile.m4 b/toolchains/riscos/Dockerfile.m4 index f57da57..4440128 100644 --- a/toolchains/riscos/Dockerfile.m4 +++ b/toolchains/riscos/Dockerfile.m4 @@ -84,6 +84,8 @@ helpers_package(libtheora) helpers_package(flac, --with-pic=no) +helpers_package(libmikmod) + helpers_package(faad2) helpers_package(mpeg2dec) diff --git a/toolchains/vita/Dockerfile.m4 b/toolchains/vita/Dockerfile.m4 index 7fe0887..3efd1b9 100644 --- a/toolchains/vita/Dockerfile.m4 +++ b/toolchains/vita/Dockerfile.m4 @@ -48,6 +48,8 @@ vdpm_package(libtheora) vdpm_package(flac) +vdpm_package(libmikmod) + helpers_package(faad2) vdpm_package(libmpeg2) diff --git a/toolchains/windows-9x/Dockerfile.m4 b/toolchains/windows-9x/Dockerfile.m4 index c7977b0..f2fcef8 100644 --- a/toolchains/windows-9x/Dockerfile.m4 +++ b/toolchains/windows-9x/Dockerfile.m4 @@ -62,6 +62,8 @@ helpers_package(libtheora) # _fstat64, _stat64, _wstat64, _wutime64 # helpers_package(flac) +helpers_package(libmikmod) + helpers_package(faad2) COPY packages/mpeg2dec lib-helpers/packages/mpeg2dec/ diff --git a/workers/m4/debian-libraries.m4 b/workers/m4/debian-libraries.m4 index 8cad7f4..b078fdb 100644 --- a/workers/m4/debian-libraries.m4 +++ b/workers/m4/debian-libraries.m4 @@ -14,6 +14,7 @@ RUN apt-get update && \ libieee1284-3-dev`'APT_ARCH \ libjpeg62-turbo-dev`'APT_ARCH \ libmad0-dev`'APT_ARCH \ + libmikmod-dev`'APT_ARCH \ libmpeg2-4-dev`'APT_ARCH \ libogg-dev`'APT_ARCH \ libpng-dev`'APT_ARCH \