From d70b20dd09f8bfbd908fd8a0ed6f10a8a812f645 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 4 May 2020 09:43:05 +0100
Subject: move : x11-drivers/nvidia-legacy-drivers ->
 x11-drivers/nvidia-drivers-legacy, fix eselect-opencl (now deprecated)
 conflict

---
 .../files/nvidia-settings-legacy-fno-common.patch  | 22 ++++++++++++++++++++++
 .../files/nvidia-settings-legacy-linker.patch      | 22 ++++++++++++++++++++++
 .../files/nvidia-settings-legacy.desktop           |  8 ++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-fno-common.patch
 create mode 100644 x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-linker.patch
 create mode 100644 x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy.desktop

(limited to 'x11-misc/nvidia-settings-legacy/files')

diff --git a/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-fno-common.patch b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-fno-common.patch
new file mode 100644
index 00000000..be03fa27
--- /dev/null
+++ b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-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-settings-legacy/files/nvidia-settings-legacy-linker.patch b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-linker.patch
new file mode 100644
index 00000000..de65a598
--- /dev/null
+++ b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-linker.patch
@@ -0,0 +1,22 @@
+--- a/utils.mk
++++ b/utils.mk
+@@ -475,7 +475,7 @@
+ define READ_ONLY_OBJECT_FROM_FILE_RULE
+   $$(OUTPUTDIR)/$$(notdir $(1)).o: $(1)
+ 	$(at_if_quiet)cd $$(dir $(1)); \
+-	$$(call quiet_cmd_no_at,LD) -r -z noexecstack --format=binary \
++	$$(call quiet_cmd_no_at,NVLD) -r -z noexecstack --format=binary \
+ 	    $$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@)
+ 	$$(call quiet_cmd,OBJCOPY) \
+ 	    --rename-section .data=.rodata,contents,alloc,load,data,readonly \
+--- a/src/libXNVCtrl/utils.mk
++++ b/src/libXNVCtrl/utils.mk
+@@ -475,7 +475,7 @@
+ define READ_ONLY_OBJECT_FROM_FILE_RULE
+   $$(OUTPUTDIR)/$$(notdir $(1)).o: $(1)
+ 	$(at_if_quiet)cd $$(dir $(1)); \
+-	$$(call quiet_cmd_no_at,LD) -r -z noexecstack --format=binary \
++	$$(call quiet_cmd_no_at,NVLD) -r -z noexecstack --format=binary \
+ 	    $$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@)
+ 	$$(call quiet_cmd,OBJCOPY) \
+ 	    --rename-section .data=.rodata,contents,alloc,load,data,readonly \
diff --git a/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy.desktop b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy.desktop
new file mode 100644
index 00000000..35f8aeee
--- /dev/null
+++ b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=NVIDIA X Server Settings
+Type=Application
+Comment=NVIDIA Linux X11 Settings Utility
+Exec=nvidia-settings
+TryExec=nvidia-settings
+Icon=nvidia-settings
+Categories=Settings;System;
-- 
cgit v1.2.3