gentoo auto-resync : 19:03:2023 - 06:33:49

5 files changed, 114 insertions, 141 deletions

diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index ec63f50cbc72..ef02b3a9fbf8 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,7 +1,7 @@
+AUX nx-3.5.99.25-musl.patch 2182 BLAKE2B f32e06f3c35a89b8b18fa9d9fc64b5e51e898e3b34ded78c37fbb30e75d2104a1df1584efe3c9c15356a9abe1106f9a8cc83cebaa08609fa1603bdf0b07cf966 SHA512 54b958e1f717180c5d66194b1b67c4c4adb235a654bec9ec4c73a2707baa69643dcfa02a3f9d8f0b2ed2c931dc766ab9a056e8f7474ffbff824ef5f8ab03bea7
 AUX nx-3.5.99.26-binutils-2.36.patch 1130 BLAKE2B 80bcb5c7fa7d4e14493a6e641dab3db393da2d20aa90cd5da68520c90b20b608c8a247ef0c85ee8f501907fe45c3b68d7c122b133c14a37d90599bcf132b22a2 SHA512 f767cb459f82c5f69fd957b42f04c51fff5fb583a2f1b47edb14a33654f5e36b8371fa9ca886fbf13ef780e403af089c055349b21f0f1cb154bb82e32980bcb3
+AUX nx-3.5.99.26-musl.patch 2203 BLAKE2B f4c43ed04ef6f35ef159ff30102cc6b52154e1a620a5a419f82e20f721f37832826ce0f8f141b6fdb6ce8a6814cd2fd5fec308c6f69f0b235b72578e67c1cbbd SHA512 f99052424faa49324aa79deeb92890e018872615c3d10bb0426e26487c3394201c6cb477628676583fda1794b1c980c07f31fdfe6379558694cce17734787131
 AUX nx-3.5.99.26-riscv64-support.patch 2204 BLAKE2B a52c4bf54edb09a73d86ecaf6daf5aeff820493c927fb6277fac4d7f514117d2f55eb38bf81539af4b8793b439ff78772cda819979e0b144b69f0d272664ba90 SHA512 a7ebfd63a54436e61c895c43290f805833d1f704b1e17cdff6607239dc84cc08cd8bcab0a5e1154ffa8bde3d28e2482d9ecf9d6697c23df6f29797b7447fc052
-DIST nx-libs-3.5.99.25.tar.gz 11065489 BLAKE2B 9210441fd2dc38fec14c90018ead4e3ddacd5ac266a26b1d985f874af0abdef3fdc2255614e45ec23816f1194ebe6ffe2beb776901eb1ed206658e8175b1ff57 SHA512 142378ae9a81542ed1bc969e9fcb2d421f1d63f7d46185c80e1e07493298e62379697ca2a367301c0f3df631acb19510113f3852922454fdc964767c36a81004
 DIST nx-libs-3.5.99.26.tar.gz 11070624 BLAKE2B f67f522b127858aa2ddf1c9723468a74722a5ef2fa1e7f438844a8e5b05b868cacac22abf2c604c67d5e83a346217b192773f5debe67945d085768ae43205cb7 SHA512 1aead6161e4d7b8d7229ff80937935b23ad1f87135a578ae483a00348d0df7de35e9f9b78c47c473fda3ab2cc896ef23e845cc5656344a43520b091af9663211
-EBUILD nx-3.5.99.25.ebuild 3394 BLAKE2B d74d201f993e24e2313b9f90f2a20ea65fbdfdc3752d28cd4cb518c5f016eb270f86d35eac8b5c58c6f32a0a6cd6c75ca06a27af2c228d28afc31e47210a7459 SHA512 01d974b6eea37e3c3e7f9a0bf7245fa30a79ce674139d5ac066ab2b295d75b48232200034d4ae030147e3539f2f747c147a017da0766dbfb1ac2e3c18f0aa128
-EBUILD nx-3.5.99.26.ebuild 3635 BLAKE2B 385e0c3b92d179522e8396e82fcdbd9304805dbf10174e0fb7ee6900d163cf8b4d4afdfef1fa34aaaa7e9e16cf07b9c90d1ef89035108ce6c32c2aca9e8ab60c SHA512 25a550a078e88a23f9856b6d267fde21a24f4e999e170834a049593e4ed508cbcd8b97062b2cd29f52240dfe52bb820299b0b86f116b3216a58daa47e313638c
+EBUILD nx-3.5.99.26.ebuild 3677 BLAKE2B a22f517cba122c5e2030922728ff5b727b6820ac3fe87ed884e6bc5cb1dd7381becb35a4f70a30176beddc7dc874ced3e1308412dc7420da7af0b71f719b7667 SHA512 7f1d62b0c5a86b5570e90a6faf53ab22aa68f9c0a733300f0e464fe22c423b5938e20843083d550c540f9ba02e30b2adade815483e5aba11a8e6c8ca26aae28d
 MISC metadata.xml 333 BLAKE2B 1b2843f4928b28b0b3abea2c4b7cf046c77d8c87363672f8516c7edab36597bd2ae831f23eecbec5c38029891bd5fa5bc0dc42a407e3d656ab6cfb098262f64a SHA512 77a92a8f8cec2c2a236544dc53e58fce7e0d399d9122042ddc6a097b58d013d04bad6e2ccaafcca11ce3c2e0ddd2d6aa479776e1e37539e40e3645ed20485bfd
diff --git a/net-misc/nx/files/nx-3.5.99.25-musl.patch b/net-misc/nx/files/nx-3.5.99.25-musl.patch
new file mode 100644
index 000000000000..d7f76c04802c
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.99.25-musl.patch
@@ -0,0 +1,54 @@
+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	2020-11-04 06:43:58.000000000 -0600
++++ b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h	2023-03-16 12:58:34.515215736 -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	2020-11-04 06:43:58.000000000 -0600
++++ b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c	2023-03-16 12:59:23.828001633 -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	2020-11-04 06:43:58.000000000 -0600
++++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c	2023-03-16 13:01:30.256598143 -0600
+@@ -40,13 +40,6 @@
+ 
+ #include <sys/types.h>
+ #ifdef HAS_SHM
+-#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2)
+-/* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */
+-/* Linux libc4 and libc5 only (because glibc doesn't include kernel headers):
+-   Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
+-   PAGE_SIZE. It is defined in <asm/page.h>. */
+-#include <asm/page.h>
+-#endif
+ #ifdef SVR4
+ #include <sys/sysmacros.h>
+ #endif
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
new file mode 100644
index 000000000000..738b7a2469aa
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.99.26-musl.patch
@@ -0,0 +1,55 @@
+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
+@@ -40,14 +40,7 @@
+ 
+ #include <sys/types.h>
+ #ifdef HAS_SHM
+-#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2)
+-/* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */
+-/* Linux libc4 and libc5 only (because glibc doesn't include kernel headers):
+-   Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
+-   PAGE_SIZE. It is defined in <asm/page.h>. */
+-#include <asm/page.h>
+ #include <limits.h>
+-#endif
+ #ifdef SVR4
+ #include <sys/sysmacros.h>
+ #endif
diff --git a/net-misc/nx/nx-3.5.99.25.ebuild b/net-misc/nx/nx-3.5.99.25.ebuild
deleted file mode 100644
index 10bdd7240081..000000000000
--- a/net-misc/nx/nx-3.5.99.25.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="dev-libs/libxml2
-	>=media-libs/libpng-1.2.8:0=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:*
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXfont2
-	x11-libs/libXinerama
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pixman"
-
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libfontenc"
-
-BDEPEND="sys-apps/which
-	virtual/pkgconfig
-	x11-misc/gccmakedep
-	x11-misc/imake"
-
-S="${WORKDIR}/nx-libs-${PV}"
-
-src_prepare() {
-	default
-
-	# We want predictable behavior. So let's assume we never
-	# have quilt installed.
-	sed 's@which quilt@false@' -i mesa-quilt || die
-
-	# Do not compress man pages by default
-	sed '/^[[:space:]]*gzip.*man/d' -i Makefile || die
-
-	# run autoreconf in all needed folders
-	local subdir
-	for subdir in nxcomp nxdialog nx-X11/lib nxcompshad nxproxy ; do
-		pushd ${subdir} || die
-		eautoreconf
-		popd || die
-	done
-}
-
-src_configure() {
-	# From xorg-x11-6.9.0-r3.ebuild
-	pushd nx-X11 || die
-	HOSTCONF="config/cf/host.def"
-	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
-	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	# Respect LDFLAGS
-	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-	# Disable SunRPC, #370767
-	echo "#define HasSecureRPC NO" >> ${HOSTCONF}
-	popd || die
-
-	local subdir
-	for subdir in nxcomp nxdialog nxcompshad nxproxy ; do
-		pushd ${subdir} || die
-		econf
-		popd || die
-	done
-
-	pushd "nx-X11/lib" || die
-	econf --disable-poll
-	popd || die
-}
-
-src_compile() {
-	# First set up the build environment
-	emake build-env
-
-	# We replicate the "build-full" make target here because
-	# we cannot call "make build-full" as it
-	#  - calls autoreconf several times
-	#  - invokes make directly but we prefer our emake
-
-	emake -C nxcomp
-	emake -C nx-X11/lib
-
-	mkdir -p nx-X11/exports/lib/ || die
-	local nxlib
-	for nxlib in libNX_X11.so{,.6{,.3.0}} ; do
-		ln -s ../../lib/src/.libs/${nxlib} nx-X11/exports/lib/${nxlib} || die
-	done
-
-	emake -C nxcompshad
-
-	./mesa-quilt push -a || die
-
-	emake -C nx-X11 BuildDependsOnly
-	# Parallel make issue resurfaced, upstream working on autotools switch
-	emake -j1 -C nx-X11 World \
-		USRLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/X11" \
-		SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		ETCDIR_NX="${EPREFIX}/etc/nxagent"
-
-	emake -C nxproxy
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		NXLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \
-		SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		USRLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/X11" \
-		ETCDIR_NX="${EPREFIX}/etc/nxagent" \
-		install
-
-	# Already provided by mesa & related packages
-	rm -r "${ED}"/usr/include/GL || die
-
-	# Get rid of libtool files and static libs.
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild
index 2e50edab9c33..55392ed99c6b 100644
--- a/net-misc/nx/nx-3.5.99.26.ebuild
+++ b/net-misc/nx/nx-3.5.99.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.5.99.26-binutils-2.36.patch"
 	# https://github.com/ArcticaProject/nx-libs/pull/1023
 	"${FILESDIR}/${PN}-3.5.99.26-riscv64-support.patch"
+	"${FILESDIR}/${PN}-3.5.99.26-musl.patch"
 )
 
 src_prepare() {