From 7ad783d5cc50ddfee856264b607404a74d0c47f8 Mon Sep 17 00:00:00 2001 From: Jeremy Soller <jackpot51@gmail.com> Date: Sat, 23 Jul 2022 20:40:02 -0600 Subject: [PATCH] Convert sdl2 to new recipe format --- recipes/sdl2/recipe.sh | 54 ---------------------------------------- recipes/sdl2/recipe.toml | 28 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 54 deletions(-) delete mode 100644 recipes/sdl2/recipe.sh create mode 100644 recipes/sdl2/recipe.toml diff --git a/recipes/sdl2/recipe.sh b/recipes/sdl2/recipe.sh deleted file mode 100644 index 0bd50238..00000000 --- a/recipes/sdl2/recipe.sh +++ /dev/null @@ -1,54 +0,0 @@ -VERSION=2.0.9 -GIT=https://gitlab.redox-os.org/fabiao/sdl2-src.git -BUILD_DEPENDS=(liborbital mesa) - -function recipe_version { - echo "$VERSION" - skip=1 -} - -function recipe_update { - echo "skipping update" - skip=1 -} - -function recipe_build { - sysroot="$(realpath ../sysroot)" - export CFLAGS="-I$sysroot/include" - export LDFLAGS="-L$sysroot/lib" - ./autogen.sh - ./configure \ - --build=${BUILD} \ - --host=${HOST} \ - --prefix=/ \ - --disable-shared \ - --disable-pulseaudio \ - --disable-video-x11 \ - --disable-loadso \ - --disable-sdl-dlopen \ - --enable-threads \ - --enable-audio \ - --enable-dummyaudio \ - --enable-video-orbital \ - --enable-redoxaudio \ - --enable-cdrom - "$REDOX_MAKE" -j"$($NPROC)" - skip=1 -} - -function recipe_test { - echo "skipping test" - skip=1 -} - -function recipe_clean { - "$REDOX_MAKE" clean - skip=1 -} - -function recipe_stage { - dest="$(realpath $1)" - "$REDOX_MAKE" DESTDIR="$dest" install - rm -f "$dest/lib/"*.la - skip=1 -} diff --git a/recipes/sdl2/recipe.toml b/recipes/sdl2/recipe.toml new file mode 100644 index 00000000..db5f10fb --- /dev/null +++ b/recipes/sdl2/recipe.toml @@ -0,0 +1,28 @@ +#TODO: TEST +[source] +git = "https://gitlab.redox-os.org/fabiao/sdl2-src.git" + +[build] +template = "custom" +dependencies = [ + "liborbital", + "mesa", +] +script = """ +COOKBOOK_CONFIGURE_FLAGS=( + --host="${TARGET}" + --prefix="/" + --disable-shared + --disable-pulseaudio + --disable-video-x11 + --disable-loadso + --disable-sdl-dlopen + --enable-threads + --enable-audio + --enable-dummyaudio + --enable-video-orbital + --enable-redoxaudio + --enable-cdrom +) +cookbook_configure +""" -- GitLab