summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov2021-02-11 15:16:01 +0000
committerEmil Velikov2021-02-11 15:22:17 +0000
commit7f81708e67c260075af8b3a77a6659b6710ae418 (patch)
tree60f31495ec5e7d208ad4d5048c975a00be58de31
parent392a52678beb3e37c42ca6726f8f38ea2bb15ab8 (diff)
downloadaur-7f81708e67c260075af8b3a77a6659b6710ae418.tar.gz
lib32-waffle 1.6.1-2: switch to the meson build
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD32
2 files changed, 16 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e9cb906bb4ed..974df5bfb224 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
pkgbase = lib32-waffle
pkgdesc = a library for choosing window system and OpenGL API at runtime (32 bits)
pkgver = 1.6.1
- pkgrel = 1
+ pkgrel = 2
url = http://www.waffle-gl.org
arch = x86_64
license = BSD
- makedepends = cmake
+ makedepends = meson
makedepends = xcb-proto
makedepends = lib32-mesa-libgl
makedepends = lib32-mesa
diff --git a/PKGBUILD b/PKGBUILD
index fe9ca366c46e..254c8298fce7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,42 +6,38 @@
_pkgbasename=waffle
pkgname=lib32-${_pkgbasename}
pkgver=1.6.1
-pkgrel=1
+pkgrel=2
pkgdesc='a library for choosing window system and OpenGL API at runtime (32 bits)'
arch=('x86_64')
url='http://www.waffle-gl.org'
license=('BSD')
depends=('lib32-libx11' 'lib32-libxcb' 'lib32-wayland' "${_pkgbasename}=${pkgver}")
-makedepends=('cmake' 'xcb-proto' 'lib32-mesa-libgl' 'lib32-mesa' 'gcc-multilib')
+makedepends=('meson' 'xcb-proto' 'lib32-mesa-libgl' 'lib32-mesa' 'gcc-multilib')
source=(https://mesa.pages.freedesktop.org/waffle/files/release/waffle-${pkgver}/waffle-${pkgver}.tar.xz{,.asc})
sha256sums=('31565649ff0e2d8dff1b8f7f2264ab7a78452063c7e04adfc4ce03e64b655080'
'SKIP')
build() {
- cd "$srcdir/${_pkgbasename}-$pkgver"
-
export CC='gcc -m32'
export CXX='g++ -m32'
export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
- -DCMAKE_BUILD_TYPE=Release \
- -Dwaffle_has_gbm=1 \
- -Dwaffle_has_glx=1 \
- -Dwaffle_has_x11_egl=1 \
- -Dwaffle_has_wayland=1 \
- -Dwaffle_build_manpages=0 \
- -Dwaffle_build_htmldocs=0 \
- -Dwaffle_build_examples=0
- make
+ arch-meson "${_pkgbasename}-$pkgver" build \
+ --libdir=/usr/lib32 \
+ -D gbm=enabled \
+ -D glx=enabled \
+ -D x11_egl=enabled \
+ -D wayland=enabled \
+ -D build-manpages=false \
+ -D build-htmldocs=false \
+ -D build-examples=false
+
+ ninja -C build
}
package() {
- cd "$srcdir/${_pkgbasename}-$pkgver"
- make DESTDIR="$pkgdir/" install
+ DESTDIR="$pkgdir" ninja -C build install
mv "$pkgdir/usr/bin/wflinfo" "$pkgdir/usr/bin/wflinfo32"
rm -rf "$pkgdir/usr/include"