From 06ed2d7d2e127f80b97ec707c00b3c7ac66b1980 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Mar 2020 18:33:35 +0000 Subject: nvidia legacy drivers 390xx : add kernel 5.5 compat --- .../files/nvidia-legacy-settings-fno-common.patch | 22 +++++ .../nvidia-legacy-settings-390.132-r1.ebuild | 94 --------------------- .../nvidia-legacy-settings-390.132-r2.ebuild | 95 ++++++++++++++++++++++ 3 files changed, 117 insertions(+), 94 deletions(-) create mode 100644 x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-fno-common.patch delete mode 100644 x11-misc/nvidia-legacy-settings/nvidia-legacy-settings-390.132-r1.ebuild create mode 100644 x11-misc/nvidia-legacy-settings/nvidia-legacy-settings-390.132-r2.ebuild (limited to 'x11-misc') diff --git a/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-fno-common.patch b/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-fno-common.patch new file mode 100644 index 00000000..be03fa27 --- /dev/null +++ b/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-fno-common.patch @@ -0,0 +1,22 @@ +--- a/src/gtk+-2.x/ctkvdpau.c ++++ b/src/gtk+-2.x/ctkvdpau.c +@@ -103,6 +103,8 @@ + const gchar* __video_mixer_attribute_help = + "This shows the video mixer attributes and any applicable ranges."; + ++struct VDPAUDeviceImpl VDPAUDeviceFunctions; ++ + static int queryOutputSurface(CtkVDPAU *ctk_vdpau, VdpDevice device, + VdpGetProcAddress *getProcAddress); + +--- a/src/gtk+-2.x/ctkvdpau.h ++++ b/src/gtk+-2.x/ctkvdpau.h +@@ -46,7 +46,7 @@ + (G_TYPE_INSTANCE_GET_CLASS ((obj), CTK_TYPE_VDPAU, CtkVDPAUClass)) + + +-struct VDPAUDeviceImpl { ++extern struct VDPAUDeviceImpl { + + VdpGetErrorString *GetErrorString; + VdpGetProcAddress *GetProcAddress; diff --git a/x11-misc/nvidia-legacy-settings/nvidia-legacy-settings-390.132-r1.ebuild b/x11-misc/nvidia-legacy-settings/nvidia-legacy-settings-390.132-r1.ebuild deleted file mode 100644 index 96053387..00000000 --- a/x11-misc/nvidia-legacy-settings/nvidia-legacy-settings-390.132-r1.ebuild +++ /dev/null @@ -1,94 +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 -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -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-${PV}:${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-legacy-settings/nvidia-legacy-settings-390.132-r2.ebuild b/x11-misc/nvidia-legacy-settings/nvidia-legacy-settings-390.132-r2.ebuild new file mode 100644 index 00000000..e5c660a1 --- /dev/null +++ b/x11-misc/nvidia-legacy-settings/nvidia-legacy-settings-390.132-r2.ebuild @@ -0,0 +1,95 @@ +# 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" +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-${PV}:${SLOT}" +DEPEND="${RDEPEND} + virtual/pkgconfig + x11-base/xorg-proto" + +S=${WORKDIR}/nvidia-settings-${PV} + +src_prepare() { + default + eapply "${FILESDIR}"/"${PN}"-linker.patch + eapply "${FILESDIR}"/"${PN}"-fno-common.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 +} -- cgit v1.2.3