* Re: [PR PATCH] [Updated] New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud
2023-05-22 8:46 [PR PATCH] New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud RoundDuckKira
@ 2023-05-22 9:10 ` RoundDuckKira
2023-05-22 9:27 ` hervyqa
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: RoundDuckKira @ 2023-05-22 9:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2002 bytes --]
There is an updated pull request by RoundDuckKira against master on the void-packages repository
https://github.com/RoundDuckKira/void-packages-dev master
https://github.com/void-linux/void-packages/pull/44028
New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### 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)
- I built this PR locally for these architectures (if supported. mark crossbuilds): n/a
The default MangoHud package in the repos is a little broken due to the lack of Nvidia detection, only working on open source GPUs. As a result, I looked further and realized it was due to a lack of libraries, and with some help I realized these libs were missing on the original .run installer that is the basis of the Nvidia package. So I looked at how Arch did things and made a package that takes the source for the nvidia-settings tool, compiles it, and then takes its library dev files for GPU detection and makes them into a package. I then updated MangoHud to depend on the package, that way it'll support Nvidia cards finally and people won't need to install a third party version from Flatpak or their repo.
A patch file from https://github.com/void-linux/void-packages/pull/44028.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-44028.patch --]
[-- Type: text/x-diff, Size: 6175 bytes --]
From fcc36ac4ccdbe9d4331853f17bd16ee60a9c7e76 Mon Sep 17 00:00:00 2001
From: Kira Taylor Patton <roundduckkira@protonmail.com>
Date: Mon, 22 May 2023 04:30:24 -0400
Subject: [PATCH 1/2] Fixing a bug with MangoHUD where Nvidia GPUs can't be
read by the program by making it depend on a new package named
libXnvctrl-devel
---
srcpkgs/MangoHud/template | 8 ++--
.../nvidia-settings-libxnvctrl_so.patch | 38 +++++++++++++++++++
srcpkgs/libXnvctrl-devel/template | 29 ++++++++++++++
3 files changed, 71 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/libXnvctrl-devel/patches/nvidia-settings-libxnvctrl_so.patch
create mode 100644 srcpkgs/libXnvctrl-devel/template
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-devel/patches/nvidia-settings-libxnvctrl_so.patch b/srcpkgs/libXnvctrl-devel/patches/nvidia-settings-libxnvctrl_so.patch
new file mode 100644
index 000000000000..70043f0c2125
--- /dev/null
+++ b/srcpkgs/libXnvctrl-devel/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-devel/template b/srcpkgs/libXnvctrl-devel/template
new file mode 100644
index 000000000000..7c9606a7e219
--- /dev/null
+++ b/srcpkgs/libXnvctrl-devel/template
@@ -0,0 +1,29 @@
+# Template file for 'libXnvctrl-devel'
+pkgname=libXnvctrl-devel
+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 3890ee5d7b86f06f8d483fd1d123cd508a3d818e Mon Sep 17 00:00:00 2001
From: Kira Taylor Patton <roundduckkira@protonmail.com>
Date: Mon, 22 May 2023 05:10:34 -0400
Subject: [PATCH 2/2] libXnvctrl-devel: update to 525.116.04.
cleanup libXnvctrl-devel
---
srcpkgs/libXnvctrl-devel/template | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/srcpkgs/libXnvctrl-devel/template b/srcpkgs/libXnvctrl-devel/template
index 7c9606a7e219..30d05d44248a 100644
--- a/srcpkgs/libXnvctrl-devel/template
+++ b/srcpkgs/libXnvctrl-devel/template
@@ -2,23 +2,14 @@
pkgname=libXnvctrl-devel
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
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud
2023-05-22 8:46 [PR PATCH] New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud RoundDuckKira
2023-05-22 9:10 ` [PR PATCH] [Updated] " RoundDuckKira
@ 2023-05-22 9:27 ` hervyqa
2023-05-22 10:19 ` RoundDuckKira
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: hervyqa @ 2023-05-22 9:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
New comment by hervyqa on void-packages repository
https://github.com/void-linux/void-packages/pull/44028#issuecomment-1556873715
Comment:
_Using the `master` branch of your fork for contributing is also strongly discouraged. It can cause many issues with updating your pull request (also called a PR), and having multiple PRs open at once. To create a new branch:_
```
$ git checkout master -b libxnvctrl
```
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud
2023-05-22 8:46 [PR PATCH] New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud RoundDuckKira
2023-05-22 9:10 ` [PR PATCH] [Updated] " RoundDuckKira
2023-05-22 9:27 ` hervyqa
@ 2023-05-22 10:19 ` RoundDuckKira
2023-05-22 10:20 ` RoundDuckKira
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: RoundDuckKira @ 2023-05-22 10:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 637 bytes --]
New comment by RoundDuckKira on void-packages repository
https://github.com/void-linux/void-packages/pull/44028#issuecomment-1556955196
Comment:
> _Using the `master` branch of your fork for contributing is also strongly discouraged. It can cause many issues with updating your pull request (also called a PR), and having multiple PRs open at once. To create a new branch:_
>
> ```
> $ git checkout master -b libxnvctrl
> ```
>
> https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements
Ah whoops my bad, I tried to make my own branch but then when I did gutbpush -f it pushed to master.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud
2023-05-22 8:46 [PR PATCH] New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud RoundDuckKira
` (2 preceding siblings ...)
2023-05-22 10:19 ` RoundDuckKira
@ 2023-05-22 10:20 ` RoundDuckKira
2023-05-22 11:44 ` abenson
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: RoundDuckKira @ 2023-05-22 10:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 736 bytes --]
New comment by RoundDuckKira on void-packages repository
https://github.com/void-linux/void-packages/pull/44028#issuecomment-1556955196
Comment:
> _Using the `master` branch of your fork for contributing is also strongly discouraged. It can cause many issues with updating your pull request (also called a PR), and having multiple PRs open at once. To create a new branch:_
>
> ```
> $ git checkout master -b libxnvctrl
> ```
>
> https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements
Ah whoops my bad, I tried to make my own branch but then when I did git push -f it pushed to master. How do I do it right in the future and also do I need to resetup this pull request all over again?
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud
2023-05-22 8:46 [PR PATCH] New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud RoundDuckKira
` (3 preceding siblings ...)
2023-05-22 10:20 ` RoundDuckKira
@ 2023-05-22 11:44 ` abenson
2023-05-22 23:54 ` RoundDuckKira
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: abenson @ 2023-05-22 11:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 630 bytes --]
New comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/44028#issuecomment-1557069897
Comment:
Yeah, you might have to switch to a new branch and open a new PR. I remember things get kind of wonky if you try to force push to update this.
You'll need to rebase and get rid of that merge commit. Also, you'll need to move all of the changes to the `libXnvctrl(-devel?)` to one commit and the changes to `MangoHud` to another. Also, `libXnvctrl` package should be a "New package:..." commit and `-devel` split off form it and things be added to `common/shlibs` like other libraries.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud
2023-05-22 8:46 [PR PATCH] New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud RoundDuckKira
` (4 preceding siblings ...)
2023-05-22 11:44 ` abenson
@ 2023-05-22 23:54 ` RoundDuckKira
2023-05-23 16:40 ` RoundDuckKira
2023-05-23 16:40 ` [PR PATCH] [Closed]: " RoundDuckKira
7 siblings, 0 replies; 9+ messages in thread
From: RoundDuckKira @ 2023-05-22 23:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]
New comment by RoundDuckKira on void-packages repository
https://github.com/void-linux/void-packages/pull/44028#issuecomment-1558205149
Comment:
> Yeah, you might have to switch to a new branch and open a new PR. I remember things get kind of wonky if you try to force push to update this.
>
> You'll need to rebase and get rid of that merge commit. Also, you'll need to move all of the changes to the `libXnvctrl(-devel?)` to one commit and the changes to `MangoHud` to another. Also, `libXnvctrl` package should be a "New package:..." commit and `-devel` split off form it and things be added to `common/shlibs` like other libraries.
Ah alright, the main reason I didn't just name it libXnvctrl is because it is just a development library package, I tried to separate the two with a devel and non devel version and xbps-src warned me that .so and .a files should be in a -devel package, so instead I'll just wholesale rename it to just libXnvctrl unless you say something otherwise and that I should split the .h files and the .so and .a files into their own separate packages.
Also how do I do this, how do I push changes into basically a branch within my repo rather than push to master? When I did git push, git pushed to master instead of to my MangoHud branch. :/
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud
2023-05-22 8:46 [PR PATCH] New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud RoundDuckKira
` (5 preceding siblings ...)
2023-05-22 23:54 ` RoundDuckKira
@ 2023-05-23 16:40 ` RoundDuckKira
2023-05-23 16:40 ` [PR PATCH] [Closed]: " RoundDuckKira
7 siblings, 0 replies; 9+ messages in thread
From: RoundDuckKira @ 2023-05-23 16:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New comment by RoundDuckKira on void-packages repository
https://github.com/void-linux/void-packages/pull/44028#issuecomment-1559802284
Comment:
I'm closing and reopening this pull req so I'm not using the master branch.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Closed]: New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud
2023-05-22 8:46 [PR PATCH] New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud RoundDuckKira
` (6 preceding siblings ...)
2023-05-23 16:40 ` RoundDuckKira
@ 2023-05-23 16:40 ` RoundDuckKira
7 siblings, 0 replies; 9+ messages in thread
From: RoundDuckKira @ 2023-05-23 16:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1831 bytes --]
There's a closed pull request on the void-packages repository
New package libXnvctrl-devel and a change in MangoHud to depend on it, so that Nvidia cards will be detected on MangoHud
https://github.com/void-linux/void-packages/pull/44028
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### 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)
- I built this PR locally for these architectures (if supported. mark crossbuilds): n/a
The default MangoHud package in the repos is a little broken due to the lack of Nvidia detection, only working on open source GPUs. As a result, I looked further and realized it was due to a lack of libraries, and with some help I realized these libs were missing on the original .run installer that is the basis of the Nvidia package. So I looked at how Arch did things and made a package that takes the source for the nvidia-settings tool, compiles it, and then takes its library dev files for GPU detection and makes them into a package. I then updated MangoHud to depend on the package, that way it'll support Nvidia cards finally and people won't need to install a third party version from Flatpak or their repo.
^ permalink raw reply [flat|nested] 9+ messages in thread