Merge pull request #10196 from jeremyd2019/vapoursynth-clang32

vapoursynth: fix clang32 build
This commit is contained in:
jeremyd2019
2021-11-27 19:00:46 -08:00
committed by GitHub
2 changed files with 19 additions and 3 deletions

View File

@@ -0,0 +1,13 @@
--- a/src/core/expr/jitasm.h
+++ b/src/core/expr/jitasm.h
@@ -8609,8 +8609,8 @@
#else
if (val_.IsMem()) {
// from memory
- Mem32 lo(val_.GetAddressBaseSize(), val_.GetBase(), val_.GetIndex(), val_.GetScale(), val_.GetDisp());
- Mem32 hi(val_.GetAddressBaseSize(), val_.GetBase(), val_.GetIndex(), val_.GetScale(), val_.GetDisp() + 4);
+ Mem32 lo(val_.GetAddressBaseSize(), val_.GetAddressIndexSize(), val_.GetBase(), val_.GetIndex(), val_.GetScale(), val_.GetDisp());
+ Mem32 hi(val_.GetAddressBaseSize(), val_.GetAddressIndexSize(), val_.GetBase(), val_.GetIndex(), val_.GetScale(), val_.GetDisp() + 4);
f.mov(f.eax, lo);
f.mov(f.edx, hi);
} else if (val_.IsImm()) {

View File

@@ -4,7 +4,7 @@ _realname=vapoursynth
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=57
pkgrel=1
pkgrel=2
pkgdesc="A video processing framework with simplicity in mind (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -18,11 +18,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-pkgconf"
"${MINGW_PACKAGE_PREFIX}-python-sphinx")
options=(!strip staticlibs)
source=("vapoursynth-${pkgver}.tar.gz::https://github.com/vapoursynth/vapoursynth/archive/R${pkgver}.tar.gz")
sha256sums=('9bed2ab1823050cfcbdbb1a57414e39507fd6c73f07ee4b5986fcbf0f6cb2d07')
source=("vapoursynth-${pkgver}.tar.gz::https://github.com/vapoursynth/vapoursynth/archive/R${pkgver}.tar.gz"
"0001-wrong-arguments-to-Mem32-constructor.patch")
sha256sums=('9bed2ab1823050cfcbdbb1a57414e39507fd6c73f07ee4b5986fcbf0f6cb2d07'
'085331d7c81da760b66864ec34647094384514689e7ea9895e7bd34ed9ce9831')
prepare() {
cd "${srcdir}/${_realname}-R${pkgver}"
patch -Nbp1 -i "${srcdir}/0001-wrong-arguments-to-Mem32-constructor.patch"
autoreconf -vfi
}