upstream changed location of some vulkan files

This commit is contained in:
LW-archlinux 2016-07-07 11:33:56 +02:00
parent c4208992b7
commit 95c44c12d0
2 changed files with 43 additions and 41 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 = 12.1.0_devel.82587.154c0a4 pkgver = 12.1.0_devel.83009.7a9d6ab
pkgrel = 1 pkgrel = 1.1
url = http://mesa3d.sourceforge.net url = http://mesa3d.sourceforge.net
arch = i686 arch = i686
arch = x86_64 arch = x86_64
@ -47,7 +47,7 @@ pkgname = opencl-mesa-git
depends = libcl depends = libcl
depends = libclc depends = libclc
depends = nettle depends = nettle
depends = mesa-git=12.1.0_devel.82587.154c0a4 depends = mesa-git=12.1.0_devel.83009.7a9d6ab
optdepends = opencl-headers: headers necessary for OpenCL development optdepends = opencl-headers: headers necessary for OpenCL development
provides = opencl-mesa=12.1.0-devel provides = opencl-mesa=12.1.0-devel
conflicts = opencl-mesa conflicts = opencl-mesa
@ -59,7 +59,7 @@ pkgname = mesa-vulkan-intel-git
depends = libgcrypt depends = libgcrypt
depends = wayland depends = wayland
depends = libxcb depends = libxcb
depends = mesa-git=12.1.0_devel.82587.154c0a4 depends = mesa-git=12.1.0_devel.83009.7a9d6ab
provides = vulkan-intel provides = vulkan-intel
conflicts = vulkan-intel conflicts = vulkan-intel
replaces = vulkan-intel replaces = vulkan-intel
@ -67,21 +67,21 @@ pkgname = mesa-vulkan-intel-git
pkgname = libva-mesa-driver-git pkgname = libva-mesa-driver-git
pkgdesc = VA-API implementation for gallium pkgdesc = VA-API implementation for gallium
depends = nettle depends = nettle
depends = mesa-git=12.1.0_devel.82587.154c0a4 depends = mesa-git=12.1.0_devel.83009.7a9d6ab
provides = libva-mesa-driver=12.1.0-devel provides = libva-mesa-driver=12.1.0-devel
conflicts = libva-mesa-driver conflicts = libva-mesa-driver
pkgname = mesa-vdpau-git pkgname = mesa-vdpau-git
pkgdesc = Mesa VDPAU drivers pkgdesc = Mesa VDPAU drivers
depends = nettle depends = nettle
depends = mesa-git=12.1.0_devel.82587.154c0a4 depends = mesa-git=12.1.0_devel.83009.7a9d6ab
provides = mesa-vdpau=12.1.0-devel provides = mesa-vdpau=12.1.0-devel
conflicts = mesa-vdpau conflicts = mesa-vdpau
replaces = mesa-vdpau replaces = mesa-vdpau
pkgname = mesa-libgl-git pkgname = mesa-libgl-git
pkgdesc = Mesa 3-D graphics library pkgdesc = Mesa 3-D graphics library
depends = mesa-git=12.1.0_devel.82587.154c0a4 depends = mesa-git=12.1.0_devel.83009.7a9d6ab
provides = mesa-libgl=12.1.0-devel provides = mesa-libgl=12.1.0-devel
provides = libgl=12.1.0-devel provides = libgl=12.1.0-devel
conflicts = mesa-libgl conflicts = mesa-libgl

View File

@ -12,8 +12,8 @@
pkgbase=mesa-git pkgbase=mesa-git
pkgname=('opencl-mesa-git' 'mesa-vulkan-intel-git' 'libva-mesa-driver-git' 'mesa-vdpau-git' 'mesa-libgl-git' '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" pkgdesc="an open-source implementation of the OpenGL specification, git version"
pkgver=12.1.0_devel.82587.154c0a4 pkgver=12.1.0_devel.83009.7a9d6ab
pkgrel=1 pkgrel=1.1
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm>=2.4.66' 'dri2proto' 'dri3proto' 'presentproto' makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm>=2.4.66' 'dri2proto' 'dri3proto' 'presentproto'
'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm-svn' 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm-svn'
@ -133,8 +133,8 @@ package_opencl-mesa-git () {
mv -v "${srcdir}"/fakeinstall/usr/lib/lib*OpenCL* "${pkgdir}/usr/lib/" mv -v "${srcdir}"/fakeinstall/usr/lib/lib*OpenCL* "${pkgdir}/usr/lib/"
mv -v "${srcdir}"/fakeinstall/usr/lib/gallium-pipe/pipe_{r600,radeonsi}.so "${pkgdir}/usr/lib/gallium-pipe/" mv -v "${srcdir}"/fakeinstall/usr/lib/gallium-pipe/pipe_{r600,radeonsi}.so "${pkgdir}/usr/lib/gallium-pipe/"
install -v -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa-git" install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa-git"
install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa-git/" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa-git/"
} }
package_mesa-vulkan-intel-git() { package_mesa-vulkan-intel-git() {
@ -145,12 +145,14 @@ package_mesa-vulkan-intel-git() {
replaces=('vulkan-intel') replaces=('vulkan-intel')
conflicts=('vulkan-intel') conflicts=('vulkan-intel')
install -m755 -d ${pkgdir}/etc # install -m755 -d ${pkgdir}/etc
mv -v ${srcdir}/fakeinstall/etc/vulkan ${pkgdir}/etc/ # mv -v ${srcdir}/fakeinstall/etc/vulkan ${pkgdir}/etc/
install -m755 -d ${pkgdir}/usr/{include/vulkan,lib} install -m755 -d ${pkgdir}/usr/{include/vulkan,lib,share/{vulkan,licenses}}
mv -v ${srcdir}/fakeinstall/usr/lib/libvulkan_intel.so ${pkgdir}/usr/lib/
mv -v ${srcdir}/fakeinstall/usr/lib/libvulkan_intel.so ${pkgdir}/usr/lib
mv -v ${srcdir}/fakeinstall/usr/include/vulkan/vulkan_intel.h ${pkgdir}/usr/include/vulkan mv -v ${srcdir}/fakeinstall/usr/include/vulkan/vulkan_intel.h ${pkgdir}/usr/include/vulkan
mv -v ${srcdir}/fakeinstall/usr/share/vulkan/ ${pkgdir}/usr/share/
install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vulkan-intel-git" install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vulkan-intel-git"
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vulkan-intel-git/" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vulkan-intel-git/"
@ -162,11 +164,11 @@ package_libva-mesa-driver-git() {
provides=("libva-mesa-driver=$(_mesaver)") provides=("libva-mesa-driver=$(_mesaver)")
conflicts=('libva-mesa-driver') conflicts=('libva-mesa-driver')
install -v -m755 -d "${pkgdir}/usr/lib" install -m755 -d "${pkgdir}/usr/lib"
mv -v "${srcdir}/fakeinstall/usr/lib/dri" "${pkgdir}/usr/lib/" mv -v "${srcdir}/fakeinstall/usr/lib/dri" "${pkgdir}/usr/lib/"
install -v -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-driver-git" install -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-driver-git"
install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-driver-git/" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-driver-git/"
} }
@ -180,8 +182,8 @@ package_mesa-vdpau-git() {
install -v -m755 -d "${pkgdir}/usr/lib" install -v -m755 -d "${pkgdir}/usr/lib"
mv -v "${srcdir}/fakeinstall/usr/lib/vdpau" "${pkgdir}/usr/lib/" mv -v "${srcdir}/fakeinstall/usr/lib/vdpau" "${pkgdir}/usr/lib/"
install -v -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau-git" install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau-git"
install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau-git/" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau-git/"
} }
package_mesa-git () { package_mesa-git () {
@ -195,10 +197,10 @@ package_mesa-git () {
replaces=('mesa' 'mesa-r300-r600-radeonsi-git' 'mesa-dri') replaces=('mesa' 'mesa-r300-r600-radeonsi-git' 'mesa-dri')
conflicts=('mesa' 'mesa-r300-r600-radeonsi-git' 'mesa-dri') conflicts=('mesa' 'mesa-r300-r600-radeonsi-git' 'mesa-dri')
install -v -m755 -d "${pkgdir}/etc" install -m755 -d "${pkgdir}/etc"
mv -v "${srcdir}/fakeinstall/etc/drirc" "${pkgdir}/etc/" mv -v "${srcdir}/fakeinstall/etc/drirc" "${pkgdir}/etc/"
install -v -m755 -d "${pkgdir}/usr/lib/xorg/modules/dri" install -m755 -d "${pkgdir}/usr/lib/xorg/modules/dri"
# ati-dri, nouveau-dri, intel-dri, svga-dri, swrast # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast
mv -v "${srcdir}"/fakeinstall/usr/lib/xorg/modules/dri/* "${pkgdir}/usr/lib/xorg/modules/dri/" mv -v "${srcdir}"/fakeinstall/usr/lib/xorg/modules/dri/* "${pkgdir}/usr/lib/xorg/modules/dri/"
@ -212,14 +214,14 @@ package_mesa-git () {
mv -v "${srcdir}/fakeinstall/usr/lib/pkgconfig" "${pkgdir}/usr/lib/" mv -v "${srcdir}/fakeinstall/usr/lib/pkgconfig" "${pkgdir}/usr/lib/"
install -v -m755 -d "${pkgdir}/usr/lib/mesa" install -m755 -d "${pkgdir}/usr/lib/mesa"
# move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ? # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
mv -v "${pkgdir}"/usr/lib/libGL.so* "${pkgdir}/usr/lib/mesa/" mv -v "${pkgdir}"/usr/lib/libGL.so* "${pkgdir}/usr/lib/mesa/"
mv -v "${pkgdir}"/usr/lib/libEGL.so* "${pkgdir}/usr/lib/mesa/" mv -v "${pkgdir}"/usr/lib/libEGL.so* "${pkgdir}/usr/lib/mesa/"
mv -v "${pkgdir}"/usr/lib/libGLES*.so* "${pkgdir}/usr/lib/mesa/" mv -v "${pkgdir}"/usr/lib/libGLES*.so* "${pkgdir}/usr/lib/mesa/"
install -v -m755 -d "${pkgdir}/usr/share/licenses/mesa-git" install -m755 -d "${pkgdir}/usr/share/licenses/mesa-git"
install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-git/" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-git/"
} }
package_mesa-libgl-git () { package_mesa-libgl-git () {
@ -230,25 +232,25 @@ package_mesa-libgl-git () {
conflicts=('mesa-libgl') conflicts=('mesa-libgl')
# See FS#26284 # See FS#26284
install -v -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
ln -sfv libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
ln -sfv /usr/lib/mesa/libGL.so.1.2.0 "${pkgdir}/usr/lib/libGL.so.1.2.0" ln -s /usr/lib/mesa/libGL.so.1.2.0 "${pkgdir}/usr/lib/libGL.so.1.2.0"
ln -sfv libGL.so.1.2.0 "${pkgdir}/usr/lib/libGL.so.1" ln -s libGL.so.1.2.0 "${pkgdir}/usr/lib/libGL.so.1"
ln -sfv libGL.so.1.2.0 "${pkgdir}/usr/lib/libGL.so" ln -s libGL.so.1.2.0 "${pkgdir}/usr/lib/libGL.so"
ln -sfv /usr/lib/mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so.1.0.0" ln -s /usr/lib/mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so.1.0.0"
ln -sfv libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so.1" ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so.1"
ln -sfv libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so" ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib/libEGL.so"
ln -sfv /usr/lib/mesa/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0" ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0"
ln -sfv libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so.1" ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so.1"
ln -sfv libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so" ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so"
ln -sfv /usr/lib/mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so.2.0.0" ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so.2.0.0"
ln -sfv libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so.2" ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so.2"
ln -sfv libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so" ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so"
install -v -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl-git" install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl-git"
install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl-git/" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl-git/"
} }