mirror of
https://github.com/scummvm/dockerized-bb.git
synced 2026-05-21 05:40:49 +00:00
ALL: Add libmikmod dependency
This commit is contained in:
@@ -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',
|
||||
|
||||
@@ -68,6 +68,8 @@ local_package(libvorbis)
|
||||
|
||||
local_package(libflac)
|
||||
|
||||
local_package(libmikmod)
|
||||
|
||||
local_package(libmpeg2)
|
||||
|
||||
local_package(liba52)
|
||||
|
||||
+13
@@ -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
|
||||
@@ -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)
|
||||
|
||||
|
||||
+15
@@ -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
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Executable
+20
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -52,6 +52,8 @@ ENV \
|
||||
|
||||
# flac is already installed in original toolchain
|
||||
|
||||
helpers_package(libmikmod)
|
||||
|
||||
helpers_package(faad2)
|
||||
|
||||
helpers_package(mpeg2dec)
|
||||
|
||||
@@ -79,6 +79,8 @@ mxe_package(theora)
|
||||
|
||||
mxe_package(flac)
|
||||
|
||||
mxe_package(libmikmod)
|
||||
|
||||
local_mxe_package(libmpeg2)
|
||||
|
||||
mxe_package(a52dec)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -33,6 +33,7 @@ WHITELIST=$(cat <<-"EOF"
|
||||
SDL2_NET
|
||||
ALSA_LIB.*
|
||||
LIBMAD
|
||||
LIBMIKMOD
|
||||
LIBVORBIS
|
||||
TREMOR
|
||||
FREETYPE
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -84,6 +84,8 @@ helpers_package(libtheora)
|
||||
|
||||
helpers_package(flac, --with-pic=no)
|
||||
|
||||
helpers_package(libmikmod)
|
||||
|
||||
helpers_package(faad2)
|
||||
|
||||
helpers_package(mpeg2dec)
|
||||
|
||||
@@ -48,6 +48,8 @@ vdpm_package(libtheora)
|
||||
|
||||
vdpm_package(flac)
|
||||
|
||||
vdpm_package(libmikmod)
|
||||
|
||||
helpers_package(faad2)
|
||||
|
||||
vdpm_package(libmpeg2)
|
||||
|
||||
@@ -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/
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user