diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 30 | ||||
-rw-r--r-- | mingw.patch | 29 |
3 files changed, 54 insertions, 11 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-piglit-git pkgdesc = OpenGL implementation testing suite. Provides a simple means to perform regression tests. (mingw-w64) - pkgver = r11172.59e695c16 + pkgver = r11338.6a4be9e99 pkgrel = 1 url = http://piglit.freedesktop.org/ arch = any @@ -10,6 +10,7 @@ pkgbase = mingw-w64-piglit-git makedepends = git makedepends = mingw-w64-cmake depends = mingw-w64-freeglut + depends = mingw-w64-waffle depends = python-mako depends = python-numpy provides = mingw-w64-piglit @@ -18,7 +19,8 @@ pkgbase = mingw-w64-piglit-git options = !buildflags options = staticlibs source = git+https://gitlab.freedesktop.org/mesa/piglit.git + source = mingw.patch + sha256sums = SKIP sha256sums = SKIP pkgname = mingw-w64-piglit-git - @@ -1,17 +1,17 @@ pkgname=mingw-w64-piglit-git -pkgver=r11172.59e695c16 +pkgver=r11338.6a4be9e99 pkgrel=1 pkgdesc="OpenGL implementation testing suite. Provides a simple means to perform regression tests. (mingw-w64)" arch=('any') url="http://piglit.freedesktop.org/" license=('GPL2' 'GPL3' 'LGPL2.1') -depends=('mingw-w64-freeglut' 'python-mako' 'python-numpy') +depends=('mingw-w64-freeglut' 'mingw-w64-waffle' 'python-mako' 'python-numpy') makedepends=('git' 'mingw-w64-cmake') provides=('mingw-w64-piglit') conflicts=('mingw-w64-piglit') options=('!strip' '!buildflags' 'staticlibs') -source=("git+https://gitlab.freedesktop.org/mesa/piglit.git") -sha256sums=('SKIP') +source=("git+https://gitlab.freedesktop.org/mesa/piglit.git" mingw.patch) +sha256sums=('SKIP' 'SKIP') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" @@ -20,22 +20,34 @@ pkgver() { printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } -build() { +prepare () { cd "${srcdir}/piglit" + patch -p1 -i "${srcdir}"/mingw.patch +} + +build() { for _arch in ${_architectures}; do - mkdir -p build-${_arch} && pushd build-${_arch} + rm -rf "${srcdir}/build-${_arch}" + cp -r "${srcdir}/piglit" "${srcdir}/build-${_arch}" + cd "${srcdir}/build-${_arch}" ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release \ -DGLUT_glut_LIBRARY_RELEASE=/usr/${_arch}/lib/libfreeglut.dll.a \ -DGLUT_glut_LIBRARY=/usr/${_arch}/lib/libfreeglut.dll.a \ - .. + . make - popd + done +} + +check() { + for _arch in ${_architectures}; do + cd "${srcdir}/build-${_arch}" + PIGLIT_EMULATOR="${_arch}-wine" PIGLIT_WFLINFO_EXECUTABLE="/usr/${_arch}/bin/wflinfo.exe" ./piglit run -p wgl sanity results/sanity done } package() { for _arch in ${_architectures}; do - cd "${srcdir}/piglit/build-${_arch}" + cd "${srcdir}/build-${_arch}" make DESTDIR="${pkgdir}" install rm -r "$pkgdir"/usr/${_arch}/share ${_arch}-strip "$pkgdir"/usr/${_arch}/lib/piglit/bin/*.exe diff --git a/mingw.patch b/mingw.patch new file mode 100644 index 000000000000..e36bfb474866 --- /dev/null +++ b/mingw.patch @@ -0,0 +1,29 @@ +diff --git a/framework/test/base.py b/framework/test/base.py +index 69e8178ae..6a7c81f25 100644 +--- a/framework/test/base.py ++++ b/framework/test/base.py +@@ -381,6 +381,10 @@ class ValgrindMixin(object): + @Test.command.getter + def command(self): + command = super(ValgrindMixin, self).command ++ ++ if 'PIGLIT_EMULATOR' in os.environ: ++ command = [os.environ['PIGLIT_EMULATOR']] + command ++ + if OPTIONS.valgrind: + return ['valgrind', '--quiet', '--error-exitcode=1', + '--tool=memcheck'] + command +diff --git a/framework/wflinfo.py b/framework/wflinfo.py +index eaaa57d4d..7c43eaae7 100644 +--- a/framework/wflinfo.py ++++ b/framework/wflinfo.py +@@ -106,6 +106,9 @@ class WflInfo(object): + else: + bin = 'wflinfo' + ++ if 'PIGLIT_WFLINFO_EXECUTABLE' in os.environ: ++ bin = os.environ['PIGLIT_WFLINFO_EXECUTABLE'] ++ + cmd = [bin, '--platform', platform] + opts + + # setup execution environment where we extend the PATH env var |