fix fileconflict between mesa-git and vulkan-headers
This commit is contained in:
parent
1ed15e5e0b
commit
f1e2412c82
14
.SRCINFO
14
.SRCINFO
@ -1,7 +1,7 @@
|
||||
pkgbase = mesa-git
|
||||
pkgdesc = an open-source implementation of the OpenGL specification, git version
|
||||
pkgver = 11.3.0_devel.80298.1d2ac7a
|
||||
pkgrel = 2
|
||||
pkgver = 11.3.0_devel.80341.899bd63
|
||||
pkgrel = 1
|
||||
url = http://mesa3d.sourceforge.net
|
||||
arch = i686
|
||||
arch = x86_64
|
||||
@ -47,7 +47,7 @@ pkgname = opencl-mesa-git
|
||||
depends = libcl
|
||||
depends = libclc
|
||||
depends = nettle
|
||||
depends = mesa-git=11.3.0_devel.80298.1d2ac7a
|
||||
depends = mesa-git=11.3.0_devel.80341.899bd63
|
||||
optdepends = opencl-headers: headers necessary for OpenCL development
|
||||
provides = opencl-mesa=11.3.0-devel
|
||||
conflicts = opencl-mesa
|
||||
@ -59,7 +59,7 @@ pkgname = mesa-vulkan-intel-git
|
||||
depends = libgcrypt
|
||||
depends = wayland
|
||||
depends = libxcb
|
||||
depends = mesa-git=11.3.0_devel.80298.1d2ac7a
|
||||
depends = mesa-git=11.3.0_devel.80341.899bd63
|
||||
provides = vulkan-intel
|
||||
conflicts = vulkan-intel
|
||||
replaces = vulkan-intel
|
||||
@ -67,21 +67,21 @@ pkgname = mesa-vulkan-intel-git
|
||||
pkgname = libva-mesa-driver-git
|
||||
pkgdesc = VA-API implementation for gallium
|
||||
depends = nettle
|
||||
depends = mesa-git=11.3.0_devel.80298.1d2ac7a
|
||||
depends = mesa-git=11.3.0_devel.80341.899bd63
|
||||
provides = libva-mesa-driver=11.3.0-devel
|
||||
conflicts = libva-mesa-driver
|
||||
|
||||
pkgname = mesa-vdpau-git
|
||||
pkgdesc = Mesa VDPAU drivers
|
||||
depends = nettle
|
||||
depends = mesa-git=11.3.0_devel.80298.1d2ac7a
|
||||
depends = mesa-git=11.3.0_devel.80341.899bd63
|
||||
provides = mesa-vdpau=11.3.0-devel
|
||||
conflicts = mesa-vdpau
|
||||
replaces = mesa-vdpau
|
||||
|
||||
pkgname = mesa-libgl-git
|
||||
pkgdesc = Mesa 3-D graphics library
|
||||
depends = mesa-git=11.3.0_devel.80298.1d2ac7a
|
||||
depends = mesa-git=11.3.0_devel.80341.899bd63
|
||||
provides = mesa-libgl=11.3.0-devel
|
||||
provides = libgl=11.3.0-devel
|
||||
conflicts = mesa-libgl
|
||||
|
7
PKGBUILD
7
PKGBUILD
@ -12,8 +12,8 @@
|
||||
pkgbase=mesa-git
|
||||
pkgname=('opencl-mesa-git' 'mesa-vulkan-intel-git' 'libva-mesa-driver-git' 'mesa-vdpau-git' 'mesa-libgl-git' 'mesa-git')
|
||||
pkgdesc="an open-source implementation of the OpenGL specification, git version"
|
||||
pkgver=11.3.0_devel.80298.1d2ac7a
|
||||
pkgrel=2
|
||||
pkgver=11.3.0_devel.80341.899bd63
|
||||
pkgrel=1
|
||||
arch=('i686' 'x86_64')
|
||||
makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm>=2.4.66' 'dri2proto' 'dri3proto' 'presentproto'
|
||||
'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm-svn'
|
||||
@ -204,6 +204,9 @@ package_mesa-git () {
|
||||
mv -v "${srcdir}"/fakeinstall/usr/lib/*.so* "${pkgdir}/usr/lib/"
|
||||
|
||||
mv -v "${srcdir}/fakeinstall/usr/include" "${pkgdir}/usr/"
|
||||
# remove vulkan headers as they are provided by vulkan-headers package
|
||||
rm -rf ${pkgdir}/usr/include/vulkan
|
||||
|
||||
mv -v "${srcdir}/fakeinstall/usr/lib/pkgconfig" "${pkgdir}/usr/lib/"
|
||||
|
||||
install -v -m755 -d "${pkgdir}/usr/lib/mesa"
|
||||
|
Loading…
Reference in New Issue
Block a user