summaryrefslogtreecommitdiff
path: root/net-misc/nx
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/nx')
-rw-r--r--net-misc/nx/Manifest7
-rw-r--r--net-misc/nx/files/nx-3.5.99.26-clang-bind.patch17
-rw-r--r--net-misc/nx/files/nx-3.5.99.26-musl.patch45
-rw-r--r--net-misc/nx/nx-3.5.99.26.ebuild5
-rw-r--r--net-misc/nx/nx-3.5.99.27.ebuild5
5 files changed, 32 insertions, 47 deletions
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 29dec0641307..78b304bb681c 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,12 +1,13 @@
AUX nx-3.5.99.26-binutils-2.36.patch 1130 BLAKE2B 80bcb5c7fa7d4e14493a6e641dab3db393da2d20aa90cd5da68520c90b20b608c8a247ef0c85ee8f501907fe45c3b68d7c122b133c14a37d90599bcf132b22a2 SHA512 f767cb459f82c5f69fd957b42f04c51fff5fb583a2f1b47edb14a33654f5e36b8371fa9ca886fbf13ef780e403af089c055349b21f0f1cb154bb82e32980bcb3
+AUX nx-3.5.99.26-clang-bind.patch 519 BLAKE2B bf134ed67305250dfd5640bd07b7e06462a168b3e7468b8eb9ad1e725126b4773ab672a5f9a99d61177f64750e70b2ac454bd4f9a7dd57b948214ea30ff24d89 SHA512 f9aba27268a2319058f2b6df3dc701657026199640f4f53cc12360e513411c76d72b12eec688b1c9311711cec45b9bf691f065d904b7d7f493b41e72bc796535
AUX nx-3.5.99.26-gcc14-32bit.patch 2033 BLAKE2B feefddc7af011ffd6e1432b3abb4846d5b6a3ba6eedf19ad3eed144599670335430da1b5dfdfc207f72a04189b2fbafd4dbc3297ddf1965b9933a22f2e19967f SHA512 9596c717b98951eaec930dda2b72a440bcc3e0fa5806130a23c66cb3d3e6a47f00c7dcb794498b9a29954b9e44d40298aa997f773ede277cf71a19eb85789291
AUX nx-3.5.99.26-gcc14-access.patch 974 BLAKE2B c08473dc34a6fbc261e6a9ac6fabe540279a0bbe2b0e8bd5b4accb7fc88ff11150adb2d52100300dc514614379e7e806f00cd00d779e2f5f029b6bb656606b8d SHA512 6274ed37ee8918a1b612971e907d793845338bd5cc93a83cf9631396bb75cbbfeafc2c9a07dbfa8fb1a5776fa45af7198b8668406bc2777826ada5b8cc9f59a4
-AUX nx-3.5.99.26-musl.patch 2203 BLAKE2B f4c43ed04ef6f35ef159ff30102cc6b52154e1a620a5a419f82e20f721f37832826ce0f8f141b6fdb6ce8a6814cd2fd5fec308c6f69f0b235b72578e67c1cbbd SHA512 f99052424faa49324aa79deeb92890e018872615c3d10bb0426e26487c3394201c6cb477628676583fda1794b1c980c07f31fdfe6379558694cce17734787131
+AUX nx-3.5.99.26-musl.patch 764 BLAKE2B 77f600b7a0403902e1bb962f2794a8af5d59e8c4db546a328f9241e9a50b3f45f9127f6aa6b4a2944f2442138808e3726d4dfea8e0f0bd8e5af86fd4eccb48de SHA512 4dded922a6ac29f659f6b21f5d86823e6fccfe24097b3bcb95653bd61bea0aa165bd0d6bcf0c823e7d4adc2ee59752b32fd70883ae3fa9e8abe68d576fd8efa4
AUX nx-3.5.99.26-riscv64-support.patch 2204 BLAKE2B a52c4bf54edb09a73d86ecaf6daf5aeff820493c927fb6277fac4d7f514117d2f55eb38bf81539af4b8793b439ff78772cda819979e0b144b69f0d272664ba90 SHA512 a7ebfd63a54436e61c895c43290f805833d1f704b1e17cdff6607239dc84cc08cd8bcab0a5e1154ffa8bde3d28e2482d9ecf9d6697c23df6f29797b7447fc052
AUX nx-3.5.99.26-which.patch 1157 BLAKE2B 0118abda74ceffa96bbf7fc1518ca5073c3a51b4762ba5769e061878613e27491e01c1d9ba3ca632b4de1166fce345e55f6840daf27608ce627f0c58b2b869b0 SHA512 b31ea5a6cbf5f65ac9a15ce83e2181dd1c9783e8b0ac9af24260399539a9c93bd0466d10cd7cf1eddbc95edfb1a1f7bd403f4cf1ebc66816463a2252300f4835
AUX nx-3.5.99.27-which.patch 758 BLAKE2B 6d8841c80f086592365042d225128ebd897b118f5fdf6c573df2a845ae08d54e08f8c5c349a3a601325fb82f83bc5411262cc48b05f28a6ba24de685ab11a491 SHA512 3adca92c7e6aad36eec354f7a637c864e0ebba99535d6568c52e033ebd07ce1b026204f9b849889b324184f479ffe6195249c7d3affb1852934cca980b7c018c
DIST nx-libs-3.5.99.26.tar.gz 11070624 BLAKE2B f67f522b127858aa2ddf1c9723468a74722a5ef2fa1e7f438844a8e5b05b868cacac22abf2c604c67d5e83a346217b192773f5debe67945d085768ae43205cb7 SHA512 1aead6161e4d7b8d7229ff80937935b23ad1f87135a578ae483a00348d0df7de35e9f9b78c47c473fda3ab2cc896ef23e845cc5656344a43520b091af9663211
DIST nx-libs-3.5.99.27.tar.gz 11076330 BLAKE2B 713f6052a8405bd61916bc2c31cff1b3b14f63f78138a2d8a3c8d85170fede3d126071ef0e03fa267ef1533432f324992ed67edc86f922e3dda4f0cb40811045 SHA512 bfba1eea6f4debe90fa020276079027c3716daaff91bded72297ecab2a8c9f56d07630ca8bc9084c319d2c674304ad80131190ec1272c161c05221d6f19089d0
-EBUILD nx-3.5.99.26.ebuild 4130 BLAKE2B f92015e1efa731e3dc1c75d6e29de00f7ef70b30c4dfe1a355b76ab1c13db2b027b716416e85afc435901c390c7ebc36483fc9c5b2a18503ce57763affcbb120 SHA512 7de6e10c81de359248e0d180a671ffe0d483acd2519aa1a5684f7eac44dbe3a19f677a6f22490874cae44e3576d26bc05fbfa1e0fbb643d44fcfbaaf540576d0
-EBUILD nx-3.5.99.27.ebuild 3872 BLAKE2B 4114a2ae478adb98e206b04c652e2e6e59a30ec443db819928916ece9f35c02511afb76422346ea608e0e45aee97b9ae33e1313030ba7d32176fe019a586a221 SHA512 fafcc97bc26438fa09fcaecdfeb1d0f6cf2c8a90c6e95d023a7ee19e8f8de8895954905f6c6cf71ee2a429a75fff84d05d23c22ec584e49933e81ff53e2b3132
+EBUILD nx-3.5.99.26.ebuild 4234 BLAKE2B a2608bc1cbf2395dc92685331adbfcd67e87aa36e0a68b547278842df665c1cb63d9ae77064aa93a11236722ad111f6292e16f40cccf2b53ba220951d17e529f SHA512 4ca8cab36f27c3bb087b7a8f4a8e760a92a0ac1c98a0042e95e5306650badba7dd89f61d30ff4fc8a07ceea9599b85ab4ccb8d8fb9ce42f4e214a8aa59f4a59b
+EBUILD nx-3.5.99.27.ebuild 3976 BLAKE2B 9050903fc189bae41a78409e12977cb191b3124b534aeb8f4bcdeb359fba76046ff8699df27a2fbb7b8541d136b22253cb8e5141b3e9a9ecb2a046b256d81ded SHA512 67a641243a091d1828a18b3fb0354868a3841339f29d8a3ebb0ad1e4203905bb1a9e2f384643e7e8ed1ea3a4ec1d17eeba7c33e50e368e2da39f36e68610f5bd
MISC metadata.xml 333 BLAKE2B 1b2843f4928b28b0b3abea2c4b7cf046c77d8c87363672f8516c7edab36597bd2ae831f23eecbec5c38029891bd5fa5bc0dc42a407e3d656ab6cfb098262f64a SHA512 77a92a8f8cec2c2a236544dc53e58fce7e0d399d9122042ddc6a097b58d013d04bad6e2ccaafcca11ce3c2e0ddd2d6aa479776e1e37539e40e3645ed20485bfd
diff --git a/net-misc/nx/files/nx-3.5.99.26-clang-bind.patch b/net-misc/nx/files/nx-3.5.99.26-clang-bind.patch
new file mode 100644
index 000000000000..112268b33b75
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.99.26-clang-bind.patch
@@ -0,0 +1,17 @@
+Fix:
+
+Loop.cpp:4224:34: error: invalid operands to binary expression ('__bind<int &, sockaddr *&, unsigned int &>' and 'int')
+
+https://github.com/ArcticaProject/nx-libs/issues/1044
+https://bugs.gentoo.org/930440
+--- a/nxcomp/src/Loop.cpp
++++ b/nxcomp/src/Loop.cpp
+@@ -4221,7 +4221,7 @@
+ goto SetupSocketError;
+ }
+
+- if (bind(newFD, addr, addrlen) == -1)
++ if (::bind(newFD, addr, addrlen) == -1)
+ {
+ nxfatal << "Loop: PANIC! Call to bind failed for " << label
+ << ". Error is " << EGET()
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>
diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild
index 437f6f51c202..255ff13f8658 100644
--- a/net-misc/nx/nx-3.5.99.26.ebuild
+++ b/net-misc/nx/nx-3.5.99.26.ebuild
@@ -7,6 +7,7 @@ inherit autotools flag-o-matic toolchain-funcs
DESCRIPTION="NX compression technology core libraries"
HOMEPAGE="https://github.com/ArcticaProject/nx-libs"
SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-libs-${PV}.tar.gz"
+S="${WORKDIR}/nx-libs-${PV}"
LICENSE="GPL-2"
SLOT="0"
@@ -41,8 +42,6 @@ BDEPEND="virtual/pkgconfig
RDEPEND+=" selinux? ( sec-policy/selinux-nx )"
-S="${WORKDIR}/nx-libs-${PV}"
-
PATCHES=(
# https://github.com/ArcticaProject/nx-libs/pull/1012
"${FILESDIR}/${PN}-3.5.99.26-binutils-2.36.patch"
@@ -53,6 +52,8 @@ PATCHES=(
# https://github.com/ArcticaProject/nx-libs/pull/1087
"${FILESDIR}/${PN}-3.5.99.26-gcc14-32bit.patch"
"${FILESDIR}/${PN}-3.5.99.26-gcc14-access.patch"
+ # https://github.com/ArcticaProject/nx-libs/issues/1044
+ "${FILESDIR}/${PN}-3.5.99.26-clang-bind.patch"
)
src_prepare() {
diff --git a/net-misc/nx/nx-3.5.99.27.ebuild b/net-misc/nx/nx-3.5.99.27.ebuild
index 9df06029d9a7..d4ef7e951c9a 100644
--- a/net-misc/nx/nx-3.5.99.27.ebuild
+++ b/net-misc/nx/nx-3.5.99.27.ebuild
@@ -8,6 +8,7 @@ DESCRIPTION="NX compression technology core libraries"
HOMEPAGE="https://github.com/ArcticaProject/nx-libs"
SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-libs-${PV}.tar.gz"
+S="${WORKDIR}/nx-libs-${PV}"
LICENSE="GPL-2"
SLOT="0"
@@ -39,14 +40,14 @@ BDEPEND="virtual/pkgconfig
x11-misc/gccmakedep
x11-misc/imake"
-S="${WORKDIR}/nx-libs-${PV}"
-
PATCHES=(
"${FILESDIR}/${PN}-3.5.99.26-musl.patch"
"${FILESDIR}/${PN}-3.5.99.27-which.patch"
# https://github.com/ArcticaProject/nx-libs/pull/1087
"${FILESDIR}/${PN}-3.5.99.26-gcc14-32bit.patch"
"${FILESDIR}/${PN}-3.5.99.26-gcc14-access.patch"
+ # https://github.com/ArcticaProject/nx-libs/issues/1044
+ "${FILESDIR}/${PN}-3.5.99.26-clang-bind.patch"
)
src_prepare() {
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-04 07:30:13 +0000