build: Fix nvlax compilation

3 files changed, 34 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f64fb0d1ba7f..7e4dcc070afa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nvidia-utils-beta-nvlax
 	pkgdesc = NVIDIA drivers utilities (beta version) with NVENC and NvFBC patched with nvlax
 	pkgver = 510.47.03
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/illnyang/nvlax/
 	install = nvidia-utils-beta.install
 	arch = x86_64
@@ -31,10 +31,12 @@ pkgbase = nvidia-utils-beta-nvlax
 	source = nvidia.rules
 	source = NVIDIA-Linux-x86_64-510.47.03.run::https://us.download.nvidia.com/XFree86/Linux-x86_64/510.47.03/NVIDIA-Linux-x86_64-510.47.03.run
 	source = nvlax::git+https://github.com/illnyang/nvlax.git#commit=b3699ad40c4dfbb9d46c53325d63ae8bf4a94d7f
+	source = nvlax_cpm.patch
 	sha512sums = de7116c09f282a27920a1382df84aa86f559e537664bb30689605177ce37dc5067748acf9afd66a3269a6e323461356592fdfc624c86523bf105ff8fe47d3770
 	sha512sums = 4b3ad73f5076ba90fe0b3a2e712ac9cde76f469cd8070280f960c3ce7dc502d1927f525ae18d008075c8f08ea432f7be0a6c3a7a6b49c361126dcf42f97ec499
 	sha512sums = a0ceb0a6c240cf97b21a2e46c5c212250d3ee24fecef16aca3dffb04b8350c445b9f4398274abccdb745dd0ba5132a17942c9508ce165d4f97f41ece02b0b989
 	sha512sums = 7488b1ae99acfa4cd6f8fd071a0e7652dcc9e499ff587d1dfdaf5d202a5b9daa43ed014876d2b2c9caf7f7c531ec380540f30833bb9790395cf159d177f2e803
 	sha512sums = SKIP
+	sha512sums = 3188b66c6a158ac97a9200ce96d8ada5da2f39eb6eae19e710e7c0d7e3d1b9189beb92c1446fa4b0aa937d2b0c08a2fc9a3b4b3f821566a4e629478addf9d098
 
 pkgname = nvidia-utils-beta-nvlax
diff --git a/PKGBUILD b/PKGBUILD
index 48639098fad3..ef8e51974dd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=nvidia-utils-beta
 pkgname=${_pkgname}-nvlax
 pkgver=510.47.03
-pkgrel=3
+pkgrel=4
 pkgdesc="NVIDIA drivers utilities (beta version) with NVENC and NvFBC patched with nvlax"
 arch=('x86_64')
 license=('custom')
@@ -40,6 +40,7 @@ source=(
   "nvidia.rules"
   "${_pkg}.run::https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
   "nvlax::git+https://github.com/illnyang/nvlax.git#commit=b3699ad40c4dfbb9d46c53325d63ae8bf4a94d7f"
+  "nvlax_cpm.patch"
 )
 sha512sums=(
   "de7116c09f282a27920a1382df84aa86f559e537664bb30689605177ce37dc5067748acf9afd66a3269a6e323461356592fdfc624c86523bf105ff8fe47d3770"
@@ -47,6 +48,7 @@ sha512sums=(
   "a0ceb0a6c240cf97b21a2e46c5c212250d3ee24fecef16aca3dffb04b8350c445b9f4398274abccdb745dd0ba5132a17942c9508ce165d4f97f41ece02b0b989"
   "7488b1ae99acfa4cd6f8fd071a0e7652dcc9e499ff587d1dfdaf5d202a5b9daa43ed014876d2b2c9caf7f7c531ec380540f30833bb9790395cf159d177f2e803"
   "SKIP"
+  "3188b66c6a158ac97a9200ce96d8ada5da2f39eb6eae19e710e7c0d7e3d1b9189beb92c1446fa4b0aa937d2b0c08a2fc9a3b4b3f821566a4e629478addf9d098"
 )
 
 create_links() {
@@ -65,7 +67,7 @@ prepare() {
   bsdtar -xf nvidia-persistenced-init.tar.bz2
 
   cd "$srcdir"/nvlax
-  sed -i 's/zydis#master/zydis#55dd08c210722aed81b38132f5fd4a04ec1943b5/g' CMakeLists.txt
+  patch -Np1 < "$srcdir"/nvlax_cpm.patch
 }
 
 build() {
diff --git a/nvlax_cpm.patch b/nvlax_cpm.patch
new file mode 100644
index 000000000000..d86d3beb6ee8
--- /dev/null
+++ b/nvlax_cpm.patch
@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5fa8620..ee2f230 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,11 +16,11 @@ project(nvlax CXX)
+ include(ExternalProject)
+ include(cmake/FetchCPM.cmake)
+ 
+-CPMAddPackage("gh:zyantific/zydis#master")
++CPMAddPackage("gh:zyantific/zydis#55dd08c210722aed81b38132f5fd4a04ec1943b5")
+ 
+ CPMAddPackage(
+         NAME LIEF_SRC
+-        GIT_TAG master
++        GIT_TAG b65e7cca03ec4cd91f1d7125e717d01635ea81ba
+         GITHUB_REPOSITORY lief-project/LIEF
+         DOWNLOAD_ONLY YES
+ )
+@@ -59,7 +59,7 @@ message(STATUS "LIEF library: ${LIEF_LIBRARIES}")
+ 
+ CPMAddPackage(
+         NAME PPK_ASSERT
+-        GIT_TAG master
++        GIT_TAG 833b8b7ea49aea540a49f07ad08bf0bae1faac32
+         GITHUB_REPOSITORY gpakosz/PPK_ASSERT
+         DOWNLOAD_ONLY YES
+ )