removed replaces=

This commit is contained in:
LW-archlinux 2017-06-03 02:34:32 +02:00
parent b775749565
commit 9008a6af7d
2 changed files with 25 additions and 45 deletions

View File

@ -1,6 +1,6 @@
pkgbase = mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version
pkgver = 17.2.0_devel.92208.30dc56bb5b
pkgver = 17.2.0_devel.92548.0d576fbfbe
pkgrel = 1
url = http://mesa3d.sourceforge.net
arch = x86_64
@ -10,38 +10,19 @@ pkgbase = mesa-git
makedepends = llvm-svn
makedepends = libclc
makedepends = clang-svn
makedepends = libdrm
makedepends = glproto
makedepends = dri2proto
makedepends = dri3proto
makedepends = presentproto
makedepends = libxml2
makedepends = libx11
makedepends = libxshmfence
makedepends = libxxf86vm
makedepends = libxdamage
makedepends = libvdpau
makedepends = libva
makedepends = wayland
makedepends = elfutils
makedepends = libomxil-bellagio
makedepends = libtxc_dxtn
makedepends = ocl-icd
makedepends = vulkan-icd-loader
makedepends = libgcrypt
makedepends = libunwind
makedepends = libglvnd
source = mesa::git://anongit.freedesktop.org/mesa/mesa
source = LICENSE
source = 0001-Fix-linkage-against-shared-glapi.patch
source = glvnd-fix-gl-dot-pc.patch
sha512sums = SKIP
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
sha512sums = fdf973f0387997cee16936bc978f52d60719a1a8610fa96768e2cec42ad790da31f72c00783246f047fc496de01f9e22aec0d46577ded9c2353dd6e6193b4294
sha512sums = 75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028
pkgname = mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version
depends = libdrm
depends = wayland
depends = libxxf86vm
@ -52,6 +33,7 @@ pkgname = mesa-git
depends = libtxc_dxtn
depends = llvm-libs-svn
depends = libunwind
depends = libglvnd
optdepends = opengl-man-pages: for the OpenGL API man pages
provides = mesa
provides = opencl-mesa
@ -59,9 +41,9 @@ pkgname = mesa-git
provides = vulkan-radeon
provides = libva-mesa-driver
provides = mesa-vdpau
provides = mesa-libgl
provides = vulkan-driver
provides = opencl-driver
provides = mesa-libgl
provides = opengl-driver
conflicts = mesa
conflicts = opencl-mesa
@ -70,11 +52,14 @@ pkgname = mesa-git
conflicts = libva-mesa-driver
conflicts = mesa-vdpau
conflicts = mesa-libgl
replaces = mesa
replaces = opencl-mesa
replaces = vulkan-intel
replaces = vulkan-radeon
replaces = libva-mesa-driver
replaces = mesa-vdpau
replaces = mesa-libgl
source = mesa::git://anongit.freedesktop.org/mesa/mesa
source = LICENSE
source = 0001-Fix-linkage-against-shared-glapi.patch
source = glvnd-fix-gl-dot-pc.patch
sha512sums = SKIP
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
sha512sums = fdf973f0387997cee16936bc978f52d60719a1a8610fa96768e2cec42ad790da31f72c00783246f047fc496de01f9e22aec0d46577ded9c2353dd6e6193b4294
sha512sums = 75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028
pkgname = mesa-git

View File

@ -12,13 +12,18 @@
pkgbase=mesa-git
pkgname=('mesa-git')
pkgdesc="an open-source implementation of the OpenGL specification, git version"
pkgver=17.2.0_devel.92208.30dc56bb5b
pkgver=17.2.0_devel.92548.0d576fbfbe
pkgrel=1
arch=('x86_64')
makedepends=('git' 'python2-mako' 'llvm-svn' 'libclc' 'clang-svn' 'libdrm' 'glproto'
'dri2proto' 'dri3proto' 'presentproto' 'libxml2' 'libx11' 'libxshmfence'
'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'libomxil-bellagio'
'libtxc_dxtn' 'ocl-icd' 'vulkan-icd-loader' 'libgcrypt' 'libunwind' 'libglvnd')
makedepends=('git' 'python2-mako' 'llvm-svn' 'libclc' 'clang-svn' 'glproto'
'dri2proto' 'dri3proto' 'presentproto' 'libxml2' 'libx11'
'libvdpau' 'libva' 'elfutils' 'libomxil-bellagio'
'ocl-icd' 'vulkan-icd-loader' 'libgcrypt')
depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
'libomxil-bellagio' 'libtxc_dxtn' 'llvm-libs-svn' 'libunwind' 'libglvnd')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
provides=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-libgl' 'vulkan-driver' 'opencl-driver' 'opengl-driver')
conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-libgl')
url="http://mesa3d.sourceforge.net"
license=('custom')
source=('mesa::git://anongit.freedesktop.org/mesa/mesa'
@ -36,11 +41,8 @@ prepare() {
# glvnd support patches - from Fedora
# non-upstreamed ones
patch -Np1 -i ../glvnd-fix-gl-dot-pc.patch
patch -Np1 -i ../0001-Fix-linkage-against-shared-glapi.patch
# patch -Np1 -i ../0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch
# upstreamed, see https://cgit.freedesktop.org/mesa/mesa/commit/?id=84f764a7591715104b28c035c837ce9fd86157ad
patch -Np1 -i ../glvnd-fix-gl-dot-pc.patch
}
@ -118,13 +120,6 @@ build () {
package_mesa-git() {
pkgdesc="an open-source implementation of the OpenGL specification, git version"
depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
'libomxil-bellagio' 'libtxc_dxtn' 'llvm-libs-svn' 'libunwind')
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' 'mesa-libgl' 'opengl-driver')
replaces=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-libgl')
conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-libgl')
cd mesa
make DESTDIR="$pkgdir" install