From d2fc6043e49b5008d2e19d2a7311cc1cf6a2a54b Mon Sep 17 00:00:00 2001 From: Britney Fransen <brfransen@gmail.com> Date: Mon, 15 Dec 2014 19:13:33 +0000 Subject: mesa: update 10.4.0 --- abs/core/mesa/PKGBUILD | 154 +++++++++++++++++++++++-------------------------- 1 file changed, 73 insertions(+), 81 deletions(-) diff --git a/abs/core/mesa/PKGBUILD b/abs/core/mesa/PKGBUILD index 1cd06e1..a94cdf6 100644 --- a/abs/core/mesa/PKGBUILD +++ b/abs/core/mesa/PKGBUILD @@ -3,27 +3,21 @@ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa -pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') -pkgver=10.1.1 -pkgrel=2 +pkgname=('opencl-mesa' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 'mesa-libgl') +pkgver=10.4.0 +pkgrel=1 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' - 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd') + 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm' + 'systemd' 'libomxil-bellagio' 'libclc' 'clang') url="http://mesa3d.sourceforge.net" license=('custom') -source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 - LICENSE - workaround-for-robustness-and-reset-with-intel.patch) -md5sums=('1fde7ed079df7aeb9b6a744ca033de8d' - '5c65a0fe315dd347e09b1f2826a1df5a' - 'b6b744a948b0de9cd14a2a971b7472de') - -prepare () { - cd ${srcdir}/?esa-* - - # workaround for FS#39803 - https://bugs.freedesktop.org/show_bug.cgi?id=75723 - patch -Np1 -i ../workaround-for-robustness-and-reset-with-intel.patch -} +source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2{,.sig} +#source=(ftp://ftp.freedesktop.org/pub/mesa/10.3/MesaLib-${pkgver}.tar.bz2{,.sig} + LICENSE) +sha256sums=('98a7dff3a1a6708c79789de8b9a05d8042e867067f70e8f30387c15026233219' + 'SKIP' + '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2') build() { cd ${srcdir}/?esa-* @@ -36,25 +30,26 @@ build() { --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ --with-egl-platforms=x11,drm,wayland \ - --with-llvm-shared-libs \ + --enable-llvm-shared-libs \ --enable-egl \ - --disable-gallium-egl \ --enable-gbm \ - --enable-gallium-gbm \ --enable-gallium-llvm \ --enable-shared-glapi \ + --enable-glx \ --enable-glx-tls \ --enable-dri \ - --enable-glx \ --enable-osmesa \ --enable-gles1 \ --enable-gles2 \ --enable-texture-float \ --enable-xa \ --enable-vdpau \ - --enable-dri3 + --enable-omx \ + --enable-nine \ + --enable-opencl --enable-opencl-icd \ + --with-clang-libdir=/usr/lib + # --help - # --disable-gallium-egl : not well maintained/expose less bug, so prefer egl_dri2 (FS#40096) make @@ -63,75 +58,72 @@ build() { make DESTDIR=${srcdir}/fakeinstall install } -package_ati-dri() { - pkgdesc="Mesa drivers for AMD/ATI Radeon" - depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}") - conflicts=('xf86-video-ati<6.9.0-6') - - install -m755 -d ${pkgdir}/usr/lib/vdpau/ - mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_{r600,radeonsi}.* ${pkgdir}/usr/lib/vdpau/ - - install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri - mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ +package_opencl-mesa() { + pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers" + depends=('expat' 'libdrm' 'elfutils' 'libxfixes' 'libxext' 'libcl' 'libclc' 'clang') + optdepends=('opencl-headers: headers necessary for OpenCL development') - install -m755 -d ${pkgdir}/usr/lib/gallium-pipe - mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r300,r600,radeonsi}* ${pkgdir}/usr/lib/gallium-pipe/ + install -m755 -d ${pkgdir}/etc + mv -v ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/ - install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/ati-dri/" -} - -package_intel-dri() { - pkgdesc="Mesa drivers for Intel" - depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}") - - install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri - mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ + install -m755 -d ${pkgdir}/usr/lib/gallium-pipe + 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/ - install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/intel-dri/" + install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/" } -package_nouveau-dri() { - pkgdesc="Mesa drivers for Nouveau" - depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}") - - install -m755 -d ${pkgdir}/usr/lib/vdpau/ - mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/ +package_libva-mesa-driver() { + pkgdesc="VA-API implementation for gallium" + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils') - install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri - mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib/xorg/modules/dri/ - - install -m755 -d ${pkgdir}/usr/lib/gallium-pipe - mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/ - - install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/" + install -m755 -d ${pkgdir}/usr/lib + mv -v ${srcdir}/fakeinstall/usr/lib/dri ${pkgdir}/usr/lib + + install -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-driver" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-driver/" } -package_svga-dri() { - pkgdesc="Gallium3D VMware guest GL driver" - depends=('libdrm' 'expat' 'llvm-libs') - - install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri - mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ +package_mesa-vdpau() { + pkgdesc="Mesa VDPAU drivers" + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils') - install -m755 -d ${pkgdir}/usr/lib/gallium-pipe - mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_vmwgfx* ${pkgdir}/usr/lib/gallium-pipe/ - - install -m755 -d "${pkgdir}/usr/share/licenses/svga-dri" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/svga-dri/" + install -m755 -d ${pkgdir}/usr/lib + mv -v ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau/" } package_mesa() { pkgdesc="an open-source implementation of the OpenGL specification" - depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' 'llvm-libs') - optdepends=('opengl-man-pages: for the OpenGL API man pages') - provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') - conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') - replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') - - mv -v ${srcdir}/fakeinstall/* ${pkgdir} + depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' + 'libomxil-bellagio' 'expat' 'libtxc_dxtn' 'llvm-libs') + optdepends=('opengl-man-pages: for the OpenGL API man pages' + 'mesa-vdpau: for accelerated video playback' + 'libva-mesa-driver: for accelerated video playback') + provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' + 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') + conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' + 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') + replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' + 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') + + install -m755 -d ${pkgdir}/etc + mv -v ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc + + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri + # 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/bellagio ${pkgdir}/usr/lib + mv -v ${srcdir}/fakeinstall/usr/lib/d3d ${pkgdir}/usr/lib + mv -v ${srcdir}/fakeinstall/usr/lib/*.so* ${pkgdir}/usr/lib/ + + mv -v ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr + mv -v ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/ + install -m755 -d ${pkgdir}/usr/lib/mesa # 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/ @@ -144,8 +136,8 @@ package_mesa() { package_mesa-libgl() { pkgdesc="Mesa 3-D graphics library" - depends=("mesa=${pkgver}") - provides=("libgl=${pkgver}") + depends=('mesa') + provides=('libgl') replaces=('libgl') # See FS#26284 -- cgit v0.12