summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2020-12-02 16:39:01 +0000
committerDaniel Bermond2020-12-02 16:39:01 +0000
commitb7bb17c04fdbfb63050a704c64d104a3ce0db454 (patch)
tree4948dbd8c180906b5d7fe3e23f6a9c8cea0d11aa
parent4ee624b1bc5f1fa42a135643a432eb27ba79150b (diff)
downloadaur-b7bb17c04fdbfb63050a704c64d104a3ce0db454.tar.gz
Fix build
-rw-r--r--.SRCINFO4
-rw-r--r--010-nvidia-vpf-git-fix-install.patch31
-rw-r--r--PKGBUILD7
3 files changed, 20 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4ee75413638..2e82a2e5b1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = nvidia-vpf-git
pkgdesc = NVIDIA Video Processing Framework (git version)
- pkgver = r4.g9630e0d
+ pkgver = r107.g4f2c84c
pkgrel = 1
url = https://github.com/NVIDIA/VideoProcessingFramework/
arch = x86_64
@@ -17,7 +17,7 @@ pkgbase = nvidia-vpf-git
source = git+https://github.com/NVIDIA/VideoProcessingFramework.git
source = 010-nvidia-vpf-git-fix-install.patch
sha256sums = SKIP
- sha256sums = 04931025174a113df620b46a824b6b41437782533a0e9b7ce945f539208b72ae
+ sha256sums = efd9851b0386f5b4e1f0f6f3fe93797861bc2ff77f5d990511882c81f2b42925
pkgname = nvidia-vpf-git
diff --git a/010-nvidia-vpf-git-fix-install.patch b/010-nvidia-vpf-git-fix-install.patch
index 3850c322c8a..cd593f48ae9 100644
--- a/010-nvidia-vpf-git-fix-install.patch
+++ b/010-nvidia-vpf-git-fix-install.patch
@@ -1,26 +1,23 @@
-diff -Naurp a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2019-12-17 16:52:55.000000000 +0000
-+++ b/CMakeLists.txt 2019-12-17 17:30:31.455144875 +0000
-@@ -44,16 +44,10 @@ include_directories(${TC_INC_PATH})
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,16 +44,12 @@ include_directories(${TC_INC_PATH})
include_directories(${VIDEO_CODEC_SDK_INCLUDE_DIR})
#Bring all the stuff together
--install(FILES $<TARGET_FILE:TC_CORE> DESTINATION bin)
--install(FILES $<TARGET_FILE:TC> DESTINATION bin)
+-install(FILES $<TARGET_FILE:TC_CORE> DESTINATION bin)
+-install(FILES $<TARGET_FILE:TC> DESTINATION bin)
+install(FILES $<TARGET_FILE:TC_CORE> DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES $<TARGET_FILE:TC> DESTINATION ${CMAKE_INSTALL_LIBDIR})
if(GENERATE_PYTHON_BINDINGS)
-- install(FILES $<TARGET_FILE:PyNvCodec> DESTINATION bin)
-- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SampleDecode.py DESTINATION bin)
-- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SampleEncode.py DESTINATION bin)
-- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SampleTranscode.py DESTINATION bin)
-- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SampleFrameUpload.py DESTINATION bin)
-- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SampleColorConversion.py DESTINATION bin)
-- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SampleSufraceDownload.py DESTINATION bin)
-- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SampleTranscodeOneToN.py DESTINATION bin)
--endif(GENERATE_PYTHON_BINDINGS)
-\ No newline at end of file
+- install(FILES $<TARGET_FILE:PyNvCodec> DESTINATION bin)
+- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SampleDecode.py DESTINATION bin)
+- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SampleEncode.py DESTINATION bin)
+- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SampleDecodeSw.py DESTINATION bin)
+- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SampleDecodeMultiThread.py DESTINATION bin)
+- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SampleEncodeMultiThread.py DESTINATION bin)
+ find_package(Python COMPONENTS Interpreter Development)
+ install(FILES $<TARGET_FILE:PyNvCodec> DESTINATION ${Python_SITEARCH}/PyNvCodec)
-+endif(GENERATE_PYTHON_BINDINGS)
+ endif(GENERATE_PYTHON_BINDINGS)
+
+ if(GENERATE_PYTORCH_EXTENSION)
diff --git a/PKGBUILD b/PKGBUILD
index 0690ad65e7c..efc8c449c55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=nvidia-vpf-git
-pkgver=r4.g9630e0d
+pkgver=r107.g4f2c84c
pkgrel=1
pkgdesc='NVIDIA Video Processing Framework (git version)'
arch=('x86_64')
@@ -14,7 +14,7 @@ conflicts=('nvidia-vpf')
source=('git+https://github.com/NVIDIA/VideoProcessingFramework.git'
'010-nvidia-vpf-git-fix-install.patch')
sha256sums=('SKIP'
- '04931025174a113df620b46a824b6b41437782533a0e9b7ce945f539208b72ae')
+ 'efd9851b0386f5b4e1f0f6f3fe93797861bc2ff77f5d990511882c81f2b42925')
prepare() {
patch -d VideoProcessingFramework -Np1 -i "${srcdir}/010-nvidia-vpf-git-fix-install.patch"
@@ -27,7 +27,8 @@ pkgver() {
build() {
export CXXFLAGS+=' -I/opt/cuda/include'
- export LDFLAGS+=' -L/opt/cuda/lib'
+ export LDFLAGS+=' -L/opt/cuda/lib64'
+
cmake -B build -S VideoProcessingFramework \
-DCMAKE_BUILD_TYPE:STRING='None' \
-DCMAKE_SKIP_RPATH:BOOL='YES' \