diff options
| author | Tim Schumacher <timschumi@gmx.de> | 2021-10-11 02:29:49 +0200 |
|---|---|---|
| committer | Brian Gianforcaro <b.gianfo@gmail.com> | 2021-10-10 19:11:02 -0700 |
| commit | 39087533475cd82dfe9228d144a8c57d1912b771 (patch) | |
| tree | a9b8409e2b136dcdd554d3ddec4215392a3ba16f /Ports | |
| parent | 262b7189121e6559284bbd274a99fad16842096a (diff) | |
| download | serenity-39087533475cd82dfe9228d144a8c57d1912b771.zip | |
Ports: Fix issues with the libmodplug and SDL_sound ports
- Lock SDL_sound to specific commit
- Convert properties to arrays where required
- Fix depends being called "deps"
Diffstat (limited to 'Ports')
| -rwxr-xr-x | Ports/SDL_sound/package.sh | 11 | ||||
| -rwxr-xr-x | Ports/libmodplug/package.sh | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Ports/SDL_sound/package.sh b/Ports/SDL_sound/package.sh index e12fd21b93..dba464e0aa 100755 --- a/Ports/SDL_sound/package.sh +++ b/Ports/SDL_sound/package.sh @@ -1,15 +1,16 @@ #!/usr/bin/env -S bash ../.port_include.sh port=SDL_sound version=git -workdir=SDL_sound-main +_commit=9dfd90e9aebeb8c29248af673a46507f10e0e893 +workdir=SDL_sound-${_commit} useconfigure=true -deps="SDL2" -files="https://github.com/icculus/SDL_sound/archive/refs/heads/main.zip main.zip f8a322d090a172b9c66a41758f7ece850a8ff231058733a13e44bc380342651b" +depends=("SDL2") +files="https://github.com/icculus/SDL_sound/archive/${_commit}.zip ${_commit}.zip c701f31fcef9238d6a439d94020ce8957aa5aaea29878312dc0b6d1c247d77ca" auth_type=sha256 -configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" +configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt") configure() { - run cmake $configopts + run cmake "${configopts[@]}" } install() { diff --git a/Ports/libmodplug/package.sh b/Ports/libmodplug/package.sh index ad7c4b5fdb..c0161e4f6f 100755 --- a/Ports/libmodplug/package.sh +++ b/Ports/libmodplug/package.sh @@ -2,13 +2,13 @@ port=libmodplug version=0.8.8.5 useconfigure=true -configopts="ac_cv_c_bigendian=no" +configopts=("ac_cv_c_bigendian=no") files="https://download.sourceforge.net/modplug-xmms/libmodplug-${version}.tar.gz libmodplug-${version}.tar.gz 77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad" auth_type=sha256 workdir="libmodplug-$version" install() { - run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install + run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libmodplug.so -Wl,-soname,libmodplug.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libmodplug.a -Wl,--no-whole-archive rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libmodplug.la } |