summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO37
-rw-r--r--PKGBUILD75
2 files changed, 76 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d0e280fffc4..cbd732c0b9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,37 @@
-pkgbase = glfw3-git
- pkgdesc = A free, open source, portable framework for OpenGL application development. (git version)
- pkgver = 3.1.1.r87.g08b3af4
+pkgbase = glfw-git
+ pkgver = 3.1.1.r119.g0f3b69c
pkgrel = 1
url = http://www.glfw.org/
- arch = any
+ arch = i686
+ arch = x86_64
+ arch = armv7h
license = custom:ZLIB
makedepends = cmake
makedepends = git
- depends = libxi
- depends = libgl
- depends = libxrandr
+ makedepends = libxi
+ makedepends = libxrandr
+ makedepends = libxinerama
+ makedepends = libxcursor
+ makedepends = wayland
+ makedepends = libxkbcommon
+ makedepends = libgl
+ optdepends = doxygen: build glfw html documentation
+ provides = glfw=3.2
conflicts = glfw
- source = glfw::git+https://github.com/glfw/glfw.git#branch=master
+ source = glfw::git+https://github.com/glfw/glfw
md5sums = SKIP
-pkgname = glfw3-git
+pkgname = glfw-x11-git
+ pkgdesc = A free, open source, portable framework for OpenGL application development. (git, X11 version)
+ depends = libxi
+ depends = libxrandr
+ depends = libxinerama
+ depends = libxcursor
+ depends = libgl
+
+pkgname = glfw-wayland-git
+ pkgdesc = A free, open source, portable framework for OpenGL application development. (git, Wayland version)
+ depends = wayland
+ depends = libxkbcommon
+ depends = libgl
diff --git a/PKGBUILD b/PKGBUILD
index 873933784b6..f0075aa92c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,64 @@
# Contributor: Axper Jan <483ken _at_ gmail _dot_ com
# Contributor: Daniel Kirchner <ekpyron at lavabit dot com>
+# Contributor: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
# Maintainer: Ricardo Vieira <ricardo.vieira@tecnico.ulisboa.pt>
-_pkgname=glfw
-pkgname=glfw3-git
-pkgver=3.1.1.r87.g08b3af4
+
+_pkgbase=glfw
+pkgbase="$_pkgbase-git"
+pkgname=("$_pkgbase-x11-git" "$_pkgbase-wayland-git")
+pkgver=3.1.1.r119.g0f3b69c
pkgrel=1
-pkgdesc="A free, open source, portable framework for OpenGL application development. (git version)"
-arch=('any')
+arch=('i686' 'x86_64' 'armv7h')
url="http://www.glfw.org/"
license=('custom:ZLIB')
-depends=('libxi' 'libgl' 'libxrandr')
-optionaldepends=('doxygen: build glfw html documentation')
-makedepends=('cmake' 'git')
-conflicts=('glfw')
-source=("$_pkgname"::'git+https://github.com/glfw/glfw.git#branch=master')
+optdepends=('doxygen: build glfw html documentation')
+makedepends=('cmake' 'git' 'libxi' 'libxrandr' 'libxinerama' 'libxcursor' 'wayland' 'libxkbcommon' 'libgl')
+conflicts=("$_pkgbase")
+provides=("$_pkgbase=3.2")
+source=("$_pkgbase::git+https://github.com/glfw/glfw")
md5sums=('SKIP')
pkgver() {
- cd "$srcdir/$_pkgname"
- git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
+ cd "$srcdir/$_pkgbase"
+ git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
}
-build() {
- cd "$srcdir/$_pkgname"
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_SHARED_LIBS=ON \
- -DGLFW_BUILD_EXAMPLES=OFF \
- -DGLFW_BUILD_TESTS=OFF \
- -DGLFW_USE_WAYLAND=OFF \
- -Wno-dev \
- .
- make
+prepare() {
+ mkdir -p "$srcdir/$_pkgbase/build-x11"
+ mkdir -p "$srcdir/$_pkgbase/build-wayland"
}
-package() {
- cd "$srcdir/$_pkgname"
- make DESTDIR="$pkgdir" install
- install -D -m644 COPYING.txt "${pkgdir}/usr/share/licenses/${_pkgname}/COPYING"
+package_glfw-x11-git() {
+ depends=('libxi' 'libxrandr' 'libxinerama' 'libxcursor' 'libgl')
+ pkgdesc="A free, open source, portable framework for OpenGL application development. (git, X11 version)"
+
+ cd "$srcdir/$_pkgbase/build-x11"
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SHARED_LIBS=ON \
+ -DGLFW_BUILD_EXAMPLES=OFF \
+ -DGLFW_BUILD_TESTS=OFF \
+ -Wno-dev \
+ ..
+ make DESTDIR="$pkgdir" install
+ install -D -m644 ../COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+package_glfw-wayland-git() {
+ depends=('wayland' 'libxkbcommon' 'libgl')
+ pkgdesc="A free, open source, portable framework for OpenGL application development. (git, Wayland version)"
+
+ cd "$srcdir/$_pkgbase/build-wayland"
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SHARED_LIBS=ON \
+ -DGLFW_BUILD_EXAMPLES=OFF \
+ -DGLFW_BUILD_TESTS=OFF \
+ -DGLFW_USE_WAYLAND=ON \
+ -Wno-dev \
+ ..
+ make DESTDIR="$pkgdir" install
+ install -D -m644 ../COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/COPYING"
}
# vim:set ts=2 sw=2 et: