[PR PATCH] New package: libXnvctrl-525.116.04

[PR PATCH] New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 1293 bytes --]

There is a new pull request by RoundDuckKira against master on the void-packages repository

https://github.com/RoundDuckKira/void-packages libXnvctrl
https://github.com/void-linux/void-packages/pull/44050

New package: libXnvctrl-525.116.04
create new libXnvctrl package for Nvidia hardware monitoring, the lack of this package means MangoHUD can't be fixed to support Nvidia GPUs.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES, I am using this package in my daily driver**


#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)



A patch file from https://github.com/void-linux/void-packages/pull/44050.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libXnvctrl-44050.patch --]
[-- Type: text/x-diff, Size: 3759 bytes --]

From 613215c85852cda59920d0d6c6ffbb2b4ec20a43 Mon Sep 17 00:00:00 2001
From: Kira Taylor Patton <roundduckkira@protonmail.com>
Date: Tue, 23 May 2023 13:31:19 -0400
Subject: [PATCH] New package: libXnvctrl-525.116.04

create new libXnvctrl package for Nvidia hardware monitoring
---
 .../nvidia-settings-libxnvctrl_so.patch       | 38 +++++++++++++++++++
 srcpkgs/libXnvctrl/template                   | 29 ++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch
 create mode 100644 srcpkgs/libXnvctrl/template

diff --git a/srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch b/srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch
new file mode 100644
index 000000000000..70043f0c2125
--- /dev/null
+++ b/srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch
@@ -0,0 +1,38 @@
+diff --git a/src/Makefile b/src/Makefile
+index 68eb140..6d0aab8 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -345,7 +345,7 @@ endif
+ 
+ ifdef BUILD_GTK3LIB
+ $(eval $(call DEBUG_INFO_RULES, $(GTK3LIB)))
+-$(GTK3LIB).unstripped: $(LIBXNVCTRL) $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
++$(GTK3LIB).unstripped: $(LIBXNVCTRL) $(LIBXNVCTRL_SHARED) $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
+ 	$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS)  $(BIN_LDFLAGS) \
+ 	    $(LIBXNVCTRL) $(LIBS) $(GTK3_LIBS) \
+ 	    -Wl,--unresolved-symbols=ignore-all -o $@ \
+diff --git a/src/libXNVCtrl/xnvctrl.mk b/src/libXNVCtrl/xnvctrl.mk
+index e6be2ef..c0921c4 100644
+--- a/src/libXNVCtrl/xnvctrl.mk
++++ b/src/libXNVCtrl/xnvctrl.mk
+@@ -39,6 +39,11 @@ XNVCTRL_CFLAGS ?=
+ 
+ LIBXNVCTRL = $(OUTPUTDIR)/libXNVCtrl.a
+ 
++LIBXNVCTRL_SHARED = $(OUTPUTDIR)/libXNVCtrl.so
++LIBXNVCTRL_ABI_VERSION_MAJOR = 0
++LIBXNVCTRL_ABI_VERSION_MINOR = 0
++LIBXNVCTRL_LIBS += -lXext -lX11
++
+ LIBXNVCTRL_SRC = $(XNVCTRL_DIR)/NVCtrl.c
+ 
+ LIBXNVCTRL_OBJ = $(call BUILD_OBJECT_LIST,$(LIBXNVCTRL_SRC))
+@@ -47,3 +52,8 @@ $(eval $(call DEFINE_OBJECT_RULE,TARGET,$(LIBXNVCTRL_SRC)))
+ 
+ $(LIBXNVCTRL) : $(LIBXNVCTRL_OBJ)
+ 	$(call quiet_cmd,AR) ru $@ $(LIBXNVCTRL_OBJ)
++
++$(LIBXNVCTRL_SHARED) : $(LIBXNVCTRL_OBJ)
++	$(CC) -shared $(CFLAGS) $(LDFLAGS) -Wl,-soname=$(notdir $@).${LIBXNVCTRL_ABI_VERSION_MAJOR} -o $@.$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $^ $(LIBXNVCTRL_LIBS)
++	ln -s $(notdir $@).$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $@
++	ln -s $(notdir $@).$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $@.$(LIBXNVCTRL_ABI_VERSION_MAJOR)
diff --git a/srcpkgs/libXnvctrl/template b/srcpkgs/libXnvctrl/template
new file mode 100644
index 000000000000..a422769a26df
--- /dev/null
+++ b/srcpkgs/libXnvctrl/template
@@ -0,0 +1,29 @@
+# Template file for 'libXnvctrl'
+pkgname=libXnvctrl
+version=525.116.04
+revision=1
+#archs="i686 x86_64"
+#build_wrksrc=
+build_style=gnu-makefile
+make_use_env=yes
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="inetutils base-devel"
+makedepends="jansson-devel gtk+3-devel libXv-devel libvdpau-devel libXext-devel libXxf86vm-devel"
+# depends=""
+short_desc="Nvidia hardware monitoring library"
+maintainer="Kira Taylor Patton <roundduckkira@protonmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/NVIDIA/nvidia-settings"
+#changelog=""
+distfiles="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${version}.tar.gz"
+checksum=32db97759c2a58fea86a63a69a423f1bf65198496cb2ac2279f4210b50097358
+
+do_install() {
+	vmkdir /usr/include/NVCtrl 755
+	vcopy src/libXNVCtrl/*.h /usr/include/NVCtrl/
+	vcopy src/_out/Linux_x86_64/libXNVCtrl.* /usr/lib/
+}

Re: New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 312 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559899116

Comment:
Actually I got an idea to get other arches working, I'll see if I can just use the arch variable when doing the steps that involve a directory called "Linux_<arch>"

Re: New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559899116

Comment:
Actually I got an idea to get other arches working, I'll see if I can just use the arch variable when doing the steps that involve a directory called "Linux_\<arch\>"

Re: New package: libXnvctrl-525.116.04

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559933936

Comment:
This should be split into a lib and devel package, is probably makes sense to just crease a `nvidia-settings` package and make this the subpackage like arch does.

Re: New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 578 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559948813

Comment:
> This should be split into a lib and devel package, is probably makes sense to just crease a `nvidia-settings` package and make this the subpackage like arch does.

The reason I didn't is because of an issue I saw where Void flagged the files MangoHUD depends on at runtime as "something that should be in a -devel package" but I will separate into two packages, hopefully pushing to this branch will add in the new package in.

Re: New package: libXnvctrl-525.116.04

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 459 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559955737

Comment:
> The reason I didn't is because of an issue I saw where Void flagged the files MangoHUD depends on at runtime as "something that should be in a -devel package" but I will separate into two packages, hopefully pushing to this branch will add in the new package in.

Can't really help without knowing more specifics.

Re: [PR PATCH] [Updated] New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]

There is an updated pull request by RoundDuckKira against master on the void-packages repository

https://github.com/RoundDuckKira/void-packages libXnvctrl
https://github.com/void-linux/void-packages/pull/44050

New package: libXnvctrl-525.116.04
create new libXnvctrl package for Nvidia hardware monitoring, the lack of this package means MangoHUD can't be fixed to support Nvidia GPUs.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES, I am using this package in my daily driver**


#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)



A patch file from https://github.com/void-linux/void-packages/pull/44050.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libXnvctrl-44050.patch --]
[-- Type: text/x-diff, Size: 5217 bytes --]

From 613215c85852cda59920d0d6c6ffbb2b4ec20a43 Mon Sep 17 00:00:00 2001
From: Kira Taylor Patton <roundduckkira@protonmail.com>
Date: Tue, 23 May 2023 13:31:19 -0400
Subject: [PATCH 1/2] New package: libXnvctrl-525.116.04

create new libXnvctrl package for Nvidia hardware monitoring
---
 .../nvidia-settings-libxnvctrl_so.patch       | 38 +++++++++++++++++++
 srcpkgs/libXnvctrl/template                   | 29 ++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch
 create mode 100644 srcpkgs/libXnvctrl/template

diff --git a/srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch b/srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch
new file mode 100644
index 000000000000..70043f0c2125
--- /dev/null
+++ b/srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch
@@ -0,0 +1,38 @@
+diff --git a/src/Makefile b/src/Makefile
+index 68eb140..6d0aab8 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -345,7 +345,7 @@ endif
+ 
+ ifdef BUILD_GTK3LIB
+ $(eval $(call DEBUG_INFO_RULES, $(GTK3LIB)))
+-$(GTK3LIB).unstripped: $(LIBXNVCTRL) $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
++$(GTK3LIB).unstripped: $(LIBXNVCTRL) $(LIBXNVCTRL_SHARED) $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
+ 	$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS)  $(BIN_LDFLAGS) \
+ 	    $(LIBXNVCTRL) $(LIBS) $(GTK3_LIBS) \
+ 	    -Wl,--unresolved-symbols=ignore-all -o $@ \
+diff --git a/src/libXNVCtrl/xnvctrl.mk b/src/libXNVCtrl/xnvctrl.mk
+index e6be2ef..c0921c4 100644
+--- a/src/libXNVCtrl/xnvctrl.mk
++++ b/src/libXNVCtrl/xnvctrl.mk
+@@ -39,6 +39,11 @@ XNVCTRL_CFLAGS ?=
+ 
+ LIBXNVCTRL = $(OUTPUTDIR)/libXNVCtrl.a
+ 
++LIBXNVCTRL_SHARED = $(OUTPUTDIR)/libXNVCtrl.so
++LIBXNVCTRL_ABI_VERSION_MAJOR = 0
++LIBXNVCTRL_ABI_VERSION_MINOR = 0
++LIBXNVCTRL_LIBS += -lXext -lX11
++
+ LIBXNVCTRL_SRC = $(XNVCTRL_DIR)/NVCtrl.c
+ 
+ LIBXNVCTRL_OBJ = $(call BUILD_OBJECT_LIST,$(LIBXNVCTRL_SRC))
+@@ -47,3 +52,8 @@ $(eval $(call DEFINE_OBJECT_RULE,TARGET,$(LIBXNVCTRL_SRC)))
+ 
+ $(LIBXNVCTRL) : $(LIBXNVCTRL_OBJ)
+ 	$(call quiet_cmd,AR) ru $@ $(LIBXNVCTRL_OBJ)
++
++$(LIBXNVCTRL_SHARED) : $(LIBXNVCTRL_OBJ)
++	$(CC) -shared $(CFLAGS) $(LDFLAGS) -Wl,-soname=$(notdir $@).${LIBXNVCTRL_ABI_VERSION_MAJOR} -o $@.$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $^ $(LIBXNVCTRL_LIBS)
++	ln -s $(notdir $@).$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $@
++	ln -s $(notdir $@).$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $@.$(LIBXNVCTRL_ABI_VERSION_MAJOR)
diff --git a/srcpkgs/libXnvctrl/template b/srcpkgs/libXnvctrl/template
new file mode 100644
index 000000000000..a422769a26df
--- /dev/null
+++ b/srcpkgs/libXnvctrl/template
@@ -0,0 +1,29 @@
+# Template file for 'libXnvctrl'
+pkgname=libXnvctrl
+version=525.116.04
+revision=1
+#archs="i686 x86_64"
+#build_wrksrc=
+build_style=gnu-makefile
+make_use_env=yes
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="inetutils base-devel"
+makedepends="jansson-devel gtk+3-devel libXv-devel libvdpau-devel libXext-devel libXxf86vm-devel"
+# depends=""
+short_desc="Nvidia hardware monitoring library"
+maintainer="Kira Taylor Patton <roundduckkira@protonmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/NVIDIA/nvidia-settings"
+#changelog=""
+distfiles="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${version}.tar.gz"
+checksum=32db97759c2a58fea86a63a69a423f1bf65198496cb2ac2279f4210b50097358
+
+do_install() {
+	vmkdir /usr/include/NVCtrl 755
+	vcopy src/libXNVCtrl/*.h /usr/include/NVCtrl/
+	vcopy src/_out/Linux_x86_64/libXNVCtrl.* /usr/lib/
+}

From 3c64513a9980ee30e2922eba34cdb721279cb910 Mon Sep 17 00:00:00 2001
From: Kira Taylor Patton <roundduckkira@protonmail.com>
Date: Tue, 23 May 2023 14:39:26 -0400
Subject: [PATCH 2/2] libXnvctrl-devel: update to 525.116.04.

---
 srcpkgs/libXnvctrl-devel    |  1 +
 srcpkgs/libXnvctrl/template | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/libXnvctrl-devel

diff --git a/srcpkgs/libXnvctrl-devel b/srcpkgs/libXnvctrl-devel
new file mode 120000
index 000000000000..4d13713cca3a
--- /dev/null
+++ b/srcpkgs/libXnvctrl-devel
@@ -0,0 +1 @@
+libXnvctrl
\ No newline at end of file
diff --git a/srcpkgs/libXnvctrl/template b/srcpkgs/libXnvctrl/template
index a422769a26df..c3d62c5780b2 100644
--- a/srcpkgs/libXnvctrl/template
+++ b/srcpkgs/libXnvctrl/template
@@ -23,7 +23,15 @@ distfiles="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${version
 checksum=32db97759c2a58fea86a63a69a423f1bf65198496cb2ac2279f4210b50097358
 
 do_install() {
+	if [ ${XBPS_TARGET_MACHINE} =  "i686" ]; then
+        	vcopy src/_out/Linux_x86/libXNVCtrl.* /usr/lib/
+	else
+		vcopy src/_out/Linux_${XBPS_TARGET_MACHINE}/libXNVCtrl.* /usr/lib/
+	fi
+}
+
+libXnvctrl-devel_package() {
+	short_desc+=" - development files"
 	vmkdir /usr/include/NVCtrl 755
-	vcopy src/libXNVCtrl/*.h /usr/include/NVCtrl/
-	vcopy src/_out/Linux_x86_64/libXNVCtrl.* /usr/lib/
+        vcopy src/libXNVCtrl/*.h /usr/include/NVCtrl/
 }

Re: New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 640 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559958486

Comment:
> > The reason I didn't is because of an issue I saw where Void flagged the files MangoHUD depends on at runtime as "something that should be in a -devel package" but I will separate into two packages, hopefully pushing to this branch will add in the new package in.
> 
> Can't really help without knowing more specifics.

all I remember is that it flagged the .a and .so files as also what should be in the -devel file, when that is actually required as a install dependency for MangoHUD

Re: New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 816 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559958486

Comment:
> > The reason I didn't is because of an issue I saw where Void flagged the files MangoHUD depends on at runtime as "something that should be in a -devel package" but I will separate into two packages, hopefully pushing to this branch will add in the new package in.
> 
> Can't really help without knowing more specifics.

all I remember is that it flagged the .a and .so files as also what should be in the -devel file, when that is actually required as a install dependency for MangoHUD, I pushed an updated version with the packages separate to see if that is good, but the -devel part installs the .h files while the main package installs the .a and .so parts.

Re: New package: libXnvctrl-525.116.04

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559961383

Comment:
Not sure, but MangoHUD shouldn't touch `.a` files at runtime, maybe the .so, but then it should be patches to use the versioned one to dlopen or fix the linking to it links the versioned one.

Re: New package: libXnvctrl-525.116.04

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559961383

Comment:
Not sure, but MangoHUD shouldn't touch `.a` files at runtime, maybe the .so, but then it should be patches to use the versioned one to dlopen or fix the linking so it links the versioned one.

Re: New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559962320

Comment:
yay the i686 build works, but I oofed the musl version rip, I'll fix that, fucking Nvidia not following Linux conventions with arch naming. Gotta fix my lint issue too.

Re: New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 616 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559964172

Comment:
> Not sure, but MangoHUD shouldn't touch `.a` files at runtime, maybe the .so, but then it should be patches to use the versioned one to dlopen or fix the linking so it links the versioned one.

well it does for some reason, I prob goofed it up somehow, but nonetheless it depends on at least the  .so files as I tried to separate the packages before and MangoHUD compiled but still couldn't detect the Nvidia GPU until I had the .so files installed, which is weird.

Re: New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 726 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559964172

Comment:
> Not sure, but MangoHUD shouldn't touch `.a` files at runtime, maybe the .so, but then it should be patches to use the versioned one to dlopen or fix the linking so it links the versioned one.

well it does for some reason, I prob goofed it up somehow, but nonetheless it depends on at least the  .so files as I tried to separate the packages before and MangoHUD compiled but still couldn't detect the Nvidia GPU until I had the .so files installed, which is weird, especially when the official binary does also detect the Nvidia GPU without me needing to install libXnvctrl.

Re: New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 413 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559966180

Comment:
> Not sure, but MangoHUD shouldn't touch `.a` files at runtime, maybe the .so, but then it should be patches to use the versioned one to dlopen or fix the linking so it links the versioned one.

how do I do the fixing of linking or use dlopen to fix this problem?

Re: New package: libXnvctrl-525.116.04

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559971129

Comment:
https://github.com/flightlessmango/MangoHud/blob/ea3ba7e30d1ee6f742d6fa10506222789f37223a/src/loaders/loader_nvctrl.cpp#L20 it seems to dlopen the versioned shared library which is correct.

Re: [PR PATCH] [Updated] New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]

There is an updated pull request by RoundDuckKira against master on the void-packages repository

https://github.com/RoundDuckKira/void-packages libXnvctrl
https://github.com/void-linux/void-packages/pull/44050

New package: libXnvctrl-525.116.04
create new libXnvctrl package for Nvidia hardware monitoring, the lack of this package means MangoHUD can't be fixed to support Nvidia GPUs.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES, I am using this package in my daily driver**


#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)



A patch file from https://github.com/void-linux/void-packages/pull/44050.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libXnvctrl-44050.patch --]
[-- Type: text/x-diff, Size: 6431 bytes --]

From 613215c85852cda59920d0d6c6ffbb2b4ec20a43 Mon Sep 17 00:00:00 2001
From: Kira Taylor Patton <roundduckkira@protonmail.com>
Date: Tue, 23 May 2023 13:31:19 -0400
Subject: [PATCH 1/3] New package: libXnvctrl-525.116.04

create new libXnvctrl package for Nvidia hardware monitoring
---
 .../nvidia-settings-libxnvctrl_so.patch       | 38 +++++++++++++++++++
 srcpkgs/libXnvctrl/template                   | 29 ++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch
 create mode 100644 srcpkgs/libXnvctrl/template

diff --git a/srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch b/srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch
new file mode 100644
index 000000000000..70043f0c2125
--- /dev/null
+++ b/srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch
@@ -0,0 +1,38 @@
+diff --git a/src/Makefile b/src/Makefile
+index 68eb140..6d0aab8 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -345,7 +345,7 @@ endif
+ 
+ ifdef BUILD_GTK3LIB
+ $(eval $(call DEBUG_INFO_RULES, $(GTK3LIB)))
+-$(GTK3LIB).unstripped: $(LIBXNVCTRL) $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
++$(GTK3LIB).unstripped: $(LIBXNVCTRL) $(LIBXNVCTRL_SHARED) $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
+ 	$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS)  $(BIN_LDFLAGS) \
+ 	    $(LIBXNVCTRL) $(LIBS) $(GTK3_LIBS) \
+ 	    -Wl,--unresolved-symbols=ignore-all -o $@ \
+diff --git a/src/libXNVCtrl/xnvctrl.mk b/src/libXNVCtrl/xnvctrl.mk
+index e6be2ef..c0921c4 100644
+--- a/src/libXNVCtrl/xnvctrl.mk
++++ b/src/libXNVCtrl/xnvctrl.mk
+@@ -39,6 +39,11 @@ XNVCTRL_CFLAGS ?=
+ 
+ LIBXNVCTRL = $(OUTPUTDIR)/libXNVCtrl.a
+ 
++LIBXNVCTRL_SHARED = $(OUTPUTDIR)/libXNVCtrl.so
++LIBXNVCTRL_ABI_VERSION_MAJOR = 0
++LIBXNVCTRL_ABI_VERSION_MINOR = 0
++LIBXNVCTRL_LIBS += -lXext -lX11
++
+ LIBXNVCTRL_SRC = $(XNVCTRL_DIR)/NVCtrl.c
+ 
+ LIBXNVCTRL_OBJ = $(call BUILD_OBJECT_LIST,$(LIBXNVCTRL_SRC))
+@@ -47,3 +52,8 @@ $(eval $(call DEFINE_OBJECT_RULE,TARGET,$(LIBXNVCTRL_SRC)))
+ 
+ $(LIBXNVCTRL) : $(LIBXNVCTRL_OBJ)
+ 	$(call quiet_cmd,AR) ru $@ $(LIBXNVCTRL_OBJ)
++
++$(LIBXNVCTRL_SHARED) : $(LIBXNVCTRL_OBJ)
++	$(CC) -shared $(CFLAGS) $(LDFLAGS) -Wl,-soname=$(notdir $@).${LIBXNVCTRL_ABI_VERSION_MAJOR} -o $@.$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $^ $(LIBXNVCTRL_LIBS)
++	ln -s $(notdir $@).$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $@
++	ln -s $(notdir $@).$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $@.$(LIBXNVCTRL_ABI_VERSION_MAJOR)
diff --git a/srcpkgs/libXnvctrl/template b/srcpkgs/libXnvctrl/template
new file mode 100644
index 000000000000..a422769a26df
--- /dev/null
+++ b/srcpkgs/libXnvctrl/template
@@ -0,0 +1,29 @@
+# Template file for 'libXnvctrl'
+pkgname=libXnvctrl
+version=525.116.04
+revision=1
+#archs="i686 x86_64"
+#build_wrksrc=
+build_style=gnu-makefile
+make_use_env=yes
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="inetutils base-devel"
+makedepends="jansson-devel gtk+3-devel libXv-devel libvdpau-devel libXext-devel libXxf86vm-devel"
+# depends=""
+short_desc="Nvidia hardware monitoring library"
+maintainer="Kira Taylor Patton <roundduckkira@protonmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/NVIDIA/nvidia-settings"
+#changelog=""
+distfiles="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${version}.tar.gz"
+checksum=32db97759c2a58fea86a63a69a423f1bf65198496cb2ac2279f4210b50097358
+
+do_install() {
+	vmkdir /usr/include/NVCtrl 755
+	vcopy src/libXNVCtrl/*.h /usr/include/NVCtrl/
+	vcopy src/_out/Linux_x86_64/libXNVCtrl.* /usr/lib/
+}

From 3c64513a9980ee30e2922eba34cdb721279cb910 Mon Sep 17 00:00:00 2001
From: Kira Taylor Patton <roundduckkira@protonmail.com>
Date: Tue, 23 May 2023 14:39:26 -0400
Subject: [PATCH 2/3] libXnvctrl-devel: update to 525.116.04.

---
 srcpkgs/libXnvctrl-devel    |  1 +
 srcpkgs/libXnvctrl/template | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/libXnvctrl-devel

diff --git a/srcpkgs/libXnvctrl-devel b/srcpkgs/libXnvctrl-devel
new file mode 120000
index 000000000000..4d13713cca3a
--- /dev/null
+++ b/srcpkgs/libXnvctrl-devel
@@ -0,0 +1 @@
+libXnvctrl
\ No newline at end of file
diff --git a/srcpkgs/libXnvctrl/template b/srcpkgs/libXnvctrl/template
index a422769a26df..c3d62c5780b2 100644
--- a/srcpkgs/libXnvctrl/template
+++ b/srcpkgs/libXnvctrl/template
@@ -23,7 +23,15 @@ distfiles="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${version
 checksum=32db97759c2a58fea86a63a69a423f1bf65198496cb2ac2279f4210b50097358
 
 do_install() {
+	if [ ${XBPS_TARGET_MACHINE} =  "i686" ]; then
+        	vcopy src/_out/Linux_x86/libXNVCtrl.* /usr/lib/
+	else
+		vcopy src/_out/Linux_${XBPS_TARGET_MACHINE}/libXNVCtrl.* /usr/lib/
+	fi
+}
+
+libXnvctrl-devel_package() {
+	short_desc+=" - development files"
 	vmkdir /usr/include/NVCtrl 755
-	vcopy src/libXNVCtrl/*.h /usr/include/NVCtrl/
-	vcopy src/_out/Linux_x86_64/libXNVCtrl.* /usr/lib/
+        vcopy src/libXNVCtrl/*.h /usr/include/NVCtrl/
 }

From 89c87440b728e1f18abde18011f4b4894b0df899 Mon Sep 17 00:00:00 2001
From: Kira Taylor Patton <roundduckkira@protonmail.com>
Date: Tue, 23 May 2023 14:56:30 -0400
Subject: [PATCH 3/3] libXnvctrl: update to 525.116.04.

fix musl compilation
---
 srcpkgs/libXnvctrl/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libXnvctrl/template b/srcpkgs/libXnvctrl/template
index c3d62c5780b2..e47b9b57d9af 100644
--- a/srcpkgs/libXnvctrl/template
+++ b/srcpkgs/libXnvctrl/template
@@ -24,7 +24,9 @@ checksum=32db97759c2a58fea86a63a69a423f1bf65198496cb2ac2279f4210b50097358
 
 do_install() {
 	if [ ${XBPS_TARGET_MACHINE} =  "i686" ]; then
-        	vcopy src/_out/Linux_x86/libXNVCtrl.* /usr/lib/
+		vcopy src/_out/Linux_x86/libXNVCtrl.* /usr/lib/
+	elif [ ${XBPS_TARGET_MACHINE} = 'x86_64-musl' ]; then
+		vcopy src/_out/Linux_x86_64/libXNVCtrl.* /usr/lib/
 	else
 		vcopy src/_out/Linux_${XBPS_TARGET_MACHINE}/libXNVCtrl.* /usr/lib/
 	fi
@@ -33,5 +35,5 @@ do_install() {
 libXnvctrl-devel_package() {
 	short_desc+=" - development files"
 	vmkdir /usr/include/NVCtrl 755
-        vcopy src/libXNVCtrl/*.h /usr/include/NVCtrl/
+	vcopy src/libXNVCtrl/*.h /usr/include/NVCtrl/
 }

Re: New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 459 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559977168

Comment:
> https://github.com/flightlessmango/MangoHud/blob/ea3ba7e30d1ee6f742d6fa10506222789f37223a/src/loaders/loader_nvctrl.cpp#L20 it seems to dlopen the versioned shared library which is correct.

well if that's in the source code then how in the hecks does it not use it then and it needs locally installed libs?

Re: New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 591 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1559993677

Comment:
> https://github.com/flightlessmango/MangoHud/blob/ea3ba7e30d1ee6f742d6fa10506222789f37223a/src/loaders/loader_nvctrl.cpp#L20 it seems to dlopen the versioned shared library which is correct.

I get what you meant now, well then that means this program does depend on at least those binaries then in this development library right, and thus the .a and .so files must be in the runtime library package and not the development library package?

Re: New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 506 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1560003017

Comment:
So I guess then the package is fine for now, I guess, anything else that needs to be done on this? I'm sorry for not being knowledgeable in libraries and packaging and being a moron. So far things look good, though a worry is about the possibility of running MangoHUD on ARM systems. IDK what would be the compiled name for the ARM arches on nvidia-settings.

Re: [PR PATCH] [Updated] New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]

There is an updated pull request by RoundDuckKira against master on the void-packages repository

https://github.com/RoundDuckKira/void-packages libXnvctrl
https://github.com/void-linux/void-packages/pull/44050

New package: libXnvctrl-525.116.04
create new libXnvctrl package for Nvidia hardware monitoring, the lack of this package means MangoHUD can't be fixed to support Nvidia GPUs.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES, I am using this package in my daily driver**


#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)



A patch file from https://github.com/void-linux/void-packages/pull/44050.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libXnvctrl-44050.patch --]
[-- Type: text/x-diff, Size: 9027 bytes --]

From 613215c85852cda59920d0d6c6ffbb2b4ec20a43 Mon Sep 17 00:00:00 2001
From: Kira Taylor Patton <roundduckkira@protonmail.com>
Date: Tue, 23 May 2023 13:31:19 -0400
Subject: [PATCH 1/4] New package: libXnvctrl-525.116.04

create new libXnvctrl package for Nvidia hardware monitoring
---
 .../nvidia-settings-libxnvctrl_so.patch       | 38 +++++++++++++++++++
 srcpkgs/libXnvctrl/template                   | 29 ++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch
 create mode 100644 srcpkgs/libXnvctrl/template

diff --git a/srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch b/srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch
new file mode 100644
index 000000000000..70043f0c2125
--- /dev/null
+++ b/srcpkgs/libXnvctrl/patches/nvidia-settings-libxnvctrl_so.patch
@@ -0,0 +1,38 @@
+diff --git a/src/Makefile b/src/Makefile
+index 68eb140..6d0aab8 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -345,7 +345,7 @@ endif
+ 
+ ifdef BUILD_GTK3LIB
+ $(eval $(call DEBUG_INFO_RULES, $(GTK3LIB)))
+-$(GTK3LIB).unstripped: $(LIBXNVCTRL) $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
++$(GTK3LIB).unstripped: $(LIBXNVCTRL) $(LIBXNVCTRL_SHARED) $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
+ 	$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS)  $(BIN_LDFLAGS) \
+ 	    $(LIBXNVCTRL) $(LIBS) $(GTK3_LIBS) \
+ 	    -Wl,--unresolved-symbols=ignore-all -o $@ \
+diff --git a/src/libXNVCtrl/xnvctrl.mk b/src/libXNVCtrl/xnvctrl.mk
+index e6be2ef..c0921c4 100644
+--- a/src/libXNVCtrl/xnvctrl.mk
++++ b/src/libXNVCtrl/xnvctrl.mk
+@@ -39,6 +39,11 @@ XNVCTRL_CFLAGS ?=
+ 
+ LIBXNVCTRL = $(OUTPUTDIR)/libXNVCtrl.a
+ 
++LIBXNVCTRL_SHARED = $(OUTPUTDIR)/libXNVCtrl.so
++LIBXNVCTRL_ABI_VERSION_MAJOR = 0
++LIBXNVCTRL_ABI_VERSION_MINOR = 0
++LIBXNVCTRL_LIBS += -lXext -lX11
++
+ LIBXNVCTRL_SRC = $(XNVCTRL_DIR)/NVCtrl.c
+ 
+ LIBXNVCTRL_OBJ = $(call BUILD_OBJECT_LIST,$(LIBXNVCTRL_SRC))
+@@ -47,3 +52,8 @@ $(eval $(call DEFINE_OBJECT_RULE,TARGET,$(LIBXNVCTRL_SRC)))
+ 
+ $(LIBXNVCTRL) : $(LIBXNVCTRL_OBJ)
+ 	$(call quiet_cmd,AR) ru $@ $(LIBXNVCTRL_OBJ)
++
++$(LIBXNVCTRL_SHARED) : $(LIBXNVCTRL_OBJ)
++	$(CC) -shared $(CFLAGS) $(LDFLAGS) -Wl,-soname=$(notdir $@).${LIBXNVCTRL_ABI_VERSION_MAJOR} -o $@.$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $^ $(LIBXNVCTRL_LIBS)
++	ln -s $(notdir $@).$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $@
++	ln -s $(notdir $@).$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $@.$(LIBXNVCTRL_ABI_VERSION_MAJOR)
diff --git a/srcpkgs/libXnvctrl/template b/srcpkgs/libXnvctrl/template
new file mode 100644
index 000000000000..a422769a26df
--- /dev/null
+++ b/srcpkgs/libXnvctrl/template
@@ -0,0 +1,29 @@
+# Template file for 'libXnvctrl'
+pkgname=libXnvctrl
+version=525.116.04
+revision=1
+#archs="i686 x86_64"
+#build_wrksrc=
+build_style=gnu-makefile
+make_use_env=yes
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="inetutils base-devel"
+makedepends="jansson-devel gtk+3-devel libXv-devel libvdpau-devel libXext-devel libXxf86vm-devel"
+# depends=""
+short_desc="Nvidia hardware monitoring library"
+maintainer="Kira Taylor Patton <roundduckkira@protonmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/NVIDIA/nvidia-settings"
+#changelog=""
+distfiles="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${version}.tar.gz"
+checksum=32db97759c2a58fea86a63a69a423f1bf65198496cb2ac2279f4210b50097358
+
+do_install() {
+	vmkdir /usr/include/NVCtrl 755
+	vcopy src/libXNVCtrl/*.h /usr/include/NVCtrl/
+	vcopy src/_out/Linux_x86_64/libXNVCtrl.* /usr/lib/
+}

From 3c64513a9980ee30e2922eba34cdb721279cb910 Mon Sep 17 00:00:00 2001
From: Kira Taylor Patton <roundduckkira@protonmail.com>
Date: Tue, 23 May 2023 14:39:26 -0400
Subject: [PATCH 2/4] libXnvctrl-devel: update to 525.116.04.

---
 srcpkgs/libXnvctrl-devel    |  1 +
 srcpkgs/libXnvctrl/template | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/libXnvctrl-devel

diff --git a/srcpkgs/libXnvctrl-devel b/srcpkgs/libXnvctrl-devel
new file mode 120000
index 000000000000..4d13713cca3a
--- /dev/null
+++ b/srcpkgs/libXnvctrl-devel
@@ -0,0 +1 @@
+libXnvctrl
\ No newline at end of file
diff --git a/srcpkgs/libXnvctrl/template b/srcpkgs/libXnvctrl/template
index a422769a26df..c3d62c5780b2 100644
--- a/srcpkgs/libXnvctrl/template
+++ b/srcpkgs/libXnvctrl/template
@@ -23,7 +23,15 @@ distfiles="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${version
 checksum=32db97759c2a58fea86a63a69a423f1bf65198496cb2ac2279f4210b50097358
 
 do_install() {
+	if [ ${XBPS_TARGET_MACHINE} =  "i686" ]; then
+        	vcopy src/_out/Linux_x86/libXNVCtrl.* /usr/lib/
+	else
+		vcopy src/_out/Linux_${XBPS_TARGET_MACHINE}/libXNVCtrl.* /usr/lib/
+	fi
+}
+
+libXnvctrl-devel_package() {
+	short_desc+=" - development files"
 	vmkdir /usr/include/NVCtrl 755
-	vcopy src/libXNVCtrl/*.h /usr/include/NVCtrl/
-	vcopy src/_out/Linux_x86_64/libXNVCtrl.* /usr/lib/
+        vcopy src/libXNVCtrl/*.h /usr/include/NVCtrl/
 }

From 89c87440b728e1f18abde18011f4b4894b0df899 Mon Sep 17 00:00:00 2001
From: Kira Taylor Patton <roundduckkira@protonmail.com>
Date: Tue, 23 May 2023 14:56:30 -0400
Subject: [PATCH 3/4] libXnvctrl: update to 525.116.04.

fix musl compilation
---
 srcpkgs/libXnvctrl/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libXnvctrl/template b/srcpkgs/libXnvctrl/template
index c3d62c5780b2..e47b9b57d9af 100644
--- a/srcpkgs/libXnvctrl/template
+++ b/srcpkgs/libXnvctrl/template
@@ -24,7 +24,9 @@ checksum=32db97759c2a58fea86a63a69a423f1bf65198496cb2ac2279f4210b50097358
 
 do_install() {
 	if [ ${XBPS_TARGET_MACHINE} =  "i686" ]; then
-        	vcopy src/_out/Linux_x86/libXNVCtrl.* /usr/lib/
+		vcopy src/_out/Linux_x86/libXNVCtrl.* /usr/lib/
+	elif [ ${XBPS_TARGET_MACHINE} = 'x86_64-musl' ]; then
+		vcopy src/_out/Linux_x86_64/libXNVCtrl.* /usr/lib/
 	else
 		vcopy src/_out/Linux_${XBPS_TARGET_MACHINE}/libXNVCtrl.* /usr/lib/
 	fi
@@ -33,5 +35,5 @@ do_install() {
 libXnvctrl-devel_package() {
 	short_desc+=" - development files"
 	vmkdir /usr/include/NVCtrl 755
-        vcopy src/libXNVCtrl/*.h /usr/include/NVCtrl/
+	vcopy src/libXNVCtrl/*.h /usr/include/NVCtrl/
 }

From f6ac91f39e1e6fb29a931d9246febda6a8197d24 Mon Sep 17 00:00:00 2001
From: Kira Taylor Patton <roundduckkira@protonmail.com>
Date: Tue, 23 May 2023 15:39:18 -0400
Subject: [PATCH 4/4] libXnvctrl: update to 525.116.04.

---
 srcpkgs/MangoHud/template   |  8 ++++----
 srcpkgs/libXnvctrl/template | 16 ++--------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 4e2a01ca1ce9..aaa3f29e9883 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,13 +1,13 @@
 # Template file for 'MangoHud'
 pkgname=MangoHud
 version=0.6.8
-revision=1
+revision=2
 build_style=meson
-configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled
+configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=enabled
  -Dwith_nvml=disabled -Duse_system_spdlog=enabled"
 hostmakedepends="Vulkan-Headers python3-Mako glslang pkg-config"
-makedepends="libglvnd-devel dbus-devel vulkan-loader Vulkan-Headers
- spdlog"
+makedepends="libglvnd-devel dbus-devel vulkan-loader Vulkan-Headers libXnvctrl-devel spdlog"
+depends="libXnvctrl-devel"
 short_desc="Vulkan and OpenGL overlay for monitoring FPS, temperatures and more"
 maintainer="John <me@johnnynator.dev>"
 license="MIT"
diff --git a/srcpkgs/libXnvctrl/template b/srcpkgs/libXnvctrl/template
index e47b9b57d9af..de69aeb873a5 100644
--- a/srcpkgs/libXnvctrl/template
+++ b/srcpkgs/libXnvctrl/template
@@ -2,18 +2,12 @@
 pkgname=libXnvctrl
 version=525.116.04
 revision=1
-#archs="i686 x86_64"
-#build_wrksrc=
 build_style=gnu-makefile
 make_use_env=yes
-#configure_args=""
-#make_build_args=""
+make_build_args="OUTPUTDIR=out"
 #make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
 hostmakedepends="inetutils base-devel"
 makedepends="jansson-devel gtk+3-devel libXv-devel libvdpau-devel libXext-devel libXxf86vm-devel"
-# depends=""
 short_desc="Nvidia hardware monitoring library"
 maintainer="Kira Taylor Patton <roundduckkira@protonmail.com>"
 license="GPL-2.0-only"
@@ -23,13 +17,7 @@ distfiles="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${version
 checksum=32db97759c2a58fea86a63a69a423f1bf65198496cb2ac2279f4210b50097358
 
 do_install() {
-	if [ ${XBPS_TARGET_MACHINE} =  "i686" ]; then
-		vcopy src/_out/Linux_x86/libXNVCtrl.* /usr/lib/
-	elif [ ${XBPS_TARGET_MACHINE} = 'x86_64-musl' ]; then
-		vcopy src/_out/Linux_x86_64/libXNVCtrl.* /usr/lib/
-	else
-		vcopy src/_out/Linux_${XBPS_TARGET_MACHINE}/libXNVCtrl.* /usr/lib/
-	fi
+	vcopy src/out/libXNVCtrl.* /usr/lib/
 }
 
 libXnvctrl-devel_package() {

Re: New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1560026011

Comment:
There I merged #44051 with this pull request and I'm gonna close the old pull request.

Re: New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 199 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1560027541

Comment:
Hopefully the crossbuilding is fixed now by the way

Re: New package: libXnvctrl-525.116.04

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1560027541

Comment:
Hopefully the crossbuilding is fixed now by the way

EDIT: nope it isn't, the template is cleaner though

Re: [PR REVIEW] New package: libXnvctrl-525.116.04

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

New review comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#discussion_r1202916336

Comment:
this is missing a pkg_install function, see `zlib-devel`.

Re: [PR REVIEW] New package: libXnvctrl-525.116.04; updating MangoHud too to depend on this new package to fix Nvidia GPU detection

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 212 bytes --]

New review comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#discussion_r1202918449

Comment:
```
make_build_target="out/libXNVCtrl.so out/libXNVCtrl.a"
```

Re: [PR REVIEW] New package: libXnvctrl-525.116.04; updating MangoHud too to depend on this new package to fix Nvidia GPU detection

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 257 bytes --]

New review comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#discussion_r1202920909

Comment:
Ok that doesn't work with the toplevel makefile, adding `make_build_cmd="make -C src"` should make this work.

Re: [PR REVIEW] New package: libXnvctrl-525.116.04; updating MangoHud too to depend on this new package to fix Nvidia GPU detection

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New review comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#discussion_r1203313790

Comment:
ah crap, whoops I forgot that bit

Re: [PR REVIEW] New package: libXnvctrl-525.116.04; updating MangoHud too to depend on this new package to fix Nvidia GPU detection

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 168 bytes --]

New review comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#discussion_r1203314270

Comment:
okay thank you

Re: New package: libXnvctrl-525.116.04; updating MangoHud too to depend on this new package to fix Nvidia GPU detection

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 337 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1560461879

Comment:
`make: *** No rule to make target 'out/libXNVCtrl.a'.  Stop.`

Basically when setting the target, for some reason it doesn't have rules to make the .a and .so files. The .so did this too.

Re: New package: libXnvctrl-525.116.04; updating MangoHud too to depend on this new package to fix Nvidia GPU detection

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 393 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1561553275

Comment:
> `make: *** No rule to make target 'out/libXNVCtrl.a'. Stop.`
> 
> Basically when setting the target, for some reason it doesn't have rules to make the .a and .so files. The .so did this too.

Should work if `make_build_cmd="make -C src"` is set.

Re: New package: libXnvctrl-525.116.04; updating MangoHud too to depend on this new package to fix Nvidia GPU detection

[RoundDuckKira]

[-- Attachment #1: Type: text/plain, Size: 524 bytes --]

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1562101731

Comment:
x                                                                                      

> > `make: *** No rule to make target 'out/libXNVCtrl.a'. Stop.`
> > Basically when setting the target, for some reason it doesn't have rules to make the .a and .so files. The .so did this too.
> 
> Should work if `make_build_cmd="make -C src"` is set.

well I did do that though.

Re: New package: libXnvctrl-525.116.04; updating MangoHud too to depend on this new package to fix Nvidia GPU detection

[gmbeard]

[-- Attachment #1: Type: text/plain, Size: 575 bytes --]

New comment by gmbeard on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1615837740

Comment:
@RoundDuckKira I took a different approach, but was able to get nvidia GPU stats working with this package - #42919

It enables `-Dwith_nvml` and uses the non-DFSG upstream, which includes some nvidia licensed code, hence the separate (nonfree) package.

I've been using this for a few months now, but It would be great to have the in-tree MangoHud package work out of the box with nvidia, though, like you're doing here :smile: 

Re: New package: libXnvctrl-525.116.04; updating MangoHud too to depend on this new package to fix Nvidia GPU detection

[gmbeard]

[-- Attachment #1: Type: text/plain, Size: 584 bytes --]

New comment by gmbeard on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1615837740

Comment:
@RoundDuckKira I took a different approach, but was able to get MangoHud nvidia GPU stats working with this package - #42919

It enables `-Dwith_nvml` and uses the non-DFSG upstream, which includes some nvidia licensed code, hence the separate (nonfree) package.

I've been using this for a few months now, but It would be great to have the in-tree MangoHud package work out of the box with nvidia, though, like you're doing here :smile: 

Re: New package: libXnvctrl-525.116.04; updating MangoHud too to depend on this new package to fix Nvidia GPU detection

[github-actions]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/44050#issuecomment-1741622773

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: New package: libXnvctrl-525.116.04; updating MangoHud too to depend on this new package to fix Nvidia GPU detection

[github-actions]

[-- Attachment #1: Type: text/plain, Size: 1208 bytes --]

There's a closed pull request on the void-packages repository

New package: libXnvctrl-525.116.04; updating MangoHud too to depend on this new package to fix Nvidia GPU detection
https://github.com/void-linux/void-packages/pull/44050

Description:
create new libXnvctrl package for Nvidia hardware monitoring, the lack of this package means MangoHUD can't be fixed to support Nvidia GPUs.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES, I am using this package in my daily driver**


#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)