added conflict with wayland < 1.14.93 to avoid breaking firefox (and likely other userspace applications) due to

wayland_egl move
This commit is contained in:
LW-archlinux 2018-04-04 12:57:38 +02:00
parent be63a70feb
commit e481705dd0
2 changed files with 4 additions and 3 deletions

View File

@ -1,7 +1,7 @@
pkgbase = mesa-git pkgbase = mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version pkgdesc = an open-source implementation of the OpenGL specification, git version
pkgver = 18.1.0_devel.101343.41ac0b1443 pkgver = 18.1.0_devel.101343.41ac0b1443
pkgrel = 1 pkgrel = 2
url = http://mesa3d.sourceforge.net url = http://mesa3d.sourceforge.net
arch = x86_64 arch = x86_64
license = custom license = custom
@ -45,6 +45,7 @@ pkgbase = mesa-git
conflicts = vulkan-radeon conflicts = vulkan-radeon
conflicts = libva-mesa-driver conflicts = libva-mesa-driver
conflicts = mesa-vdpau conflicts = mesa-vdpau
conflicts = wayland<1.14.93
source = mesa::git://anongit.freedesktop.org/mesa/mesa source = mesa::git://anongit.freedesktop.org/mesa/mesa
source = LICENSE source = LICENSE
sha512sums = SKIP sha512sums = SKIP

View File

@ -13,7 +13,7 @@ pkgbase=mesa-git
pkgname=('mesa-git') pkgname=('mesa-git')
pkgdesc="an open-source implementation of the OpenGL specification, git version" pkgdesc="an open-source implementation of the OpenGL specification, git version"
pkgver=18.1.0_devel.101343.41ac0b1443 pkgver=18.1.0_devel.101343.41ac0b1443
pkgrel=1 pkgrel=2
arch=('x86_64') arch=('x86_64')
makedepends=('git' 'python2-mako' 'llvm-svn' 'libclc' 'clang-svn' 'xorgproto' makedepends=('git' 'python2-mako' 'llvm-svn' 'libclc' 'clang-svn' 'xorgproto'
'libxml2' 'libx11' 'libvdpau' 'libva' 'elfutils' 'libomxil-bellagio' 'libxml2' 'libx11' 'libvdpau' 'libva' 'elfutils' 'libomxil-bellagio'
@ -22,7 +22,7 @@ depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
'libomxil-bellagio' 'llvm-libs-svn' 'libunwind' 'libglvnd') 'libomxil-bellagio' 'llvm-libs-svn' 'libunwind' 'libglvnd')
optdepends=('opengl-man-pages: for the OpenGL API man pages') optdepends=('opengl-man-pages: for the OpenGL API man pages')
provides=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-driver' 'opencl-driver' 'opengl-driver') provides=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-driver' 'opencl-driver' 'opengl-driver')
conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau') conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'wayland<1.14.93')
url="http://mesa3d.sourceforge.net" url="http://mesa3d.sourceforge.net"
license=('custom') license=('custom')
source=('mesa::git://anongit.freedesktop.org/mesa/mesa' source=('mesa::git://anongit.freedesktop.org/mesa/mesa'