diff --git a/recipes/gears/recipe.sh b/recipes/gears/recipe.sh index 570139e974f4ddaa8f14d6517986bd16aff4439f..9dba93e37dd2d33022867d6f6b7e02ab9075742d 100644 --- a/recipes/gears/recipe.sh +++ b/recipes/gears/recipe.sh @@ -1,4 +1,4 @@ -BUILD_DEPENDS=(liborbital llvm mesa mesa_glu zlib) +BUILD_DEPENDS=(liborbital mesa mesa_glu zlib) function recipe_version { printf "1.0.0" @@ -19,7 +19,7 @@ function recipe_prepare { function recipe_build { sysroot="$(realpath ../sysroot)" set -x - "${CXX}" -O2 -I "$sysroot/include" -L "$sysroot/lib" gears.c -o gears -static -lorbital $("${PKG_CONFIG}" --libs glu) $("${TARGET}-llvm-config" --libs all) -lz + "${CXX}" -O2 -I "$sysroot/include" -L "$sysroot/lib" gears.c -o gears -static -lorbital $("${PKG_CONFIG}" --libs glu) -lz set +x skip=1 } diff --git a/recipes/mesa/recipe.sh b/recipes/mesa/recipe.sh index 853b582ebc0c34cecc5eac78a58327191ba25310..d93606983b0167fa8e2bfbfcf01dd28335094178 100644 --- a/recipes/mesa/recipe.sh +++ b/recipes/mesa/recipe.sh @@ -1,7 +1,7 @@ GIT=https://gitlab.redox-os.org/redox-os/mesa.git GIT_UPSTREAM=git://anongit.freedesktop.org/mesa/mesa BRANCH=redox -BUILD_DEPENDS=(expat llvm zlib) +BUILD_DEPENDS=(expat zlib) function recipe_version { printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" @@ -17,7 +17,7 @@ function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include -DHAVE_PTHREAD=1" export CPPFLAGS="-I$sysroot/include -DHAVE_PTHREAD=1" - export LDFLAGS="-L$sysroot/lib --static $("${TARGET}-llvm-config" --libfiles all)" + export LDFLAGS="-L$sysroot/lib --static" #export LLVM_CONFIG="x86_64-unknown-redox-llvm-config" # TODO: Fix this annoying shite @@ -27,7 +27,7 @@ function recipe_build { echo "ar = '${AR}'" >> cross_file.txt echo "strip = '${STRIP}'" >> cross_file.txt echo "pkgconfig = '${PKG_CONFIG}'" >> cross_file.txt - echo "llvm-config = '${TARGET}-llvm-config'" >> cross_file.txt + #echo "llvm-config = '${TARGET}-llvm-config'" >> cross_file.txt echo "[host_machine]" >> cross_file.txt echo "system = 'redox'" >> cross_file.txt @@ -60,7 +60,7 @@ function recipe_build { --strip \ -Ddefault_library=static \ -Dglx=disabled \ - -Dllvm=enabled \ + -Dllvm=disabled \ -Dosmesa=gallium \ -Dplatforms= \ -Dshader-cache=disabled \ diff --git a/recipes/neverball/recipe.sh b/recipes/neverball/recipe.sh index 12cf43ce864bcdd04fe5156f9d16ec07bc4c3685..5e3bab5acf4c1bea54c0398366bdce844f3c10d1 100644 --- a/recipes/neverball/recipe.sh +++ b/recipes/neverball/recipe.sh @@ -1,6 +1,6 @@ VERSION=1.6.0 TAR="https://neverball.org/neverball-${VERSION}.tar.gz" -BUILD_DEPENDS=(freetype libjpeg libogg liborbital libpng libvorbis llvm mesa sdl2 sdl2_ttf zlib) +BUILD_DEPENDS=(freetype libjpeg libogg liborbital libpng libvorbis mesa sdl2 sdl2_ttf zlib) function recipe_version { echo "$VERSION" @@ -17,7 +17,7 @@ function recipe_build { "$REDOX_MAKE" -j"$($NPROC)" ENABLE_FS=stdio mapc sols sysroot="$(realpath ../sysroot)" export CPPFLAGS="-I$sysroot/include" - export LDFLAGS="-L$sysroot/lib -static" + export LDFLAGS="-L$sysroot/lib -static" "$REDOX_MAKE" -j"$($NPROC)" ENABLE_FS=stdio ENABLE_NLS=0 clean-src "$REDOX_MAKE" -j"$($NPROC)" ENABLE_FS=stdio ENABLE_NLS=0 neverball neverputt skip=1 diff --git a/recipes/neverball/redox.patch b/recipes/neverball/redox.patch index 9ebd2189c16d6209d8c2336ca6aa0a6844a6f1ff..376893ef1d723032de4a5180440381c10e443021 100644 --- a/recipes/neverball/redox.patch +++ b/recipes/neverball/redox.patch @@ -42,7 +42,7 @@ diff -ruwN source/Makefile source-new/Makefile endif -OGL_LIBS := -lGL -+OGL_LIBS := -lorbital $(shell $(PKG_CONFIG) osmesa --libs) -lglapi ++OGL_LIBS := -lorbital $(shell $(PKG_CONFIG) osmesa --libs) ifeq ($(PLATFORM),mingw) ifneq ($(ENABLE_NLS),0) diff --git a/recipes/osdemo/recipe.sh b/recipes/osdemo/recipe.sh index 9737c853c05365844c800ec627aeb2369def8a13..fa797cd547d2fa7b4f2e632355823ae58290e53a 100644 --- a/recipes/osdemo/recipe.sh +++ b/recipes/osdemo/recipe.sh @@ -1,4 +1,4 @@ -BUILD_DEPENDS=(liborbital llvm mesa mesa_glu zlib) +BUILD_DEPENDS=(liborbital mesa mesa_glu zlib) function recipe_version { printf "1.0.0" @@ -19,7 +19,7 @@ function recipe_prepare { function recipe_build { sysroot="$(realpath ../sysroot)" set -x - "${CXX}" -O2 -I "$sysroot/include" -L "$sysroot/lib" osdemo.c -o osdemo -static -lorbital $("${PKG_CONFIG}" --libs glu) -lglapi -lz + "${CXX}" -O2 -I "$sysroot/include" -L "$sysroot/lib" osdemo.c -o osdemo -static -lorbital $("${PKG_CONFIG}" --libs glu) -lz set +x skip=1 } diff --git a/recipes/sdl2_gears/recipe.sh b/recipes/sdl2_gears/recipe.sh index 33da8adb2172a0189492a4b44012877fcb97f091..d300b48b2ebcbfa02f203bdac96825efdb4bdb05 100644 --- a/recipes/sdl2_gears/recipe.sh +++ b/recipes/sdl2_gears/recipe.sh @@ -1,4 +1,4 @@ -BUILD_DEPENDS=(sdl2_image sdl2_mixer sdl2_ttf sdl2 liborbital llvm mesa mesa_glu freetype libjpeg libpng libogg libvorbis zlib) +BUILD_DEPENDS=(sdl2_image sdl2_mixer sdl2_ttf sdl2 liborbital mesa mesa_glu freetype libjpeg libpng libogg libvorbis zlib) function recipe_version { printf "1.0.0" @@ -21,7 +21,7 @@ function recipe_prepare { function recipe_build { sysroot="$(realpath ../sysroot)" set -x - "${CXX}" -O2 -I "$sysroot/include" -L "$sysroot/lib" gears.c -o sdl2_gears -static -lSDL2_image -lSDL2_mixer -lSDL2_ttf -lSDL2 -lorbital $("${PKG_CONFIG}" --libs glu) -lfreetype -lpng -ljpeg -lvorbisfile -lvorbis -logg -lglapi -lz + "${CXX}" -O2 -I "$sysroot/include" -L "$sysroot/lib" gears.c -o sdl2_gears -static -lSDL2_image -lSDL2_mixer -lSDL2_ttf -lSDL2 -lorbital $("${PKG_CONFIG}" --libs glu) -lfreetype -lpng -ljpeg -lvorbisfile -lvorbis -logg -lz set +x skip=1 } diff --git a/recipes/sdl2_image/recipe.sh b/recipes/sdl2_image/recipe.sh index 7fe853e1559b9e8c25963d057467a0c7891c3976..ade62418c38e6bcfae229b0256e609bee2a5dcfe 100644 --- a/recipes/sdl2_image/recipe.sh +++ b/recipes/sdl2_image/recipe.sh @@ -1,6 +1,6 @@ VERSION=2.0.4 TAR=https://www.libsdl.org/projects/SDL_image/release/SDL2_image-$VERSION.tar.gz -BUILD_DEPENDS=(sdl2 liborbital mesa llvm mesa mesa_glu libiconv libjpeg libpng zlib) +BUILD_DEPENDS=(sdl2 liborbital mesa mesa mesa_glu libiconv libjpeg libpng zlib) function recipe_version { echo "$VERSION" @@ -16,7 +16,7 @@ function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" export LDFLAGS="-L$sysroot/lib" - export SDL_LIBS="-lSDL2 -lorbital $("${PKG_CONFIG}" --libs glu) -lglapi -lz -lm -lpthread -lstdc++" + export SDL_LIBS="-lSDL2 -lorbital $("${PKG_CONFIG}" --libs glu) -lz -lm -lpthread -lstdc++" ./configure --prefix=/ --build=${BUILD} --host=${HOST} --disable-shared --disable-sdltest --enable-png --enable-jpg "$REDOX_MAKE" -j"$($NPROC)" skip=1 diff --git a/recipes/sdl2_mixer/recipe.sh b/recipes/sdl2_mixer/recipe.sh index fe87ade35262c689a93ca9038cc21ce550fb8298..43860de6b65277a5bbad33833e30dc8c833c6840 100644 --- a/recipes/sdl2_mixer/recipe.sh +++ b/recipes/sdl2_mixer/recipe.sh @@ -1,6 +1,6 @@ VERSION=2.0.4 TAR=https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-$VERSION.tar.gz -BUILD_DEPENDS=(sdl2 liborbital llvm mesa mesa_glu zlib libogg libvorbis) +BUILD_DEPENDS=(sdl2 liborbital mesa mesa_glu zlib libogg libvorbis) function recipe_version { echo "$VERSION" @@ -16,7 +16,7 @@ function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" export LDFLAGS="-L$sysroot/lib" - export SDL_LIBS="-lSDL2 -lorbital $("${PKG_CONFIG}" --libs glu) -lglapi -lvorbis -logg -lz -lm -lpthread -lstdc++" + export SDL_LIBS="-lSDL2 -lorbital $("${PKG_CONFIG}" --libs glu) -lvorbis -logg -lz -lm -lpthread -lstdc++" ./autogen.sh ./configure \ --prefix=/ \ diff --git a/recipes/sdl2_ttf/recipe.sh b/recipes/sdl2_ttf/recipe.sh index b4467c54acd730ce1f6dae040fa0bc30fade7059..d9688ffc43617a6f8a7899585c2db7a232c1b71e 100644 --- a/recipes/sdl2_ttf/recipe.sh +++ b/recipes/sdl2_ttf/recipe.sh @@ -1,6 +1,6 @@ VERSION=2.0.15 TAR=https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-$VERSION.tar.gz -BUILD_DEPENDS=(sdl2 liborbital llvm mesa mesa_glu freetype libpng zlib) +BUILD_DEPENDS=(sdl2 liborbital mesa mesa_glu freetype libpng zlib) function recipe_version { echo "$VERSION" @@ -16,7 +16,7 @@ function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" export LDFLAGS="-L$sysroot/lib" - export SDL_LIBS="-lSDL2 -lorbital $("${PKG_CONFIG}" --libs glu) -lglapi -lz -lm -lpthread -lstdc++" + export SDL_LIBS="-lSDL2 -lorbital $("${PKG_CONFIG}" --libs glu) -lz -lm -lpthread -lstdc++" ./autogen.sh ./configure --prefix=/ --build=${BUILD} --host=${HOST} --enable-opengl --disable-shared --disable-sdltest "$REDOX_MAKE" -j"$($NPROC)"