From e4bfdb47132ba559d3f205c38c6fd05f3b84d1e5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 00:57:10 +0000 Subject: move : x11-misc/nvidia-settings:0/390132 -> x11-misc/nvidia-legacy-settings --- x11-misc/nvidia-legacy-settings/Manifest | 1 + .../files/nvidia-legacy-settings-linker.patch | 22 +++++ .../files/nvidia-legacy-settings.desktop | 8 ++ .../nvidia-legacy-settings-390.132.ebuild | 94 ++++++++++++++++++++++ x11-misc/nvidia-settings/Manifest | 1 - .../nvidia-settings/nvidia-settings-390.132.ebuild | 91 --------------------- 6 files changed, 125 insertions(+), 92 deletions(-) create mode 100644 x11-misc/nvidia-legacy-settings/Manifest create mode 100644 x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-linker.patch create mode 100644 x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings.desktop create mode 100644 x11-misc/nvidia-legacy-settings/nvidia-legacy-settings-390.132.ebuild delete mode 100644 x11-misc/nvidia-settings/nvidia-settings-390.132.ebuild (limited to 'x11-misc') diff --git a/x11-misc/nvidia-legacy-settings/Manifest b/x11-misc/nvidia-legacy-settings/Manifest new file mode 100644 index 00000000..c41d5ee0 --- /dev/null +++ b/x11-misc/nvidia-legacy-settings/Manifest @@ -0,0 +1 @@ +DIST nvidia-legacy-settings-390.132.tar.gz 1297258 BLAKE2B cfbb749d65478c0312a62246cd02397121d0717c4b9a7b0c6d6e5a4129db24fdda7e4b578a35ca77b14c5f36edf8616b4d2890398c44432ead24edda582265fa SHA512 ad6836c8b002478fe7b76fb7df6b685686e73ba0849533f5d2c6cc0ca489f212556f309bc67870b2844921bfdb2c3c49300f35ee4d32e3d4c7f29c1ac9b0dd9a diff --git a/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-linker.patch b/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-linker.patch new file mode 100644 index 00000000..de65a598 --- /dev/null +++ b/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-linker.patch @@ -0,0 +1,22 @@ +--- a/utils.mk ++++ b/utils.mk +@@ -475,7 +475,7 @@ + define READ_ONLY_OBJECT_FROM_FILE_RULE + $$(OUTPUTDIR)/$$(notdir $(1)).o: $(1) + $(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 \ + $$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@) + $$(call quiet_cmd,OBJCOPY) \ + --rename-section .data=.rodata,contents,alloc,load,data,readonly \ +--- a/src/libXNVCtrl/utils.mk ++++ b/src/libXNVCtrl/utils.mk +@@ -475,7 +475,7 @@ + define READ_ONLY_OBJECT_FROM_FILE_RULE + $$(OUTPUTDIR)/$$(notdir $(1)).o: $(1) + $(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 \ + $$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@) + $$(call quiet_cmd,OBJCOPY) \ + --rename-section .data=.rodata,contents,alloc,load,data,readonly \ diff --git a/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings.desktop b/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings.desktop new file mode 100644 index 00000000..35f8aeee --- /dev/null +++ b/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=NVIDIA X Server Settings +Type=Application +Comment=NVIDIA Linux X11 Settings Utility +Exec=nvidia-settings +TryExec=nvidia-settings +Icon=nvidia-settings +Categories=Settings;System; diff --git a/x11-misc/nvidia-legacy-settings/nvidia-legacy-settings-390.132.ebuild b/x11-misc/nvidia-legacy-settings/nvidia-legacy-settings-390.132.ebuild new file mode 100644 index 00000000..abf1aeb7 --- /dev/null +++ b/x11-misc/nvidia-legacy-settings/nvidia-legacy-settings-390.132.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="NVIDIA Linux X11 Settings Utility" +HOMEPAGE="http://www.nvidia.com/" +SRC_URI="https://github.com/NVIDIA/nvidia-settings/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/390132" +KEYWORDS="-* amd64" +IUSE="gtk3" + +QA_PREBUILT= + +COMMON_DEPEND=" + x11-libs/gtk+:2 + gtk3? ( x11-libs/gtk+:3 ) + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm + x11-libs/gdk-pixbuf[X] + 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 + x11-drivers/nvidia-legacy-drivers:${SLOT}" +DEPEND="${RDEPEND} + virtual/pkgconfig + x11-base/xorg-proto" + +S=${WORKDIR}/nvidia-settings-${PV} + +src_prepare() { + default + eapply "${FILESDIR}"/nvidia-legacy-settings-linker.patch +} + +src_compile() { + emake -C src/ \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + DO_STRIP= \ + LD="$(tc-getCC)" \ + LIBDIR="$(get_libdir)" \ + NVLD="$(tc-getLD)" \ + NV_VERBOSE=1 \ + RANLIB="$(tc-getRANLIB)" \ + build-xnvctrl + + emake -C src/ \ + CC="$(tc-getCC)" \ + DO_STRIP= \ + GTK3_AVAILABLE=$(usex gtk3 1 0) \ + LD="$(tc-getCC)" \ + LIBDIR="$(get_libdir)" \ + NVLD="$(tc-getLD)" \ + NVML_ENABLED=0 \ + NV_USE_BUNDLED_LIBJANSSON=0 \ + NV_VERBOSE=1 +} + +src_install() { + emake -C src/ \ + DESTDIR="${D}" \ + GTK3_AVAILABLE=$(usex gtk3 1 0) \ + LIBDIR="${D}/usr/$(get_libdir)" \ + NV_USE_BUNDLED_LIBJANSSON=0 \ + NV_VERBOSE=1 \ + PREFIX=/usr \ + DO_STRIP= \ + install + + insinto /usr/$(get_libdir) + doins src/libXNVCtrl/libXNVCtrl.a + + insinto /usr/include/NVCtrl + doins src/libXNVCtrl/*.h + + doicon doc/nvidia-settings.png + domenu ${FILESDIR}/${PN}.desktop + + dodoc doc/*.txt +} diff --git a/x11-misc/nvidia-settings/Manifest b/x11-misc/nvidia-settings/Manifest index 2afff3bd..031fb6ab 100644 --- a/x11-misc/nvidia-settings/Manifest +++ b/x11-misc/nvidia-settings/Manifest @@ -1,2 +1 @@ -DIST nvidia-settings-390.132.tar.gz 1297258 BLAKE2B cfbb749d65478c0312a62246cd02397121d0717c4b9a7b0c6d6e5a4129db24fdda7e4b578a35ca77b14c5f36edf8616b4d2890398c44432ead24edda582265fa SHA512 ad6836c8b002478fe7b76fb7df6b685686e73ba0849533f5d2c6cc0ca489f212556f309bc67870b2844921bfdb2c3c49300f35ee4d32e3d4c7f29c1ac9b0dd9a DIST nvidia-settings-440.44.tar.gz 1314352 BLAKE2B 5708f24bd98cf01064e5cc7eca8f6109d2072996a8ac9f77db1ccbc3e3995c28f6dec2e74729fddf0a7be324193b089835e30d9acb0bf3ae58592dad48914c9d SHA512 5826a5915f0ed50ab80f442d005668dc876565233eb0f36723db5047d7592ca9b81ebfa824bc04f5275792d8b34bb457a7db173d1bdf464df7a186bfc528da1d diff --git a/x11-misc/nvidia-settings/nvidia-settings-390.132.ebuild b/x11-misc/nvidia-settings/nvidia-settings-390.132.ebuild deleted file mode 100644 index 3f7b5440..00000000 --- a/x11-misc/nvidia-settings/nvidia-settings-390.132.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="NVIDIA Linux X11 Settings Utility" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="https://github.com/NVIDIA/nvidia-settings/archive/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/390132" -KEYWORDS="-* amd64" -IUSE="gtk3" - -QA_PREBUILT= - -COMMON_DEPEND=" - x11-libs/gtk+:2 - gtk3? ( x11-libs/gtk+:3 ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/gdk-pixbuf[X] - 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-drivers/nvidia-drivers:${SLOT}" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto" - -src_prepare() { - default - eapply "${FILESDIR}"/nvidia-settings-linker.patch -} - -src_compile() { - emake -C src/ \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - DO_STRIP= \ - LD="$(tc-getCC)" \ - LIBDIR="$(get_libdir)" \ - NVLD="$(tc-getLD)" \ - NV_VERBOSE=1 \ - RANLIB="$(tc-getRANLIB)" \ - build-xnvctrl - - emake -C src/ \ - CC="$(tc-getCC)" \ - DO_STRIP= \ - GTK3_AVAILABLE=$(usex gtk3 1 0) \ - LD="$(tc-getCC)" \ - LIBDIR="$(get_libdir)" \ - NVLD="$(tc-getLD)" \ - NVML_ENABLED=0 \ - NV_USE_BUNDLED_LIBJANSSON=0 \ - NV_VERBOSE=1 -} - -src_install() { - emake -C src/ \ - DESTDIR="${D}" \ - GTK3_AVAILABLE=$(usex gtk3 1 0) \ - LIBDIR="${D}/usr/$(get_libdir)" \ - NV_USE_BUNDLED_LIBJANSSON=0 \ - NV_VERBOSE=1 \ - PREFIX=/usr \ - DO_STRIP= \ - install - - insinto /usr/$(get_libdir) - doins src/libXNVCtrl/libXNVCtrl.a - - insinto /usr/include/NVCtrl - doins src/libXNVCtrl/*.h - - doicon doc/${PN}.png - domenu ${FILESDIR}/${PN}.desktop - - dodoc doc/*.txt -} -- cgit v1.2.3