[PR PATCH] nvidia: fix fbc and ifr libs

[PR PATCH] nvidia: fix fbc and ifr libs

[33kk]

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

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

https://github.com/33kk/void-packages nvidia
https://github.com/void-linux/void-packages/pull/33653

nvidia: fix fbc and ifr libs
<!-- 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/33653.patch is attached

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

From 53b0c709b7e3186462c3201cdf454edbe669b43a Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Wed, 20 Oct 2021 14:24:41 +0300
Subject: [PATCH] nvidia: fix fbc and ifr libs

---
 srcpkgs/nvidia/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 6a36471c1079..d792d3123fb6 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=470.74
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -103,10 +103,6 @@ _install_libs() {
 		${DESTDIR}/${libdir}/libnvidia-allocator.so.1
 	ln -sf libnvidia-allocator.so.1 \
 		${DESTDIR}/${libdir}/libnvidia-allocator.so
-
-	# helper libs for approved partners' GRID remote apps
-	vinstall libnvidia-ifr.so.${version} 755 usr/lib
-	vinstall libnvidia-fbc.so.${version} 755 usr/lib
 }
 
 do_extract() {

Re: [PR REVIEW] nvidia: fix fbc and ifr libs

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33653#discussion_r735050725

Comment:
Can you explain why this is an issue?

Re: [PR REVIEW] nvidia: fix fbc and ifr libs

[33kk]

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

New review comment by 33kk on void-packages repository

https://github.com/void-linux/void-packages/pull/33653#discussion_r735126516

Comment:
Because those libraries are already installed above and are overwritten here. Also this installs 32bit libraries into lib64, since it uses usr/lib instead of the path passed into the function

Re: [PR REVIEW] nvidia: fix fbc and ifr libs

[33kk]

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

New review comment by 33kk on void-packages repository

https://github.com/void-linux/void-packages/pull/33653#discussion_r735126516

Comment:
Because those libraries are already installed above and are overwritten here. Also this installs 32bit libraries into lib64, since it uses usr/lib instead of the path passed into the function. I guess this is also the reason why ldconfig complains about ifr library

Re: [PR REVIEW] nvidia: fix fbc and ifr libs

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33653#discussion_r735137370

Comment:
Can you mention it in the commit message, then?

Re: [PR PATCH] [Updated] nvidia: fix fbc and ifr libs

[33kk]

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

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

https://github.com/33kk/void-packages nvidia
https://github.com/void-linux/void-packages/pull/33653

nvidia: fix fbc and ifr libs
<!-- 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/33653.patch is attached

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

From 6f67e537cfd50a1d2e9a9c071308ca98312b0c7a Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Wed, 20 Oct 2021 14:24:41 +0300
Subject: [PATCH] nvidia: fix fbc and ifr libs

Remove unnecessary installs, which were overwriting 64bit fbc and ifr libraries with 32bit.
---
 srcpkgs/nvidia/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 6a36471c1079..d792d3123fb6 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=470.74
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -103,10 +103,6 @@ _install_libs() {
 		${DESTDIR}/${libdir}/libnvidia-allocator.so.1
 	ln -sf libnvidia-allocator.so.1 \
 		${DESTDIR}/${libdir}/libnvidia-allocator.so
-
-	# helper libs for approved partners' GRID remote apps
-	vinstall libnvidia-ifr.so.${version} 755 usr/lib
-	vinstall libnvidia-fbc.so.${version} 755 usr/lib
 }
 
 do_extract() {

Re: [PR REVIEW] nvidia: fix fbc and ifr libs

[33kk]

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

New review comment by 33kk on void-packages repository

https://github.com/void-linux/void-packages/pull/33653#discussion_r736758827

Comment:
Done

Re: [PR PATCH] [Updated] nvidia: fix fbc and ifr libs

[33kk]

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

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

https://github.com/33kk/void-packages nvidia
https://github.com/void-linux/void-packages/pull/33653

nvidia: fix fbc and ifr libs
<!-- 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/33653.patch is attached

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

From a9dcafbbc452298320b98b913145e48941c1b0f1 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Wed, 20 Oct 2021 14:24:41 +0300
Subject: [PATCH] nvidia: fix fbc and ifr libs

Remove unnecessary installs, which were overwriting 64bit fbc and ifr libraries with 32bit.
---
 srcpkgs/nvidia/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 6a36471c1079..d792d3123fb6 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=470.74
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -103,10 +103,6 @@ _install_libs() {
 		${DESTDIR}/${libdir}/libnvidia-allocator.so.1
 	ln -sf libnvidia-allocator.so.1 \
 		${DESTDIR}/${libdir}/libnvidia-allocator.so
-
-	# helper libs for approved partners' GRID remote apps
-	vinstall libnvidia-ifr.so.${version} 755 usr/lib
-	vinstall libnvidia-fbc.so.${version} 755 usr/lib
 }
 
 do_extract() {

Re: [PR PATCH] [Updated] nvidia: fix fbc and ifr libs

[33kk]

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

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

https://github.com/33kk/void-packages nvidia
https://github.com/void-linux/void-packages/pull/33653

nvidia: fix fbc and ifr libs
<!-- 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/33653.patch is attached

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

From 97b56843cc9ac381ee75004b3c0727a5bd260835 Mon Sep 17 00:00:00 2001
From: Marko <goncarmarko@gmail.com>
Date: Wed, 20 Oct 2021 14:24:41 +0300
Subject: [PATCH] nvidia: fix fbc and ifr libs

Remove unnecessary installs, which were overwriting 64bit fbc and ifr libraries
with 32bit.
---
 srcpkgs/nvidia/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 6a36471c1079..d792d3123fb6 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=470.74
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -103,10 +103,6 @@ _install_libs() {
 		${DESTDIR}/${libdir}/libnvidia-allocator.so.1
 	ln -sf libnvidia-allocator.so.1 \
 		${DESTDIR}/${libdir}/libnvidia-allocator.so
-
-	# helper libs for approved partners' GRID remote apps
-	vinstall libnvidia-ifr.so.${version} 755 usr/lib
-	vinstall libnvidia-fbc.so.${version} 755 usr/lib
 }
 
 do_extract() {

Re: [PR PATCH] [Merged]: nvidia: fix fbc and ifr libs

[ericonr]

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

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

nvidia: fix fbc and ifr libs
https://github.com/void-linux/void-packages/pull/33653

Description:
<!-- 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
-->