diff options
Diffstat (limited to 'x11-drivers')
6 files changed, 55 insertions, 8 deletions
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-settings-fno-common.patch b/x11-drivers/nvidia-drivers/files/nvidia-settings-fno-common.patch new file mode 100644 index 000000000000..06e046ff61d3 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-settings-fno-common.patch @@ -0,0 +1,22 @@ +--- a/nvidia-settings-@PV@/src/gtk+-2.x/ctkvdpau.c ++++ b/nvidia-settings-@PV@/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/nvidia-settings-@PV@/src/gtk+-2.x/ctkvdpau.h ++++ b/nvidia-settings-@PV@/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-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild index eb2eff41ca74..103ebfe12f10 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild @@ -142,6 +142,15 @@ src_prepare() { gunzip $man_file || die done + if use tools; then + cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die + sed -i \ + -e "s:@PV@:${PV}:g" \ + "${WORKDIR}"/nvidia-settings-fno-common.patch \ + || die + eapply "${WORKDIR}"/nvidia-settings-fno-common.patch + fi + # Allow user patches so they can support RC kernels and whatever else eapply_user } diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild index b47a737853e4..4105f9051740 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -151,10 +151,14 @@ src_prepare() { done if use tools; then + cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die sed -i \ -e "s:@PV@:${PV}:g" \ - "${WORKDIR}"/nvidia-settings-linker.patch || die + "${WORKDIR}"/nvidia-settings-fno-common.patch \ + "${WORKDIR}"/nvidia-settings-linker.patch \ + || die + eapply "${WORKDIR}"/nvidia-settings-fno-common.patch eapply "${WORKDIR}"/nvidia-settings-linker.patch fi diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild index e6e492ff9590..3703f7a20d3c 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -149,10 +149,14 @@ src_prepare() { done if use tools; then + cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die sed -i \ -e "s:@PV@:${PV}:g" \ - "${WORKDIR}"/nvidia-settings-linker.patch || die + "${WORKDIR}"/nvidia-settings-fno-common.patch \ + "${WORKDIR}"/nvidia-settings-linker.patch \ + || die + eapply "${WORKDIR}"/nvidia-settings-fno-common.patch eapply "${WORKDIR}"/nvidia-settings-linker.patch fi diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild index e8abec24def6..33342e4c716a 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -153,10 +153,14 @@ src_prepare() { done if use tools; then + cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die sed -i \ -e "s:@PV@:${PV}:g" \ - "${WORKDIR}"/nvidia-settings-linker.patch || die + "${WORKDIR}"/nvidia-settings-fno-common.patch \ + "${WORKDIR}"/nvidia-settings-linker.patch \ + || die + eapply "${WORKDIR}"/nvidia-settings-fno-common.patch eapply "${WORKDIR}"/nvidia-settings-linker.patch fi diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.44-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.44-r1.ebuild index 6be7d51e602c..2951a064fcdb 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.44-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.44-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -156,10 +156,14 @@ src_prepare() { done if use tools; then + cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die sed -i \ -e "s:@PV@:${PV}:g" \ - "${WORKDIR}"/nvidia-settings-linker.patch || die + "${WORKDIR}"/nvidia-settings-fno-common.patch \ + "${WORKDIR}"/nvidia-settings-linker.patch \ + || die + eapply "${WORKDIR}"/nvidia-settings-fno-common.patch eapply "${WORKDIR}"/nvidia-settings-linker.patch fi |