Fix build. Remove unneeded file from /usr/bin.

3 files changed, 42 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 517e8ecfc1a2..10bcb90c49bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nvidia-vpf-git
 	pkgdesc = NVIDIA Video Processing Framework (git version)
-	pkgver = 1.1.r14.g5e951e4
+	pkgver = 1.1.1.r1.g869316d
 	pkgrel = 1
 	url = https://github.com/NVIDIA/VideoProcessingFramework/
 	arch = x86_64
@@ -18,6 +18,8 @@ pkgbase = nvidia-vpf-git
 	conflicts = nvidia-vpf
 	options = !emptydirs
 	source = git+https://github.com/NVIDIA/VideoProcessingFramework.git
+	source = 010-nvidia-vpf-fix-pytorch-extension.patch
 	sha256sums = SKIP
+	sha256sums = 65630bb49c2180c0c8a42baf56d5ca3af502c32cd49e83dabff3b54abfd870eb
 
 pkgname = nvidia-vpf-git
diff --git a/010-nvidia-vpf-fix-pytorch-extension.patch b/010-nvidia-vpf-fix-pytorch-extension.patch
new file mode 100644
index 000000000000..60bac06ca1c4
--- /dev/null
+++ b/010-nvidia-vpf-fix-pytorch-extension.patch
@@ -0,0 +1,28 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,11 +68,17 @@ if(GENERATE_PYTORCH_EXTENSION)
+ 	#Extension will be built using torch.utils.cpp_extension;
+ 	#So we just launch python script;
+ 	add_custom_command(	OUTPUT Pytorch_Nv_Codec
+-						COMMAND cd ${PYTORCH_EXTENSION_SOURCES_DIR} && python setup.py build --build-lib="${CMAKE_INSTALL_PREFIX}")
++						COMMAND cd ${PYTORCH_EXTENSION_SOURCES_DIR} && python setup.py build --build-lib="${CMAKE_CURRENT_BINARY_DIR}/PytorchNvCodec")
+ 
+ 	add_custom_target(	PytorchNvCodec
+ 						DEPENDS Pytorch_Nv_Codec)
+ 	add_dependencies(PyNvCodec PytorchNvCodec)
++	
++	find_package(Python 3.4 COMPONENTS Interpreter REQUIRED)
++	execute_process(COMMAND ${Python_EXECUTABLE} -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))"
++					OUTPUT_VARIABLE PYTHON_EXTENSION_SUFFIX
++					OUTPUT_STRIP_TRAILING_WHITESPACE)
++	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PytorchNvCodec/PytorchNvCodec${PYTHON_EXTENSION_SUFFIX} DESTINATION bin)
+ endif(GENERATE_PYTORCH_EXTENSION)
+ 
+ if(ENABLE_TESTS)
+@@ -83,4 +89,4 @@ if(ENABLE_TESTS)
+ 	foreach(TEST_ASSET ${TEST_ASSETS})
+ 		install(FILES ${TEST_ASSET} DESTINATION bin)
+ 	endforeach()
+-endif(ENABLE_TESTS)
+\ No newline at end of file
++endif(ENABLE_TESTS)
diff --git a/PKGBUILD b/PKGBUILD
index ce34bbf62ab4..07458ef66285 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=nvidia-vpf-git
-pkgver=1.1.r14.g5e951e4
+pkgver=1.1.1.r1.g869316d
 pkgrel=1
 pkgdesc='NVIDIA Video Processing Framework (git version)'
 arch=('x86_64')
@@ -12,11 +12,17 @@ makedepends=('git' 'cmake' 'nvidia-sdk' 'python-setuptools')
 provides=('nvidia-vpf')
 conflicts=('nvidia-vpf')
 options=('!emptydirs')
-source=('git+https://github.com/NVIDIA/VideoProcessingFramework.git')
-sha256sums=('SKIP')
+source=('git+https://github.com/NVIDIA/VideoProcessingFramework.git'
+        '010-nvidia-vpf-fix-pytorch-extension.patch')
+sha256sums=('SKIP'
+            '65630bb49c2180c0c8a42baf56d5ca3af502c32cd49e83dabff3b54abfd870eb')
+
+prepare() {
+    patch -d VideoProcessingFramework -Np1 -i "${srcdir}/010-nvidia-vpf-fix-pytorch-extension.patch"
+}
 
 pkgver() {
-    git -C VideoProcessingFramework describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
+    git -C VideoProcessingFramework describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^ver_//'
 }
 
 build() {
@@ -44,5 +50,6 @@ package() {
     mv "${pkgdir}/usr/bin"/Py{,torch}NvCodec"$(python-config --extension-suffix)" "${pkgdir}${_sitepkg}"
     mv "${pkgdir}/usr/bin"/*.so* "${pkgdir}/usr/lib"
     mv "${pkgdir}/usr/bin"/*.py "${pkgdir}/usr/share/nvidia-vpf/samples"
+    rm "${pkgdir}/usr/bin"/*.mp4
     chmod a+x "${pkgdir}/usr/share/nvidia-vpf/samples"/*.py
 }