summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot2020-08-11 19:59:01 +0200
committerEmmanuel Gil Peyrot2020-08-11 19:59:01 +0200
commit242a78d6878e95bf362e26dbf0b89e18409ea214 (patch)
treec7c26f883003e18de0a320c4777a33c11ca00434
parent904d8e412e94ce56e1093f053f993e41e6ba3e7b (diff)
downloadaur-242a78d6878e95bf362e26dbf0b89e18409ea214.tar.gz
Add a lib32 package too.
-rw-r--r--.SRCINFO17
-rw-r--r--PKGBUILD36
2 files changed, 40 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a93414a4c7b..3964f33bb74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,13 +7,22 @@ pkgbase = glfw2to3-git
license = ZLIB
makedepends = git
makedepends = meson
+ makedepends = meson-cross-x86-linux-gnu
+ source = git+https://github.com/linkmauve/glfw2to3
+ sha256sums = SKIP
+
+pkgname = glfw2to3-git
depends = glfw
provides = glfw2to3
- provides = glfw2
+ provides = glfw2=2.7.10
conflicts = glfw2to3
conflicts = glfw2
- source = git+https://github.com/linkmauve/glfw2to3
- sha256sums = SKIP
-pkgname = glfw2to3-git
+pkgname = lib32-glfw2to3-git
+ depends = lib32-glfw
+ depends = glfw2to3
+ provides = lib32-glfw2to3
+ provides = lib32-glfw2=2.7.10
+ conflicts = lib32-glfw2to3
+ conflicts = lib32-glfw2
diff --git a/PKGBUILD b/PKGBUILD
index cd19442bcb1..dd9405b8bc2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,13 @@
# Maintainer: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
-pkgname=glfw2to3-git
+pkgname=(glfw2to3-git lib32-glfw2to3-git)
pkgver=2.7.10
pkgrel=1
pkgdesc="Porting library to make GLFW 2.x games run on top of GLFW 3.x"
arch=('x86_64')
url="https://www.glfw.org/"
license=('ZLIB')
-depends=('glfw')
-makedepends=('git' 'meson')
-provides=('glfw2to3' 'glfw2=2.7.10')
-conflicts=('glfw2to3' 'glfw2')
+makedepends=('git' 'meson' 'meson-cross-x86-linux-gnu')
source=("git+https://github.com/linkmauve/glfw2to3")
sha256sums=('SKIP')
@@ -20,14 +17,35 @@ prepare() {
build() {
cd glfw2to3
- arch-meson build
- ninja -C build
+ arch-meson build-x86_64
+ arch-meson build-i686 --cross-file /usr/share/meson/cross/x86-linux-gnu
+ ninja -C build-x86_64
+ ninja -C build-i686
}
-package() {
+package_glfw2to3-git() {
+ depends=('glfw')
+ provides=('glfw2to3' 'glfw2=2.7.10')
+ conflicts=('glfw2to3' 'glfw2')
+
cd glfw2to3
- DESTDIR="$pkgdir"/ ninja -C build install
+ DESTDIR="$pkgdir"/ ninja -C build-x86_64 install
# This would conflict with glfw3.
rm "$pkgdir"/usr/lib/libglfw.so
}
+
+package_lib32-glfw2to3-git() {
+ depends=('lib32-glfw' 'glfw2to3')
+ provides=('lib32-glfw2to3' 'lib32-glfw2=2.7.10')
+ conflicts=('lib32-glfw2to3' 'lib32-glfw2')
+
+ cd glfw2to3
+ DESTDIR="$pkgdir"/ ninja -C build-i686 install
+
+ # This would conflict with glfw3.
+ rm "$pkgdir"/usr/lib32/libglfw.so
+
+ # This would conflict with the x86_64 version.
+ rm "$pkgdir"/usr/include/GL/glfw.h
+}