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 --- .../md5-cache/x11-misc/nvidia-settings-550.107.02 | 14 ---- .../x11-misc/nvidia-settings-550.107.02-r1 | 14 ++++ metadata/pkg_desc_index | 2 +- .../files/nvidia-settings-550-linker.patch | 24 ++++++ .../nvidia-settings-550.107.02-r1.ebuild | 94 ++++++++++++++++++++++ .../nvidia-settings-550.107.02.ebuild | 94 ---------------------- 6 files changed, 133 insertions(+), 109 deletions(-) delete mode 100644 metadata/md5-cache/x11-misc/nvidia-settings-550.107.02 create mode 100644 metadata/md5-cache/x11-misc/nvidia-settings-550.107.02-r1 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 diff --git a/metadata/md5-cache/x11-misc/nvidia-settings-550.107.02 b/metadata/md5-cache/x11-misc/nvidia-settings-550.107.02 deleted file mode 100644 index 9b9ed396..00000000 --- a/metadata/md5-cache/x11-misc/nvidia-settings-550.107.02 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile install prepare -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 !!x11-misc/nvidia-settings:3 !!x11-misc/nvidia-settings:4 x11-drivers/nvidia-drivers:5 virtual/pkgconfig x11-base/xorg-proto -DESCRIPTION=NVIDIA Linux X11 Settings Utility -EAPI=8 -HOMEPAGE=http://www.nvidia.com/ -INHERIT=desktop multilib toolchain-funcs -KEYWORDS=-* amd64 -LICENSE=GPL-2 -RDEPEND=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 !!x11-misc/nvidia-settings:3 !!x11-misc/nvidia-settings:4 x11-drivers/nvidia-drivers:5 -RESTRICT=strip -SLOT=5 -SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/550.107.02.tar.gz -> nvidia-settings-550.107.02.tar.gz -_eclasses_=desktop 56973babb9c5f19cab0eeb53ece644c6 multilib 7e1347c006a76bb812f3a9f663b79991 toolchain-funcs 948855ec7ad9f11351edf9066708dfa9 -_md5_=3d5d6aede0deaaed90caf197ad403dcb diff --git a/metadata/md5-cache/x11-misc/nvidia-settings-550.107.02-r1 b/metadata/md5-cache/x11-misc/nvidia-settings-550.107.02-r1 new file mode 100644 index 00000000..73c84ca9 --- /dev/null +++ b/metadata/md5-cache/x11-misc/nvidia-settings-550.107.02-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile install prepare +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 !!x11-misc/nvidia-settings:3 !!x11-misc/nvidia-settings:4 x11-drivers/nvidia-drivers:5 virtual/pkgconfig x11-base/xorg-proto +DESCRIPTION=NVIDIA Linux X11 Settings Utility +EAPI=8 +HOMEPAGE=http://www.nvidia.com/ +INHERIT=desktop multilib toolchain-funcs +KEYWORDS=-* amd64 +LICENSE=GPL-2 +RDEPEND=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 !!x11-misc/nvidia-settings:3 !!x11-misc/nvidia-settings:4 x11-drivers/nvidia-drivers:5 +RESTRICT=strip +SLOT=5 +SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/550.107.02.tar.gz -> nvidia-settings-550.107.02.tar.gz +_eclasses_=desktop 56973babb9c5f19cab0eeb53ece644c6 multilib 7e1347c006a76bb812f3a9f663b79991 toolchain-funcs 948855ec7ad9f11351edf9066708dfa9 +_md5_=eeddb1b0c712b4ce76df8f100ed0e73c diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index f0625c63..1429d2ed 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -85,7 +85,7 @@ x11-base/xorg-drivers 21.1-r100: Meta package containing deps on all xorg driver x11-drivers/nvidia-drivers 390.157-r10 470.256.02-r1 550.107.02-r1: NVIDIA Accelerated Graphics Driver x11-libs/gtk+ 2.24.33-r5 3.24.41-r5: Gimp ToolKit + x11-misc/nvidia-prime 314: NVIDIA Prime Render Offload configuration and utilities -x11-misc/nvidia-settings 390.157-r7 470.256.02 550.107.02: NVIDIA Linux X11 Settings Utility +x11-misc/nvidia-settings 390.157-r7 470.256.02 550.107.02-r1: NVIDIA Linux X11 Settings Utility x11-misc/pcmanfm-qt-share 1337-r1: PCManFM-QT custom action to share folder using Samba x11-themes/material-icon-theme 1.314.1337-r2: Icon theme following the Google's material design specifications x11-themes/redcore-artwork-calamares 1.314.1337-r6: Redcore Linux branding component for Calamares 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