Archive/portal64-still-alive
1
0
Fork 0
mirror of https://github.com/mwpenny/portal64-still-alive.git synced 2024-10-19 10:17:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove mpg123 dependency

Browse source 
It was used to convert MP3 -> WAV, which ffmpeg can do.
This commit is contained in:
Matt Penny 2024-10-17 18:44:24 -04:00
parent 86aaad1b3b
commit 08368ffa25
5 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -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

2
Makefile
View file

@ -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)

2
assets/sound/CMakeLists.txt
View file

@ -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 $<PATH:RELATIVE_PATH,${INPUT_FILE},${PROJECT_SOURCE_DIR}>"
VERBATIM

2
documentation/manual_setup.md
View file

@ -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

2
tools/setup.sh
View file

@ -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