From 613215c85852cda59920d0d6c6ffbb2b4ec20a43 Mon Sep 17 00:00:00 2001 From: Kira Taylor Patton 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 " +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 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 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 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 " 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 " 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() {