[lilac] updated to 0.13.1-2

2 files changed, 8 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 52a6faf0b8d7..2de0236dc870 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-torchvision
 	pkgdesc = Datasets, transforms, and models specific to computer vision
 	pkgver = 0.13.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/pytorch/vision
 	arch = x86_64
 	license = BSD
diff --git a/PKGBUILD b/PKGBUILD
index 63da4fc93745..ea3f8707022e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ _CUDA_ARCH_LIST="5.2;5.3;6.0;6.1;6.2;7.0;7.2;7.5;8.0;8.6;8.6+PTX"
 pkgname=('python-torchvision' 'python-torchvision-cuda')
 _pkgname=vision
 pkgver=0.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Datasets, transforms, and models specific to computer vision'
 arch=('x86_64')
 url='https://github.com/pytorch/vision'
@@ -47,10 +47,6 @@ sha512sums=('219e787cd04632f480120d6ff74d092f6804beb9543dbc9fc9be6cc0dd0c7271bb9
             '8f97deedab5b0de1154ce7f8486eadcc7556a9cbb01fb44a988729da80b982daafbfe8da32b7f3ced78c1544b3ac696a569c50a6b4cb244f502b07e615b4de10'
             '89f8d4410a238dc52b27200dfb8db9ff1a58777bdfebb346f3d157e16108930dc3b56f18b611f5de1cb081afa6be6768b52e2486cca57703b490194305dc1c67')
 
-get_pyver() {
-  python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
-}
-
 prepare() {
   # fix building with ffmpeg4.4 by manually setup include and lib dir
   # and remove other codes to find ffmpeg exe, as ffmpeg4.4 are only headers and libs without ffmpeg cmd
@@ -67,7 +63,6 @@ prepare() {
 build() {
   cd "${_pkgname}-${pkgver}"
   python setup.py build
-  
   cd "${srcdir}/${_pkgname}-cuda-${pkgver}"
   TORCHVISION_INCLUDE=${srcdir} \
   TORCHVISION_LIBRARY=/usr/lib \
@@ -77,12 +72,15 @@ build() {
 }
 
 check() {
+  local python_version=$(python -c 'import sys; print("".join(map(str, sys.version_info[:2])))')
   # check if VideoReader is build
   # VideoReader depends on ffmpeg
-  PYTHONPATH="${srcdir}/${_pkgname}-${pkgver}/build/lib.linux-${CARCH}-$(get_pyver)" \
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  PYTHONPATH="${PWD}/build/lib.linux-${CARCH}-cpython-${python_version}" \
   python -c "from torchvision.io import VideoReader"
 
-  PYTHONPATH="${srcdir}/${_pkgname}-cuda-${pkgver}/build/lib.linux-${CARCH}-$(get_pyver)" \
+  cd "${srcdir}/${_pkgname}-cuda-${pkgver}"
+  PYTHONPATH="${PWD}/build/lib.linux-${CARCH}-cpython-${python_version}" \
   python -c "from torchvision.io import VideoReader"
 }
 
@@ -99,7 +97,7 @@ package_python-torchvision-cuda() {
   depends+=(python-pytorch-cuda)
   provides+=(python-torchvision=${pkgver})
   conflicts+=(python-torchvision=${pkgver})
-  
+
   cd "${_pkgname}-cuda-${pkgver}"
   TORCHVISION_INCLUDE=${srcdir} \
   TORCHVISION_LIBRARY=/usr/lib \