The two backends are now merged! \o/

1 files changed, 24 insertions, 56 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 22e4ff42e63c..59babfc64dae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,36 @@
 # Contributor: Axper Jan <483ken _at_ gmail _dot_ com
 # Contributor: Daniel Kirchner <ekpyron at lavabit dot com>
-# Contributor: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
+# Maintainer: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
 # Maintainer: Ricardo Vieira <ricardo.vieira@tecnico.ulisboa.pt>
 
 _pkgbase=glfw
-pkgbase="$_pkgbase-git"
-pkgname=("$_pkgbase-x11-git" "$_pkgbase-wayland-git")
-pkgver=3.2.1.r644.gf9923e90
-pkgrel=2
-arch=('i686' 'x86_64' 'armv7h')
+pkgname=glfw-git
+pkgver=3.3.r470.g56a4cb0a
+pkgrel=1
+pkgdesc="Free, open source, portable framework for OpenGL application development (git version)"
+arch=('x86_64' 'armv7h' 'aarch64')
 url="http://www.glfw.org/"
 license=('custom:ZLIB')
-optdepends=('doxygen: build glfw html documentation')
-makedepends=('cmake' 'extra-cmake-modules' 'git' 'libxi' 'libxrandr' 'libxinerama' 'libxcursor' 'wayland' 'wayland-protocols' 'libxkbcommon' 'mesa')
+depends=('libxi' 'libxrandr' 'libxinerama' 'libxcursor' 'wayland' 'libxkbcommon')
+makedepends=('git' 'cmake' 'ninja' 'doxygen' 'wayland-protocols' 'mesa')
+conflicts=('glfw' 'glfw-x11' 'glfw-wayland')
+provides=('glfw' 'glfw-x11' 'glfw-wayland')
+replaces=('glfw-x11-git' 'glfw-wayland-git')
+optdepends=('libgl: for OpenGL support'
+            'opengl-driver: for OpenGL support'
+            'vulkan-icd-loader: for Vulkan support'
+            'vulkan-driver: for Vulkan support')
 source=("$_pkgbase::git+https://github.com/glfw/glfw")
-md5sums=('SKIP')
+sha256sums=('SKIP')
 
 pkgver() {
   cd $_pkgbase
   git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
 }
 
-prepare() {
-  mkdir -p $_pkgbase/build-x11
-  mkdir -p $_pkgbase/build-wayland
-}
-
 build() {
-  cd $_pkgbase/build-x11
+  mkdir -p $_pkgbase/build
+  cd $_pkgbase/build
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
@@ -35,51 +38,16 @@ build() {
     -DBUILD_SHARED_LIBS=ON \
     -DGLFW_BUILD_EXAMPLES=OFF \
     -DGLFW_BUILD_TESTS=OFF \
+    -DGLFW_BUILD_WAYLAND=ON \
     -Wno-dev \
+    -G Ninja \
     ..
-  make
-
-  cd ../build-wayland
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_SHARED_LIBS=ON \
-    -DGLFW_BUILD_EXAMPLES=OFF \
-    -DGLFW_BUILD_TESTS=OFF \
-    -DGLFW_USE_WAYLAND=ON \
-    -Wno-dev \
-    ..
-  make
-}
-
-package_glfw-x11-git() {
-  conflicts=('glfw' 'glfw-x11')
-  provides=('glfw' 'glfw-x11')
-  depends=('libxi' 'libxrandr' 'libxinerama' 'libxcursor')
-  optdepends=('libgl: for OpenGL support'
-              'opengl-driver: for OpenGL support'
-              'vulkan-icd-loader: for Vulkan support'
-              'vulkan-driver: for Vulkan support')
-  pkgdesc="A free, open source, portable framework for OpenGL application development. (git, X11 version)"
-
-  cd $_pkgbase/build-x11
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../LICENSE.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  ninja
 }
 
-package_glfw-wayland-git() {
-  conflicts=('glfw' 'glfw-wayland')
-  provides=('glfw' 'glfw-wayland')
-  depends=('wayland' 'libxkbcommon')
-  optdepends=('libgl: for OpenGL support'
-              'opengl-driver: for OpenGL support'
-              'vulkan-icd-loader: for Vulkan support'
-              'vulkan-driver: for Vulkan support')
-  pkgdesc="A free, open source, portable framework for OpenGL application development. (git, Wayland version)"
-
-  cd $_pkgbase/build-wayland
-  make DESTDIR="$pkgdir" install
+package() {
+  cd $_pkgbase/build
+  DESTDIR="$pkgdir" ninja install
   install -Dm644 ../LICENSE.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }