summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot2018-03-06 09:22:38 +0100
committerEmmanuel Gil Peyrot2018-03-06 09:22:38 +0100
commit7e86bab7b5b0c6e1fd3f984c67db831d6fc0d80a (patch)
tree6d47546d384280ab9824e7e16e9ec00ff271703d
parent79ab42ad832ca4a09bba5b87f5861d704d85d48f (diff)
downloadaur-7e86bab7b5b0c6e1fd3f984c67db831d6fc0d80a.tar.gz
Also provide and conflict with glfw-x11 or glfw-wayland.
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD6
2 files changed, 13 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8dd3c13adb9..c43175db231 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Feb 6 11:34:31 UTC 2018
+# Tue Mar 6 08:22:07 UTC 2018
pkgbase = glfw-git
pkgver = 3.2.1.r502.gae53cd29
pkgrel = 1
@@ -20,8 +20,6 @@ pkgbase = glfw-git
makedepends = libxkbcommon
makedepends = mesa
optdepends = doxygen: build glfw html documentation
- provides = glfw=3.3
- conflicts = glfw
source = glfw::git+https://github.com/glfw/glfw
md5sums = SKIP
@@ -35,6 +33,10 @@ pkgname = glfw-x11-git
optdepends = opengl-driver: for OpenGL support
optdepends = vulkan-icd-loader: for Vulkan support
optdepends = vulkan-driver: for Vulkan support
+ provides = glfw
+ provides = glfw-x11
+ conflicts = glfw
+ conflicts = glfw-x11
pkgname = glfw-wayland-git
pkgdesc = A free, open source, portable framework for OpenGL application development. (git, Wayland version)
@@ -44,4 +46,8 @@ pkgname = glfw-wayland-git
optdepends = opengl-driver: for OpenGL support
optdepends = vulkan-icd-loader: for Vulkan support
optdepends = vulkan-driver: for Vulkan support
+ provides = glfw
+ provides = glfw-wayland
+ conflicts = glfw
+ conflicts = glfw-wayland
diff --git a/PKGBUILD b/PKGBUILD
index 1adb6a2ca81..de645a280a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,6 @@ 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')
-conflicts=("$_pkgbase")
-provides=("$_pkgbase=3.3")
source=("$_pkgbase::git+https://github.com/glfw/glfw")
md5sums=('SKIP')
@@ -52,6 +50,8 @@ build() {
}
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'
@@ -65,6 +65,8 @@ package_glfw-x11-git() {
}
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'