scons

2 files changed, 17 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3217cf136569..22c728a25d1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,8 +7,6 @@ pkgbase = mingw-w64-mesa
 	license = custom
 	makedepends = mingw-w64-gcc
 	makedepends = scons
-	makedepends = python2-mako
-	makedepends = mingw-w64-meson
 	depends = mingw-w64-dlfcn
 	options = staticlibs
 	options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index d96266cce956..dc200306668b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgdesc="An open-source implementation of the OpenGL specification (mingw-w64)"
 arch=('any')
 url="https://www.mesa3d.org/"
 license=("custom")
-makedepends=('mingw-w64-gcc' 'scons' 'python2-mako' 'mingw-w64-meson')
+makedepends=('mingw-w64-gcc' 'scons')
 depends=('mingw-w64-dlfcn')
 options=('staticlibs' '!strip' '!buildflags')
 validpgpkeys=('71C4B75620BC75708B4BDB254C95FAAB3EB073EC') # Dylan Baker <dylan@pnwbakers.com>
@@ -14,29 +14,30 @@ sha256sums=('1a2edc3ce56906a676c91e6851298db45903df1f5cb9827395a922c1452db802' S
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
-prepare () {
-  cd "${srcdir}"/mesa-${pkgver}
-  # os_memory_stdc.h:58:7: error: implicit declaration of function ‘posix_memalign’
-  sed -i "s|'mkostemp', 'posix_memalign'|'mkostemp'|g" meson.build
-}
-
-
 build() {
   cd "${srcdir}"/mesa-${pkgver}
   for _arch in ${_architectures}; do
-    mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-meson -Dplatforms=surfaceless -Dglx=disabled -Dllvm=false --includedir=/usr/${_arch}/include/mesa ..
-    ninja
-    popd
+    if test "${_arch}" = x86_64-w64-mingw32
+    then
+      machine="x86_64"
+    else
+      machine="x86"
+    fi
+    scons platform=windows toolchain=crossmingw machine=${machine} build=release libgl-gdi
   done
 }
 
 package() {
+  cd "${srcdir}"/mesa-${pkgver}
   for _arch in ${_architectures}; do
-    cd "${srcdir}/mesa-${pkgver}/build-${_arch}"
-    DESTDIR="${pkgdir}" ninja install
-    rm -r "$pkgdir/usr/${_arch}/share"
+    if test "${_arch}" = x86_64-w64-mingw32
+    then
+      machine="x86_64"
+    else
+      machine="x86"
+    fi
+    install -d "$pkgdir"/usr/${_arch}/bin
+    install -m755 build/windows-${machine}/gallium/targets/libgl-gdi/opengl32.dll "$pkgdir"/usr/${_arch}/bin
     ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
-    ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
   done
 }