From 2d266888d9b49d99804c620776ad4401adfa6129 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 6 Apr 2021 13:22:38 -0600
Subject: [PATCH] Disable llvmpipe for now, until it can be fixed

---
 recipes/gears/recipe.sh       | 4 ++--
 recipes/mesa/recipe.sh        | 8 ++++----
 recipes/neverball/recipe.sh   | 4 ++--
 recipes/neverball/redox.patch | 2 +-
 recipes/osdemo/recipe.sh      | 4 ++--
 recipes/sdl2_gears/recipe.sh  | 4 ++--
 recipes/sdl2_image/recipe.sh  | 4 ++--
 recipes/sdl2_mixer/recipe.sh  | 4 ++--
 recipes/sdl2_ttf/recipe.sh    | 4 ++--
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/recipes/gears/recipe.sh b/recipes/gears/recipe.sh
index 570139e97..9dba93e37 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 853b582eb..d93606983 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 12cf43ce8..5e3bab5ac 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 9ebd2189c..376893ef1 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 9737c853c..fa797cd54 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 33da8adb2..d300b48b2 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 7fe853e15..ade62418c 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 fe87ade35..43860de6b 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 b4467c54a..d9688ffc4 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)"
-- 
GitLab