[lilac] updated to 0.11.3-3

2 files changed, 22 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc623dbcb479..9e6ddd4bc603 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = python-torchvision
 	pkgdesc = Datasets, transforms, and models specific to computer vision
 	pkgver = 0.11.3
-	pkgrel = 1
+	pkgrel = 3
 	url = https://github.com/pytorch/vision
 	arch = x86_64
 	license = BSD
 	makedepends = cuda
-	makedepends = ffmpeg
+	makedepends = ffmpeg4.4
 	makedepends = python-av
 	makedepends = python-pytorch-cuda
 	makedepends = python-setuptools
@@ -16,7 +16,7 @@ pkgbase = python-torchvision
 	depends = python-scipy
 	depends = python-six
 	depends = python-tqdm
-	optdepends = ffmpeg: video reader backend (the recommended one with better performance)
+	optdepends = ffmpeg4.4: video reader backend (the recommended one with better performance)
 	optdepends = python-av: video reader backend (the default one)
 	optdepends = python-pycocotools: support for MS-COCO dataset
 	source = vision-0.11.3.tar.gz::https://github.com/pytorch/vision/archive/v0.11.3.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 4fbab38857f5..fde12dacc3cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,30 +8,30 @@ _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.11.3
-pkgrel=1
+pkgrel=3
 pkgdesc='Datasets, transforms, and models specific to computer vision'
 arch=('x86_64')
 url='https://github.com/pytorch/vision'
 license=('BSD')
 depends=(
-  'python-numpy'
-  'python-pillow'
-  'python-scipy'
-  'python-six'
-  'python-tqdm'
+  python-numpy
+  python-pillow
+  python-scipy
+  python-six
+  python-tqdm
 )
 optdepends=(
-  'ffmpeg: video reader backend (the recommended one with better performance)'
+  'ffmpeg4.4: video reader backend (the recommended one with better performance)'
   'python-av: video reader backend (the default one)'
   'python-pycocotools: support for MS-COCO dataset'
 )
 makedepends=(
-  'cuda'
-  'ffmpeg'
-  'python-av'
-  'python-pytorch-cuda'
-  'python-setuptools'
-  'qt5-base'
+  cuda
+  ffmpeg4.4
+  python-av
+  python-pytorch-cuda
+  python-setuptools
+  qt5-base
 )
 source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/pytorch/vision/archive/v${pkgver}.tar.gz")
 sha512sums=('4b712a52d5b72988277c9e9777b2b962cab1ce68edae0610b0fa44426d719e1ebf6dbdf78d0fda525b9f00f0b6ca8bb6d13fa43dfe6a3b46b29fd4a01606e2a1')
@@ -41,11 +41,14 @@ get_pyver() {
 }
 
 prepare() {
+  # fix building with ffmpeg4.4
+  sed -i "s#ffmpeg_include_dir = os.path.join(ffmpeg_root, 'include')#ffmpeg_include_dir = os.path.join(ffmpeg_root, 'include', 'ffmpeg4.4')#" "${srcdir}/${_pkgname}-${pkgver}/setup.py"
+  sed -i "s#ffmpeg_library_dir = os.path.join(ffmpeg_root, 'lib')#ffmpeg_library_dir = os.path.join(ffmpeg_root, 'lib', 'ffmpeg4.4')#" "${srcdir}/${_pkgname}-${pkgver}/setup.py"
   cp -a "${srcdir}/${_pkgname}-${pkgver}" "${srcdir}/${_pkgname}-cuda-${pkgver}"
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${_pkgname}-${pkgver}"
   python setup.py build
   
   cd "${srcdir}/${_pkgname}-cuda-${pkgver}"
@@ -57,7 +60,7 @@ build() {
 package_python-torchvision() {
   depends+=(python-pytorch)
 
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${_pkgname}-${pkgver}"
   python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
   install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
@@ -68,7 +71,7 @@ package_python-torchvision-cuda() {
   provides+=(python-torchvision=${pkgver})
   conflicts+=(python-torchvision=${pkgver})
   
-  cd "${srcdir}/${_pkgname}-cuda-${pkgver}"
+  cd "${_pkgname}-cuda-${pkgver}"
   FORCE_CUDA=1 \
   TORCH_CUDA_ARCH_LIST=${_CUDA_ARCH_LIST} \
   python setup.py install --root="${pkgdir}" --optimize=1 --skip-build