diff --git a/Dockerfile b/Dockerfile index 3b6f470..d09fb40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -from ubuntu:24.04 +FROM ubuntu:24.04 WORKDIR /usr/src/app @@ -48,7 +48,6 @@ RUN apt-get update -y && \ lua5.4 \ liblua5.4-dev \ liblua5.4-0 \ - mpg123 \ ffmpeg \ wget diff --git a/Makefile b/Makefile index 4870cf9..aac0bc9 100644 --- a/Makefile +++ b/Makefile @@ -543,7 +543,7 @@ build/assets/%.aifc: assets/%.jsox tools/sound/jsox.js portal_pak_dir/%.wav build/assets/%.aifc: assets/%.msox portal_pak_dir/%.mp3 @mkdir -p $(@D) - mpg123 -w $(<:assets/%.msox=portal_pak_dir/%.wav) $(<:assets/%.msox=portal_pak_dir/%.mp3) + ffmpeg -y -i $(<:assets/%.msox=portal_pak_dir/%.mp3) $(<:assets/%.msox=portal_pak_dir/%.wav) sox $(<:assets/%.msox=portal_pak_dir/%.wav) $(shell cat $<) $(@:%.aifc=%.wav) $(SFZ2N64) -o $@ $(@:%.aifc=%.wav) diff --git a/assets/sound/CMakeLists.txt b/assets/sound/CMakeLists.txt index beb92de..9eaefb1 100644 --- a/assets/sound/CMakeLists.txt +++ b/assets/sound/CMakeLists.txt @@ -299,7 +299,7 @@ function(_add_music_transform_command MUSIC_SCRIPT OUTPUT_LIST) OUTPUT ${CONVERTED_FILE} COMMAND - ${MPG123} -q -w ${CONVERTED_FILE} ${INPUT_FILE} + ${FFMPEG} -y -i ${INPUT_FILE} ${CONVERTED_FILE} COMMENT "Converting $" VERBATIM diff --git a/documentation/manual_setup.md b/documentation/manual_setup.md index b64a4f0..38e5b4f 100644 --- a/documentation/manual_setup.md +++ b/documentation/manual_setup.md @@ -39,7 +39,7 @@ Setup and install dependencies for `skelatool64` echo "deb [trusted=yes] https://lambertjamesd.github.io/apt/ ./" \ | sudo tee /etc/apt/sources.list.d/lambertjamesd.list sudo apt update -sudo apt install vtf2png sfz2n64 mpg123 sox imagemagick unzip +sudo apt install vtf2png sfz2n64 sox imagemagick unzip `` ``` Install ffmpeg 4.3.1 diff --git a/tools/setup.sh b/tools/setup.sh index b07f346..d5619d6 100644 --- a/tools/setup.sh +++ b/tools/setup.sh @@ -9,7 +9,7 @@ sudo dpkg --add-architecture i386 sudo apt update # Install various packages -sudo apt install binutils-mips-n64 gcc-mips-n64 git imagemagick liblua5.4-0 liblua5.4-dev lua5.4 make makemask mpg123 newlib-mips-n64 nodejs n64sdk root-compatibility-environment sfz2n64 sox unzip vtf2png -y +sudo apt install binutils-mips-n64 gcc-mips-n64 git imagemagick liblua5.4-0 liblua5.4-dev lua5.4 make makemask newlib-mips-n64 nodejs n64sdk root-compatibility-environment sfz2n64 sox unzip vtf2png -y # Ubuntu WSL needs these for some reason. sudo apt-get update && sudo apt-get install libxfixes3 libxi6 libxkbcommon0 libxxf86vm1 libgl1-mesa-glx -y