mesa: fix libgl conflicts

This commit is contained in:
Bruce Liu 2014-07-02 11:05:40 +00:00
parent f0fae8050d
commit 6b039d44bd

View File

@ -4,7 +4,7 @@
pkgbase=mesa
pkgname=('mesa-libtool' 'mesa' 'mesa-libgl' 'opencl-mesa' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
pkgver=10.2.2
pkgrel=4
pkgrel=5
arch=('x86_64')
makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd'
'libclc' 'clang')
@ -17,8 +17,6 @@ source=(${source[@]}
)
md5sums=('a986ef9c7ca0c7d75f9665c73bd211f4'
'5c65a0fe315dd347e09b1f2826a1df5a')
options=("debug" 'libtool')
build() {
cd ${srcdir}/?esa-*
@ -168,6 +166,7 @@ package_mesa-libgl() {
pkgdesc="Mesa 3-D graphics library"
depends=("mesa=${pkgver}")
provides=("libgl=${pkgver}")
conflicts=('libgl')
replaces=('libgl')
# See FS#26284
@ -197,6 +196,7 @@ package_mesa-libgl() {
package_mesa-libtool() {
depends=(mesa)
pkgdesc=(Libtool files for mesa)
options=(libtool)
# I'm enough of silly *.la build failure and those splitted la pollution everwhere
install -Dm644 ${srcdir}/fakeinstall/usr/lib/egl/egl_gallium.la ${pkgdir}/usr/lib/egl/egl_gallium.la