[PR PATCH] Link OptiX library after installing

[PR PATCH] Link OptiX library after installing

[mantissa-]

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

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

https://github.com/mantissa-/void-packages patch-1
https://github.com/void-linux/void-packages/pull/28702

Link OptiX library after installing
This change allows applications that use OptiX (eg. Blender) to find and use the library.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From e291f2f2daa4852217c6f590025bc592ee70fdd6 Mon Sep 17 00:00:00 2001
From: Midge Sinnaeve <mantissa-@users.noreply.github.com>
Date: Fri, 12 Feb 2021 15:46:30 +0100
Subject: [PATCH] Link OptiX library after installing

This change allows applications that use OptiX (eg. Blender) to find and use the library.
---
 srcpkgs/nvidia/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index db0ff923266..83bfd9afe40 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -209,6 +209,8 @@ do_install() {
 
 	# optix ray racing engine
 	vinstall libnvoptix.so.${version} 755 usr/lib
+	ln -sf libnvoptix.so.${version} ${DESTDIR}/${libdir}/libnvoptix.so
+	ln -sf libnvoptix.so.${version} ${DESTDIR}/${libdir}/libnvoptix.so.1
 
 	# dkms pkg
 	vmkdir usr/src/nvidia-${version}

Re: [PR REVIEW] Link OptiX library after installing

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28702#discussion_r575720024

Comment:
I don't think `libdir` is set? You should just use `usr/lib` directly.

Re: [PR PATCH] [Updated] Link OptiX library after installing

[mantissa-]

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

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

https://github.com/mantissa-/void-packages patch-1
https://github.com/void-linux/void-packages/pull/28702

Link OptiX library after installing
This change allows applications that use OptiX (eg. Blender) to find and use the library.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From e291f2f2daa4852217c6f590025bc592ee70fdd6 Mon Sep 17 00:00:00 2001
From: Midge Sinnaeve <mantissa-@users.noreply.github.com>
Date: Fri, 12 Feb 2021 15:46:30 +0100
Subject: [PATCH 1/2] Link OptiX library after installing

This change allows applications that use OptiX (eg. Blender) to find and use the library.
---
 srcpkgs/nvidia/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index db0ff923266..83bfd9afe40 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -209,6 +209,8 @@ do_install() {
 
 	# optix ray racing engine
 	vinstall libnvoptix.so.${version} 755 usr/lib
+	ln -sf libnvoptix.so.${version} ${DESTDIR}/${libdir}/libnvoptix.so
+	ln -sf libnvoptix.so.${version} ${DESTDIR}/${libdir}/libnvoptix.so.1
 
 	# dkms pkg
 	vmkdir usr/src/nvidia-${version}

From 99b420f8d682d03e656b483177697e0a5ca7eb62 Mon Sep 17 00:00:00 2001
From: Midge Sinnaeve <mantissa-@users.noreply.github.com>
Date: Mon, 15 Feb 2021 11:04:28 +0100
Subject: [PATCH 2/2] Hardcoded /usr/lib path instead of using variable

---
 srcpkgs/nvidia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 83bfd9afe40..2d300b5613d 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -209,8 +209,8 @@ do_install() {
 
 	# optix ray racing engine
 	vinstall libnvoptix.so.${version} 755 usr/lib
-	ln -sf libnvoptix.so.${version} ${DESTDIR}/${libdir}/libnvoptix.so
-	ln -sf libnvoptix.so.${version} ${DESTDIR}/${libdir}/libnvoptix.so.1
+	ln -sf libnvoptix.so.${version} /usr/lib/libnvoptix.so
+	ln -sf libnvoptix.so.${version} /usr/lib/libnvoptix.so.1
 
 	# dkms pkg
 	vmkdir usr/src/nvidia-${version}

Re: [PR REVIEW] Link OptiX library after installing

[mantissa-]

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

New review comment by mantissa- on void-packages repository

https://github.com/void-linux/void-packages/pull/28702#discussion_r576076219

Comment:
Fixed it, thanks!

Re: Link OptiX library after installing

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28702#issuecomment-782517360

Comment:
You need to squash the commits as well, and fix the commit message to say `nvidia: link OptiX library` or similar.

And the package's revision needs to be increased so a new package is built.

Re: [PR PATCH] [Merged]: Link OptiX library after installing

[abenson]

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

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

Link OptiX library after installing
https://github.com/void-linux/void-packages/pull/28702

Description:
This change allows applications that use OptiX (eg. Blender) to find and use the library.

<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Re: Link OptiX library after installing

[mantissa-]

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

New comment by mantissa- on void-packages repository

https://github.com/void-linux/void-packages/pull/28702#issuecomment-782828755

Comment:
Thanks for the help, quite new to this process, glad it got accepted!