From 846c61b2a1f854fce2cfecfa1b2ed125d7b287f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Sep 2024 12:01:19 +0100 Subject: x11-misc/nvidia-settings : revision bump --- .../files/nvidia-settings-550-linker.patch | 24 ++++++ .../nvidia-settings-550.107.02-r1.ebuild | 94 ++++++++++++++++++++++ .../nvidia-settings-550.107.02.ebuild | 94 ---------------------- 3 files changed, 118 insertions(+), 94 deletions(-) create mode 100644 x11-misc/nvidia-settings/files/nvidia-settings-550-linker.patch create mode 100644 x11-misc/nvidia-settings/nvidia-settings-550.107.02-r1.ebuild delete mode 100644 x11-misc/nvidia-settings/nvidia-settings-550.107.02.ebuild (limited to 'x11-misc') diff --git a/x11-misc/nvidia-settings/files/nvidia-settings-550-linker.patch b/x11-misc/nvidia-settings/files/nvidia-settings-550-linker.patch new file mode 100644 index 00000000..931bf16f --- /dev/null +++ b/x11-misc/nvidia-settings/files/nvidia-settings-550-linker.patch @@ -0,0 +1,24 @@ +diff '--color=auto' -Nur a/src/libXNVCtrl/utils.mk b/src/libXNVCtrl/utils.mk +--- a/src/libXNVCtrl/utils.mk 2024-07-29 22:36:22.000000000 +0100 ++++ b/src/libXNVCtrl/utils.mk 2024-09-13 11:58:38.747900807 +0100 +@@ -590,7 +590,7 @@ + $$(OUTPUTDIR)/$$(notdir $(1)).o: $(1) + $(at_if_quiet)$$(MKDIR) $$(OUTPUTDIR) + $(at_if_quiet)cd $$(dir $(1)); \ +- $$(call quiet_cmd_no_at,LD) -r -z noexecstack --format=binary \ ++ $$(call quiet_cmd_no_at,NVLD) -r -z noexecstack --format=binary \ + $$(LD_TARGET_EMULATION_FLAG) \ + $$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@) + $$(call quiet_cmd,OBJCOPY) \ +diff '--color=auto' -Nur a/utils.mk b/utils.mk +--- a/utils.mk 2024-07-29 22:36:22.000000000 +0100 ++++ b/utils.mk 2024-09-13 11:57:53.341987920 +0100 +@@ -590,7 +590,7 @@ + $$(OUTPUTDIR)/$$(notdir $(1)).o: $(1) + $(at_if_quiet)$$(MKDIR) $$(OUTPUTDIR) + $(at_if_quiet)cd $$(dir $(1)); \ +- $$(call quiet_cmd_no_at,LD) -r -z noexecstack --format=binary \ ++ $$(call quiet_cmd_no_at,NVLD) -r -z noexecstack --format=binary \ + $$(LD_TARGET_EMULATION_FLAG) \ + $$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@) + $$(call quiet_cmd,OBJCOPY) \ diff --git a/x11-misc/nvidia-settings/nvidia-settings-550.107.02-r1.ebuild b/x11-misc/nvidia-settings/nvidia-settings-550.107.02-r1.ebuild new file mode 100644 index 00000000..6fdd9da7 --- /dev/null +++ b/x11-misc/nvidia-settings/nvidia-settings-550.107.02-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop multilib toolchain-funcs + +DESCRIPTION="NVIDIA Linux X11 Settings Utility" +HOMEPAGE="http://www.nvidia.com/" +SRC_URI="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="-* amd64" +IUSE="" +RESTRICT="strip" + +QA_PREBUILT= + +COMMON_DEPEND=" + x11-libs/gtk+:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm + x11-libs/gdk-pixbuf-xlib + media-libs/mesa + x11-libs/pango[X] + x11-libs/libXv + x11-libs/libXrandr + dev-libs/glib:2 + dev-libs/jansson + x11-libs/cairo + >=x11-libs/libvdpau-1.0" + +RDEPEND="${COMMON_DEPEND} + !!x11-misc/nvidia-settings:3 + !!x11-misc/nvidia-settings:4 + x11-drivers/nvidia-drivers:${SLOT}" +DEPEND="${RDEPEND} + virtual/pkgconfig + x11-base/xorg-proto" + +src_prepare() { + default + eapply "${FILESDIR}"/"${PN}"-550-linker.patch +} + + +src_compile() { + einfo "Building libXNVCtrl..." + emake -C src/libXNVCtrl \ + DO_STRIP= \ + LIBDIR="$(get_libdir)" \ + NVLD="$(tc-getLD)" \ + NV_VERBOSE=1 \ + OUTPUTDIR=. \ + RANLIB="$(tc-getRANLIB)" + + einfo "Building nvidia-settings..." + emake -C src/ \ + DO_STRIP= \ + GTK3_AVAILABLE=1 \ + LIBDIR="$(get_libdir)" \ + NVLD="$(tc-getLD)" \ + NVML_ENABLED=0 \ + NV_USE_BUNDLED_LIBJANSSON=0 \ + NV_VERBOSE=1 \ + OUTPUTDIR=. +} + +src_install() { + emake -C src/ \ + DESTDIR="${D}" \ + DO_STRIP= \ + GTK3_AVAILABLE=1 \ + LIBDIR="${D}/usr/$(get_libdir)" \ + NV_USE_BUNDLED_LIBJANSSON=0 \ + NV_VERBOSE=1 \ + OUTPUTDIR=. \ + PREFIX=/usr \ + install + + insinto /usr/$(get_libdir) + doins src/libXNVCtrl/libXNVCtrl.a + + insinto /usr/include/NVCtrl + doins src/libXNVCtrl/*.h + + doicon doc/${PN}.png || die + domenu ${FILESDIR}/${PN}.desktop || die + + dodoc doc/*.txt +} diff --git a/x11-misc/nvidia-settings/nvidia-settings-550.107.02.ebuild b/x11-misc/nvidia-settings/nvidia-settings-550.107.02.ebuild deleted file mode 100644 index c60069c5..00000000 --- a/x11-misc/nvidia-settings/nvidia-settings-550.107.02.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop multilib toolchain-funcs - -DESCRIPTION="NVIDIA Linux X11 Settings Utility" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="-* amd64" -IUSE="" -RESTRICT="strip" - -QA_PREBUILT= - -COMMON_DEPEND=" - x11-libs/gtk+:2 - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/gdk-pixbuf-xlib - media-libs/mesa - x11-libs/pango[X] - x11-libs/libXv - x11-libs/libXrandr - dev-libs/glib:2 - dev-libs/jansson - x11-libs/cairo - >=x11-libs/libvdpau-1.0" - -RDEPEND="${COMMON_DEPEND} - !!x11-misc/nvidia-settings:3 - !!x11-misc/nvidia-settings:4 - x11-drivers/nvidia-drivers:${SLOT}" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto" - -src_prepare() { - default - eapply "${FILESDIR}"/"${PN}"-linker.patch -} - - -src_compile() { - einfo "Building libXNVCtrl..." - emake -C src/libXNVCtrl \ - DO_STRIP= \ - LIBDIR="$(get_libdir)" \ - NVLD="$(tc-getLD)" \ - NV_VERBOSE=1 \ - OUTPUTDIR=. \ - RANLIB="$(tc-getRANLIB)" - - einfo "Building nvidia-settings..." - emake -C src/ \ - DO_STRIP= \ - GTK3_AVAILABLE=1 \ - LIBDIR="$(get_libdir)" \ - NVLD="$(tc-getLD)" \ - NVML_ENABLED=0 \ - NV_USE_BUNDLED_LIBJANSSON=0 \ - NV_VERBOSE=1 \ - OUTPUTDIR=. -} - -src_install() { - emake -C src/ \ - DESTDIR="${D}" \ - DO_STRIP= \ - GTK3_AVAILABLE=1 \ - LIBDIR="${D}/usr/$(get_libdir)" \ - NV_USE_BUNDLED_LIBJANSSON=0 \ - NV_VERBOSE=1 \ - OUTPUTDIR=. \ - PREFIX=/usr \ - install - - insinto /usr/$(get_libdir) - doins src/libXNVCtrl/libXNVCtrl.a - - insinto /usr/include/NVCtrl - doins src/libXNVCtrl/*.h - - doicon doc/${PN}.png || die - domenu ${FILESDIR}/${PN}.desktop || die - - dodoc doc/*.txt -} -- cgit v1.2.3