commit: 740e610ad134913961c7fb95b2467e774ec36c4c Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Sep 27 21:05:57 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Sep 27 23:44:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=740e610a
x11-drivers/nvidia-drivers: drop unnecessary patches Ended up using -Werror=strict-prototypes to test things, but as far as I'm aware this shouldn't be "needed" with clang16 either unless something passes that -Werror (so kernel module still need these fixes). Not that it'd hurt to fix but don't want to maintain patches on this end. Will revisit if needed. nvidia is aware of modules issues regarding this, so clang15 patches should be removable later Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> .../files/nvidia-extras-390.154-clang16.patch | 41 ---------------------- .../files/nvidia-extras-470.141.03-clang16.patch | 36 ------------------- .../nvidia-drivers/nvidia-drivers-390.154.ebuild | 1 - .../nvidia-drivers-470.141.03.ebuild | 1 - .../nvidia-drivers/nvidia-drivers-510.85.02.ebuild | 1 - .../nvidia-drivers/nvidia-drivers-515.49.15.ebuild | 1 - .../nvidia-drivers/nvidia-drivers-515.65.01.ebuild | 1 - .../nvidia-drivers/nvidia-drivers-515.76.ebuild | 1 - 8 files changed, 83 deletions(-) diff --git a/x11-drivers/nvidia-drivers/files/nvidia-extras-390.154-clang16.patch b/x11-drivers/nvidia-drivers/files/nvidia-extras-390.154-clang16.patch deleted file mode 100644 index 63e33af9d0db..000000000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-extras-390.154-clang16.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://bugs.gentoo.org/870412 ---- a/nvidia-modprobe/common-utils/msg.c -+++ b/nvidia-modprobe/common-utils/msg.c -@@ -45 +45 @@ --NvVerbosity nv_get_verbosity() -+NvVerbosity nv_get_verbosity(void) ---- a/nvidia-persistenced/common-utils/msg.c -+++ b/nvidia-persistenced/common-utils/msg.c -@@ -45 +45 @@ --NvVerbosity nv_get_verbosity() -+NvVerbosity nv_get_verbosity(void) ---- a/nvidia-persistenced/nvidia-persistenced.c -+++ b/nvidia-persistenced/nvidia-persistenced.c -@@ -502 +502 @@ --static NvPdStatus setup_rpc() -+static NvPdStatus setup_rpc(void) ---- a/nvidia-settings/src/common-unix/virtual-resolutions/nvvr.c -+++ b/nvidia-settings/src/common-unix/virtual-resolutions/nvvr.c -@@ -107 +107 @@ --const NVVRSize* NVVRGetCommonResolutions() -+const NVVRSize* NVVRGetCommonResolutions(void) ---- a/nvidia-settings/src/common-utils/msg.c -+++ b/nvidia-settings/src/common-utils/msg.c -@@ -45 +45 @@ --NvVerbosity nv_get_verbosity() -+NvVerbosity nv_get_verbosity(void) ---- a/nvidia-settings/src/gtk+-2.x/ctkslimm.c -+++ b/nvidia-settings/src/gtk+-2.x/ctkslimm.c -@@ -129 +129 @@ --GType ctk_slimm_get_type() -+GType ctk_slimm_get_type(void) ---- a/nvidia-settings/src/gtk+-2.x/ctkutils.c -+++ b/nvidia-settings/src/gtk+-2.x/ctkutils.c -@@ -251 +251 @@ --GtkWidget *ctk_combo_box_text_new_with_entry() -+GtkWidget *ctk_combo_box_text_new_with_entry(void) ---- a/nvidia-xconfig/common-utils/msg.c -+++ b/nvidia-xconfig/common-utils/msg.c -@@ -45 +45 @@ --NvVerbosity nv_get_verbosity() -+NvVerbosity nv_get_verbosity(void) diff --git a/x11-drivers/nvidia-drivers/files/nvidia-extras-470.141.03-clang16.patch b/x11-drivers/nvidia-drivers/files/nvidia-extras-470.141.03-clang16.patch deleted file mode 100644 index c0a1f138dd79..000000000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-extras-470.141.03-clang16.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://bugs.gentoo.org/870412 ---- a/nvidia-modprobe/common-utils/msg.c -+++ b/nvidia-modprobe/common-utils/msg.c -@@ -47 +47 @@ --NvVerbosity nv_get_verbosity() -+NvVerbosity nv_get_verbosity(void) ---- a/nvidia-persistenced/common-utils/msg.c -+++ b/nvidia-persistenced/common-utils/msg.c -@@ -47 +47 @@ --NvVerbosity nv_get_verbosity() -+NvVerbosity nv_get_verbosity(void) ---- a/nvidia-persistenced/nvidia-persistenced.c -+++ b/nvidia-persistenced/nvidia-persistenced.c -@@ -625 +625 @@ --static NvPdStatus setup_rpc() -+static NvPdStatus setup_rpc(void) ---- a/nvidia-settings/src/common-unix/virtual-resolutions/nvvr.c -+++ b/nvidia-settings/src/common-unix/virtual-resolutions/nvvr.c -@@ -107 +107 @@ --const NVVRSize* NVVRGetCommonResolutions() -+const NVVRSize* NVVRGetCommonResolutions(void) ---- a/nvidia-settings/src/common-utils/msg.c -+++ b/nvidia-settings/src/common-utils/msg.c -@@ -47 +47 @@ --NvVerbosity nv_get_verbosity() -+NvVerbosity nv_get_verbosity(void) ---- a/nvidia-settings/src/gtk+-2.x/ctkutils.c -+++ b/nvidia-settings/src/gtk+-2.x/ctkutils.c -@@ -260 +260 @@ --GtkWidget *ctk_combo_box_text_new_with_entry() -+GtkWidget *ctk_combo_box_text_new_with_entry(void) ---- a/nvidia-xconfig/common-utils/msg.c -+++ b/nvidia-xconfig/common-utils/msg.c -@@ -47 +47 @@ --NvVerbosity nv_get_verbosity() -+NvVerbosity nv_get_verbosity(void) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild index 2ad4e5070ba9..12f9791b3462 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild @@ -73,7 +73,6 @@ BDEPEND=" QA_PREBUILT="opt/bin/* usr/lib*" PATCHES=( - "${FILESDIR}"/nvidia-extras-390.154-clang16.patch "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch "${FILESDIR}"/nvidia-settings-390.141-fno-common.patch "${FILESDIR}"/nvidia-settings-390.144-desktop.patch diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild index 1a33c461bb33..f9289f18be17 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild @@ -77,7 +77,6 @@ QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*" PATCHES=( "${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch - "${FILESDIR}"/nvidia-extras-470.141.03-clang16.patch "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch "${FILESDIR}"/nvidia-settings-390.144-desktop.patch "${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.85.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.85.02.ebuild index f90467ba3060..8046c6e58d68 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.85.02.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.85.02.ebuild @@ -80,7 +80,6 @@ QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*" PATCHES=( "${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch - "${FILESDIR}"/nvidia-extras-470.141.03-clang16.patch "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch "${FILESDIR}"/nvidia-settings-390.144-desktop.patch "${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.15.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.15.ebuild index 92a3dc232374..e44164a54d05 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.15.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.15.ebuild @@ -82,7 +82,6 @@ QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*" PATCHES=( "${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch - "${FILESDIR}"/nvidia-extras-470.141.03-clang16.patch "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch "${FILESDIR}"/nvidia-settings-390.144-desktop.patch "${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild index 7e9da0275ad5..e99ade1ee066 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild @@ -82,7 +82,6 @@ QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*" PATCHES=( "${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch - "${FILESDIR}"/nvidia-extras-470.141.03-clang16.patch "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch "${FILESDIR}"/nvidia-settings-390.144-desktop.patch "${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.76.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.76.ebuild index b8881ceb9cd5..fc9b5ce2c880 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.76.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.76.ebuild @@ -82,7 +82,6 @@ QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*" PATCHES=( "${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch - "${FILESDIR}"/nvidia-extras-470.141.03-clang16.patch "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch "${FILESDIR}"/nvidia-settings-390.144-desktop.patch "${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch
