Skip to content

Commit

Permalink
nvidia-470xx-utils: Add patch for compatibility with the upcoming 6.12
Browse files Browse the repository at this point in the history
Signed-off-by: Vasiliy Stelmachenok <[email protected]>
  • Loading branch information
ventureoo committed Nov 17, 2024
1 parent 0c6ebef commit 8a5bb61
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
4 changes: 3 additions & 1 deletion nvidia/nvidia-470xx-utils/.SRCINFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgbase = nvidia-470xx-utils
pkgver = 470.256.02
pkgrel = 7
pkgrel = 8
url = http://www.nvidia.com/
arch = x86_64
license = custom
Expand All @@ -12,6 +12,7 @@ pkgbase = nvidia-470xx-utils
source = systemd-suspend-override.conf
source = https://us.download.nvidia.com/XFree86/Linux-x86_64/470.256.02/NVIDIA-Linux-x86_64-470.256.02.run
source = kernel-6.10.patch
source = kernel-6.12.patch
source = 0001-Fix-conftest-to-ignore-implicit-function-declaration.patch
source = 0002-Fix-conftest-to-use-a-short-wchar_t.patch
source = 0003-Fix-conftest-to-use-nv_drm_gem_vmap-which-has-the-se.patch
Expand All @@ -23,6 +24,7 @@ pkgbase = nvidia-470xx-utils
sha512sums = 55def6319f6abb1a4ccd28a89cd60f1933d155c10ba775b8dfa60a2dc5696b4b472c14b252dc0891f956e70264be87c3d5d4271e929a4fc4b1a68a6902814cee
sha512sums = a837946dd24d7945c1962a695f1f31965f3ceb6927f52cd08fd51b8db138b7a888bbeab69243f5c8468a7bd7ccd47f5dbdb48a1ca81264866c1ebb7d88628f88
sha512sums = 4ab58f1eb2d48c4d24c86a120dfd0989da0f56fd5f85dad0c7960fabe9e19ac1d594775d3d4a3044ac6ceb9425cd7c840320503aa01252574ed12ce62445796e
sha512sums = ef84759e29869c0663b7a026d62d53196575eb633fa7a80935bcd8f1e64da94ef1a386facca313c36f306f591de094c4e36f42e453c0e9421755df68f18ae1f0
sha512sums = b4dc0282a431dfde2bcbd1f3a13eccd9d34c71fccb803f3ddf739b570ac6e129178f6eed370f78529f7757b405668fbd29d36aa530c9d0fc79eb19092725bcd7
sha512sums = dbdd609247740079446faf38482c7c14c03fbd71f816812d26c803b2619de7b7d7f034048fc8f662c5b864dd43b8e75aa7c09a837b31dd08655e6622f00ee1e3
sha512sums = e1371e2ed622d642b0242a2be34438fae97fa33ef42afc1e7897177c10dc8831f20b9a8b37d25d9dc079743df03b10221decfb23577650233af8981a4ffb813c
Expand Down
16 changes: 5 additions & 11 deletions nvidia/nvidia-470xx-utils/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
pkgbase=nvidia-470xx-utils
pkgname=('nvidia-470xx-utils' 'opencl-nvidia-470xx' 'nvidia-470xx-dkms')
pkgver=470.256.02
pkgrel=7
pkgrel=8
arch=('x86_64')
url="http://www.nvidia.com/"
license=('custom')
Expand All @@ -24,6 +24,7 @@ source=(
'systemd-suspend-override.conf'
"https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
"kernel-6.10.patch"
"kernel-6.12.patch"
"0001-Fix-conftest-to-ignore-implicit-function-declaration.patch"
"0002-Fix-conftest-to-use-a-short-wchar_t.patch"
"0003-Fix-conftest-to-use-nv_drm_gem_vmap-which-has-the-se.patch"
Expand All @@ -38,6 +39,7 @@ sha512sums=(
'55def6319f6abb1a4ccd28a89cd60f1933d155c10ba775b8dfa60a2dc5696b4b472c14b252dc0891f956e70264be87c3d5d4271e929a4fc4b1a68a6902814cee'
'a837946dd24d7945c1962a695f1f31965f3ceb6927f52cd08fd51b8db138b7a888bbeab69243f5c8468a7bd7ccd47f5dbdb48a1ca81264866c1ebb7d88628f88'
'4ab58f1eb2d48c4d24c86a120dfd0989da0f56fd5f85dad0c7960fabe9e19ac1d594775d3d4a3044ac6ceb9425cd7c840320503aa01252574ed12ce62445796e'
'ef84759e29869c0663b7a026d62d53196575eb633fa7a80935bcd8f1e64da94ef1a386facca313c36f306f591de094c4e36f42e453c0e9421755df68f18ae1f0'
'b4dc0282a431dfde2bcbd1f3a13eccd9d34c71fccb803f3ddf739b570ac6e129178f6eed370f78529f7757b405668fbd29d36aa530c9d0fc79eb19092725bcd7'
'dbdd609247740079446faf38482c7c14c03fbd71f816812d26c803b2619de7b7d7f034048fc8f662c5b864dd43b8e75aa7c09a837b31dd08655e6622f00ee1e3'
'e1371e2ed622d642b0242a2be34438fae97fa33ef42afc1e7897177c10dc8831f20b9a8b37d25d9dc079743df03b10221decfb23577650233af8981a4ffb813c'
Expand Down Expand Up @@ -69,11 +71,9 @@ prepare() {
patch -p1 -i "${srcdir}/0002-Fix-conftest-to-use-a-short-wchar_t.patch"
patch -p1 -i "${srcdir}/0003-Fix-conftest-to-use-nv_drm_gem_vmap-which-has-the-se.patch"

# patch -p1 -i "${srcdir}/kernel-6.1.76_6.6.15_6.7.3.patch"
# patch -p1 -i "${srcdir}/kernel-6.4.patch"
# patch -p1 -i "${srcdir}/kernel-6.5.patch"
# patch -p1 -i "${srcdir}/kernel-6.6.patch"
# Compatibility with new kernels
patch -p1 -i "${srcdir}/kernel-6.10.patch"
patch -p1 -i "${srcdir}/kernel-6.12.patch"

sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
sed -i 's/__JOBS/`nproc`/' dkms.conf
Expand Down Expand Up @@ -145,12 +145,6 @@ package_nvidia-470xx-utils() {
# X driver
install -D nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so"

# Wayland/GBM
#install -Dm755 libnvidia-egl-gbm.so.1* -t "${pkgdir}/usr/lib/"
#install -Dm644 15_nvidia_gbm.json "${pkgdir}/usr/share/egl/egl_external_platform.d/15_nvidia_gbm.json"
#mkdir -p "${pkgdir}/usr/lib/gbm"
#ln -sr "${pkgdir}/usr/lib/libnvidia-allocator.so.${pkgver}" "${pkgdir}/usr/lib/gbm/nvidia-drm_gbm.so"

# firmware
install -Dm644 firmware/gsp.bin "${pkgdir}/usr/lib/firmware/nvidia/${pkgver}/gsp.bin"

Expand Down

0 comments on commit 8a5bb61

Please sign in to comment.