From 6066dc86abd205e4d89816e4acd011005f64affd Mon Sep 17 00:00:00 2001 From: Matheus Date: Mon, 26 Aug 2024 17:45:42 -0300 Subject: [PATCH] xscreensaver: compile with glx --- patches/mlibc/jinx-working-patch.patch | 18 +++++++++++++++--- recipes/xscreensaver | 4 ++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/patches/mlibc/jinx-working-patch.patch b/patches/mlibc/jinx-working-patch.patch index 6f43980c..9ea519a5 100644 --- a/patches/mlibc/jinx-working-patch.patch +++ b/patches/mlibc/jinx-working-patch.patch @@ -101,10 +101,22 @@ index fc34a3b..b1a95a9 100644 #include diff --git mlibc-clean/options/posix/generic/unistd-stubs.cpp mlibc-workdir/options/posix/generic/unistd-stubs.cpp -index 16ab8b7..688908c 100644 +index 16ab8b7..5ccc503 100644 --- mlibc-clean/options/posix/generic/unistd-stubs.cpp +++ mlibc-workdir/options/posix/generic/unistd-stubs.cpp -@@ -1257,6 +1257,7 @@ void encrypt(char[64], int) { +@@ -484,8 +484,9 @@ int lockf(int fd, int op, off_t size) { + } + + int nice(int) { +- __ensure(!"Not implemented"); +- __builtin_unreachable(); ++ return EPERM; ++ //__ensure(!"Not implemented"); ++ //__builtin_unreachable(); + } + + long pathconf(const char *, int name) { +@@ -1257,6 +1258,7 @@ void encrypt(char[64], int) { } #endif @@ -112,7 +124,7 @@ index 16ab8b7..688908c 100644 #if __MLIBC_BSD_OPTION void *sbrk(intptr_t increment) { if(increment) { -@@ -1273,3 +1274,4 @@ void *sbrk(intptr_t increment) { +@@ -1273,3 +1275,4 @@ void *sbrk(intptr_t increment) { return out; } #endif diff --git a/recipes/xscreensaver b/recipes/xscreensaver index 5d6198ba..d66dc4be 100644 --- a/recipes/xscreensaver +++ b/recipes/xscreensaver @@ -3,10 +3,10 @@ revision=1 from_source=xscreensaver imagedeps="meson ninja base-devel intltool" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libxcrypt libx11 libxt libjpeg-turbo libpng libxft libxext libxi" +deps="mlibc libxcrypt libx11 libxt libjpeg-turbo libpng libxft libxext libxi mesa glu" build() { - ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral + ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --with-glx make -j${parallelism} }