From 38c20fb51b0482ec1b2c2a34ed16227718eac4b2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 30 Jun 2023 01:41:48 +0100 Subject: gentoo auto-resync : 30:06:2023 - 01:41:48 --- net-misc/nx/Manifest | 3 + net-misc/nx/files/nx-3.5.99.27-which.patch | 22 +++++ net-misc/nx/nx-3.5.99.27.ebuild | 141 +++++++++++++++++++++++++++++ 3 files changed, 166 insertions(+) create mode 100644 net-misc/nx/files/nx-3.5.99.27-which.patch create mode 100644 net-misc/nx/nx-3.5.99.27.ebuild (limited to 'net-misc/nx') diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest index 00d39cd8e9d2..43d07b4cce9a 100644 --- a/net-misc/nx/Manifest +++ b/net-misc/nx/Manifest @@ -2,6 +2,9 @@ AUX nx-3.5.99.26-binutils-2.36.patch 1130 BLAKE2B 80bcb5c7fa7d4e14493a6e641dab3d 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 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 3778 BLAKE2B b80f3f4a4b02aa32c3ce9d5a99521187b3284f1d1d8d850ab915792dd6ab48552d38d41df5f83068cbdac27ab9a1c39c85110618196e3737946cd38505028c48 SHA512 3ffaff82921912897ac112ff569cbcabe3809a256134b51eb6b2eb7746b50ab26c9c3300a2cda860bedca175f31fc6d64ffc80e635a3cddea49863a79ffc35fd +EBUILD nx-3.5.99.27.ebuild 3520 BLAKE2B d109cf890afbb7e00eb022db10ebadc8b8f1191fe3e6ebba891083c854110299fcee21d8222bdf17d433d9b5f3593adec009d598491a5545f89d3233632cee6e SHA512 66d6730129efeaf8d2e91f7ab3b6476b7593afe3f62ed720b5a841b8c21e0e65328a19edcede62b1e3e419ad05364c882da2a76a8c85dd9ba74655e815e81636 MISC metadata.xml 333 BLAKE2B 1b2843f4928b28b0b3abea2c4b7cf046c77d8c87363672f8516c7edab36597bd2ae831f23eecbec5c38029891bd5fa5bc0dc42a407e3d656ab6cfb098262f64a SHA512 77a92a8f8cec2c2a236544dc53e58fce7e0d399d9122042ddc6a097b58d013d04bad6e2ccaafcca11ce3c2e0ddd2d6aa479776e1e37539e40e3645ed20485bfd diff --git a/net-misc/nx/files/nx-3.5.99.27-which.patch b/net-misc/nx/files/nx-3.5.99.27-which.patch new file mode 100644 index 000000000000..4d452dad0157 --- /dev/null +++ b/net-misc/nx/files/nx-3.5.99.27-which.patch @@ -0,0 +1,22 @@ +--- a/nx-X11/Makefile ++++ b/nx-X11/Makefile +@@ -70,7 +70,7 @@ + else \ + exit 0; \ + fi +- which $(IMAKE) 1>/dev/null && $(IMAKE_CMD) $(MFLAGS) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) ++ command -v $(IMAKE) 1>/dev/null && $(IMAKE_CMD) $(MFLAGS) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) + + # don't allow any default rules in this Makefile + .SUFFIXES: +--- a/nx-X11/extras/Mesa_6.4.2/bin/mklib ++++ b/nx-X11/extras/Mesa_6.4.2/bin/mklib +@@ -285,7 +285,7 @@ + # -linker was not specified, choose default linker now + if [ $CPLUSPLUS = 1 ] ; then + # determine linker and options for C++ code +- if [ `which c++` ] ; then ++ if [ `command -v c++` ] ; then + # use Sun c++ + LINK="c++" + elif [ `type g++` ] ; then diff --git a/net-misc/nx/nx-3.5.99.27.ebuild b/net-misc/nx/nx-3.5.99.27.ebuild new file mode 100644 index 000000000000..e054f77bb1e5 --- /dev/null +++ b/net-misc/nx/nx-3.5.99.27.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +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 ~arm64 ~ppc ~riscv ~x86" + +RDEPEND="dev-libs/libxml2 + media-libs/libjpeg-turbo:* + >=media-libs/libpng-1.2.8:0= + >=sys-libs/zlib-1.2.3 + 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="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" +) + +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 --enable-static + 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 +} -- cgit v1.2.3