From de31f51bbe3a180ceb8698c17bc54e0d420830ef Mon Sep 17 00:00:00 2001 From: Grigoris Pavlakis Date: Mon, 13 Jun 2022 13:20:06 +0300 Subject: [PATCH] Ports: Move SDL_sound to SDL2_sound --- Ports/AvailablePorts.md | 2 +- Ports/{SDL_sound => SDL2_sound}/package.sh | 14 +++++++------- .../patches/0001-Use-pkgconfig-to-find-SDL2.patch | 0 Ports/{SDL_sound => SDL2_sound}/patches/ReadMe.md | 2 +- Ports/gltron/package.sh | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename Ports/{SDL_sound => SDL2_sound}/package.sh (67%) rename Ports/{SDL_sound => SDL2_sound}/patches/0001-Use-pkgconfig-to-find-SDL2.patch (100%) rename Ports/{SDL_sound => SDL2_sound}/patches/ReadMe.md (65%) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 7b97585713e..6a8e90a89ac 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -205,9 +205,9 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`SDL2_image`](SDL2_image/) | SDL2\_image (Image loading add-on for SDL2) | 2.0.5 | https://www.libsdl.org/projects/SDL_image/ | | [`SDL2_mixer`](SDL2_mixer/) | SDL2\_mixer (audio mixer add-on for SDL2) | 2.0.4 | https://www.libsdl.org/projects/SDL_mixer/ | | [`SDL2_net`](SDL2_net/) | SDL2\_net (network add-on for SDL2) | 2.0.1 | https://www.libsdl.org/projects/SDL_net/ | +| [`SDL2_sound`](SDL2_sound/) | SDL2\_sound (Abstract soundfile decoder add-on for SDL2) | | https://github.com/icculus/SDL_sound | | [`SDL2_ttf`](SDL2_ttf/) | SDL2\_ttf (TrueType Font add-on for SDL2) | 2.0.18 | https://www.libsdl.org/projects/SDL_ttf/ | | [`SDL_mixer`](SDL_mixer/) | SDL\_mixer (Audio mixer add-on for SDL 1.2) | 1.2.12 | https://www.libsdl.org/projects/SDL_mixer/release-1.2.html | -| [`SDL_sound`](SDL_sound/) | SDL_sound (Abstract soundfile decoder) | | https://github.com/icculus/SDL_sound | | [`SDLPoP`](SDLPoP/) | Prince of Persia game | | https://github.com/NagyD/SDLPoP | | [`sed`](sed/) | GNU sed | 4.8 | https://www.gnu.org/software/sed/ | | [`serenity-theming`](serenity-theming/) | SerenityOS theming | e4e2f26 | https://github.com/SerenityOS/theming | diff --git a/Ports/SDL_sound/package.sh b/Ports/SDL2_sound/package.sh similarity index 67% rename from Ports/SDL_sound/package.sh rename to Ports/SDL2_sound/package.sh index 2d238678a2d..e990e09185b 100755 --- a/Ports/SDL_sound/package.sh +++ b/Ports/SDL2_sound/package.sh @@ -1,12 +1,12 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=SDL_sound -version=git -_commit=df3fc779774c2c5dc1147239da1af858c88f1a74 -workdir=SDL_sound-${_commit} -useconfigure=true -depends=("SDL2") +port='SDL2_sound' +version='git' +_commit='df3fc779774c2c5dc1147239da1af858c88f1a74' +workdir="SDL_sound-${_commit}" +useconfigure='true' +depends=('SDL2') files="https://github.com/icculus/SDL_sound/archive/${_commit}.zip ${_commit}.zip bf655a03ab96a49c4140e19135433d62893c124330955e85e3dfddbe9963bac2" -auth_type=sha256 +auth_type='sha256' configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt") configure() { diff --git a/Ports/SDL_sound/patches/0001-Use-pkgconfig-to-find-SDL2.patch b/Ports/SDL2_sound/patches/0001-Use-pkgconfig-to-find-SDL2.patch similarity index 100% rename from Ports/SDL_sound/patches/0001-Use-pkgconfig-to-find-SDL2.patch rename to Ports/SDL2_sound/patches/0001-Use-pkgconfig-to-find-SDL2.patch diff --git a/Ports/SDL_sound/patches/ReadMe.md b/Ports/SDL2_sound/patches/ReadMe.md similarity index 65% rename from Ports/SDL_sound/patches/ReadMe.md rename to Ports/SDL2_sound/patches/ReadMe.md index 12316726f99..516be49c889 100644 --- a/Ports/SDL_sound/patches/ReadMe.md +++ b/Ports/SDL2_sound/patches/ReadMe.md @@ -1,4 +1,4 @@ -# Patches for SDL_sound on SerenityOS +# Patches for SDL2_sound on SerenityOS ## `0001-Use-pkgconfig-to-find-SDL2.patch` diff --git a/Ports/gltron/package.sh b/Ports/gltron/package.sh index f4825a42214..29a84f45017 100755 --- a/Ports/gltron/package.sh +++ b/Ports/gltron/package.sh @@ -5,7 +5,7 @@ use_fresh_config_sub=true version="0.70" files="http://mirror.sobukus.de/files/grimoire/games-arcade-2d/gltron-${version}-source.tar.gz gltron-${version}-source.tar.gz e0c8ebb41a18a1f8d7302a9c2cb466f5b1dd63e9a9966c769075e6b6bdad8bb0" auth_type=sha256 -depends=("libpng" "SDL_sound" "SDL2" "zlib") +depends=("libpng" "SDL2_sound" "SDL2" "zlib") configopts=( "--disable-warn" )