gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 06:48:18 -07:00
Code Issues Projects Releases Wiki Activity

x11-drivers/nvidia-drivers: Fix CFLAGS=-fno-common

Browse Source 
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Closes: https://bugs.gentoo.org/706742
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
This commit is contained in:
Jeroen Roovers
2020-01-27 20:48:14 +01:00
parent 198b059089
commit 6f8cf89412
6 changed files with 55 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
x11-drivers/nvidia-drivers/files/nvidia-settings-fno-common.patch Normal file
View File

@@ -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;

9
x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
View File

@@ -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
}

8
x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
View File

@@ -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

8
x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild
View File

@@ -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

8
x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild
View File

@@ -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

8
x11-drivers/nvidia-drivers/nvidia-drivers-440.44-r1.ebuild
View File

@@ -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