diff options
| author |   Cristian Othón Martínez Vera <cfuga@cfuga.mx> | 2025-02-10 15:53:57 -0600 |
|---|---|---|
| committer |   Bernard Cafarelli <voyageur@gentoo.org> | 2025-02-16 21:09:05 +0100 |
| commit | 5cbf813d006576c2077a94f718e7bd19ec34dec7 (patch) | |
| tree | 37d947014950714d7d59b2f0ef9934aaeef71790 /net-misc | |
| parent | net-misc/nx: fix compilation with clang (diff) | |
| download | gentoo-5cbf813d006576c2077a94f718e7bd19ec34dec7.tar.gz gentoo-5cbf813d006576c2077a94f718e7bd19ec34dec7.tar.bz2 gentoo-5cbf813d006576c2077a94f718e7bd19ec34dec7.zip | |
net-misc/nx: cleanup musl patch
Upstream already included a (partial) fix for musl.
https://github.com/ArcticaProject/nx-libs/pull/982
I updated the patch, and now only fixes ```xf86bigfont.c``` compilation with a
Xorg backport.
https://gitlab.freedesktop.org/xorg/xserver/-/commit/6634ffc4d26846dcf892f27682f9021f6d9956a9
Signed-off-by: Cristian Othón Martínez Vera <cfuga@cfuga.mx>
Closes: https://github.com/gentoo/gentoo/pull/40518
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/nx/files/nx-3.5.99.26-musl.patch | 45 |
1 files changed, 5 insertions, 40 deletions
diff --git a/net-misc/nx/files/nx-3.5.99.26-musl.patch b/net-misc/nx/files/nx-3.5.99.26-musl.patch index 738b7a2469aa..2c2030e4a9b4 100644 --- a/net-misc/nx/files/nx-3.5.99.26-musl.patch +++ b/net-misc/nx/files/nx-3.5.99.26-musl.patch @@ -1,43 +1,8 @@ -diff -uNr a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h ---- a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h 2021-02-04 07:34:56.000000000 -0600 -+++ b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h 2023-03-16 13:55:33.983114692 -0600 -@@ -62,9 +62,6 @@ - #include <stdlib.h> - #include <stdio.h> - #include <string.h> --#if defined(__linux__) && defined(__i386__) --#include <fpu_control.h> --#endif - #endif - #include <float.h> - #include <stdarg.h> -diff -uNr a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c ---- a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c 2021-02-04 07:34:56.000000000 -0600 -+++ b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c 2023-03-16 13:56:25.569122176 -0600 -@@ -1169,20 +1169,6 @@ - static GLboolean initialized = GL_FALSE; - if (!initialized) { - init_sqrt_table(); -- --#if defined(_FPU_GETCW) && defined(_FPU_SETCW) -- { -- const char *debug = _mesa_getenv("MESA_DEBUG"); -- if (debug && _mesa_strcmp(debug, "FP")==0) { -- /* die on FP exceptions */ -- fpu_control_t mask; -- _FPU_GETCW(mask); -- mask &= ~(_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM -- | _FPU_MASK_OM | _FPU_MASK_UM); -- _FPU_SETCW(mask); -- } -- } --#endif - initialized = GL_TRUE; - } - -diff -uNr a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c ---- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c 2021-02-04 07:34:56.000000000 -0600 -+++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c 2023-03-16 13:57:30.694956647 -0600 +https://bugs.gentoo.org/713418 +Backport from Xorg: https://gitlab.freedesktop.org/xorg/xserver/-/commit/6634ffc4d26846dcf892f27682f9021f6d9956a9 + +--- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c ++++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c @@ -40,14 +40,7 @@ #include <sys/types.h> |