[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/files/, x11-drivers/nvidia-drivers/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/files/, x11-drivers/nvidia-drivers/
Date: Mon, 27 Jan 2020 19:55:47 +0000 (UTC)	[thread overview]
Message-ID: <1580154943.6f8cf8941216354dd5f962c9f56eaeb2a596cd40.jer@gentoo> (raw)

commit:     6f8cf8941216354dd5f962c9f56eaeb2a596cd40
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 19:48:14 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 19:55:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f8cf894

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

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Closes: https://bugs.gentoo.org/706742
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 .../files/nvidia-settings-fno-common.patch         | 22 ++++++++++++++++++++++
 .../nvidia-drivers/nvidia-drivers-340.108.ebuild   |  9 +++++++++
 .../nvidia-drivers-390.132-r1.ebuild               |  8 ++++++--
 .../nvidia-drivers/nvidia-drivers-430.64-r1.ebuild |  8 ++++++--
 .../nvidia-drivers/nvidia-drivers-435.21-r1.ebuild |  8 ++++++--
 .../nvidia-drivers/nvidia-drivers-440.44-r1.ebuild |  8 ++++++--
 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 00000000000..06e046ff61d
--- /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 eb2eff41ca7..103ebfe12f1 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 b47a737853e..4105f905174 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 e6e492ff959..3703f7a20d3 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 e8abec24def..33342e4c716 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 6be7d51e602..2951a064fcd 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

next             reply	other threads:[~2020-01-27 19:55 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-27 19:55 Jeroen Roovers [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-28 22:31 [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/files/, x11-drivers/nvidia-drivers/ Ionen Wolkens
2025-01-30 16:33 Ionen Wolkens
2024-11-18  9:06 Ionen Wolkens
2024-10-23 20:25 Ionen Wolkens
2024-09-18 22:43 Ionen Wolkens
2024-06-26  0:16 Ionen Wolkens
2024-01-28 16:34 Ionen Wolkens
2024-01-08 21:09 Ionen Wolkens
2023-10-17 17:52 Ionen Wolkens
2023-02-03 18:15 Ionen Wolkens
2022-12-11 19:12 Ionen Wolkens
2022-11-10 22:22 Ionen Wolkens
2022-09-27 23:46 Ionen Wolkens
2022-09-23  2:05 Ionen Wolkens
2022-09-19 11:36 Ionen Wolkens
2022-05-21  0:38 Ionen Wolkens
2021-12-14 15:56 Ionen Wolkens
2021-07-23 15:39 Ionen Wolkens
2021-07-22 15:08 Ionen Wolkens
2021-07-21 19:44 Ionen Wolkens
2021-07-21 19:44 Ionen Wolkens
2021-07-20  1:23 Ionen Wolkens
2021-04-21 12:22 David Seifert
2021-02-08  9:39 David Seifert
2020-08-26 16:55 Matt Turner
2020-08-26  5:32 Matt Turner
2020-04-29  8:08 Jeroen Roovers
2019-10-22  9:17 Jeroen Roovers
2019-01-16 10:32 Jeroen Roovers
2018-01-04 19:08 Jeroen Roovers
2017-11-27 23:31 Jeroen Roovers
2017-11-27 23:31 Jeroen Roovers
2017-11-22  9:55 Jeroen Roovers
2017-09-27 16:26 Jeroen Roovers
2017-04-11  7:07 Jeroen Roovers
2017-01-09  3:38 Richard Farina
2016-12-15 10:31 Jeroen Roovers
2016-11-21 19:10 Jeroen Roovers
2016-10-25 19:44 Richard Farina
2016-10-11  7:22 Jeroen Roovers
2016-09-10 12:33 Jeroen Roovers
2016-09-10 12:33 Jeroen Roovers
2016-08-28  8:14 Jeroen Roovers
2016-03-25  3:30 Jeroen Roovers
2016-03-24  5:05 Jeroen Roovers
2015-09-20 21:29 Richard Farina
2015-09-18 18:24 Richard Farina

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:06e046ff61 dfblob:eb2eff41ca dfblob:103ebfe12f
dfblob:b47a737853 dfblob:4105f90517 dfblob:e6e492ff95 dfblob:3703f7a20d
dfblob:e8abec24de dfblob:33342e4c71 dfblob:6be7d51e60 dfblob:2951a064fc )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/files/, x11-drivers/nvidia-drivers/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1580154943.6f8cf8941216354dd5f962c9f56eaeb2a596cd40.jer@gentoo \
    --to=jer@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox