diff options
author | Vi0L0 | 2017-05-30 21:32:26 +0200 |
---|---|---|
committer | Vi0L0 | 2017-05-30 21:32:26 +0200 |
commit | fd6fb911947d2f803e9b839d37261698017354fe (patch) | |
tree | 47d9efd2057816795b55e465580e8fb99e547f09 | |
parent | e34c4f139875c7e0a9a1d30a81b3938c3327bf08 (diff) | |
download | aur-fd6fb911947d2f803e9b839d37261698017354fe.tar.gz |
updated to 17.1.0
-rw-r--r-- | .SRCINFO | 15 | ||||
-rw-r--r-- | PKGBUILD | 61 | ||||
-rw-r--r-- | remove-gbm_bo_create_with_modifiers.patch | 28 | ||||
-rw-r--r-- | remove-libpthread-stubs.patch | 13 |
4 files changed, 71 insertions, 46 deletions
@@ -1,5 +1,5 @@ pkgbase = lib32-mesa-noglvnd - pkgver = 17.0.5 + pkgver = 17.1.0 pkgrel = 1 url = http://mesa3d.sourceforge.net arch = x86_64 @@ -21,14 +21,15 @@ pkgbase = lib32-mesa-noglvnd makedepends = lib32-llvm makedepends = lib32-libvdpau makedepends = lib32-wayland - source = https://mesa.freedesktop.org/archive/mesa-17.0.5.tar.xz - source = https://mesa.freedesktop.org/archive/mesa-17.0.5.tar.xz.sig + makedepends = lib32-lm_sensors + source = https://mesa.freedesktop.org/archive/mesa-17.1.0.tar.xz + source = https://mesa.freedesktop.org/archive/mesa-17.1.0.tar.xz.sig source = LICENSE - source = remove-libpthread-stubs.patch - sha256sums = 668efa445d2f57a26e5c096b1965a685733a3b57d9c736f9d6460263847f9bfe + source = remove-gbm_bo_create_with_modifiers.patch + sha256sums = cf234a6ed4764673886b6661553b54675776ef0898f774716173cec890ac3b17 sha256sums = SKIP sha256sums = 7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2 - sha256sums = 75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f + sha256sums = 0ee964bfd975b6b19e74be5f9a9fe6215ea171d0f895ffc7e9f73ee728d576ae pkgname = lib32-vulkan-intel-noglvnd pkgdesc = Intel's Vulkan mesa driver (32-bit) - non-libglvnd version @@ -50,6 +51,7 @@ pkgname = lib32-vulkan-radeon-noglvnd depends = lib32-llvm-libs depends = lib32-libdrm depends = lib32-libelf + depends = lib32-lm_sensors depends = lib32-libxshmfence provides = lib32-vulkan-driver provides = lib32-vulkan-radeon @@ -76,6 +78,7 @@ pkgname = lib32-mesa-noglvnd depends = lib32-libxxf86vm depends = lib32-libxdamage depends = lib32-libxshmfence + depends = lib32-lm_sensors depends = lib32-libelf depends = lib32-llvm-libs depends = lib32-wayland @@ -5,28 +5,29 @@ pkgbase=lib32-mesa-noglvnd pkgname=('lib32-vulkan-intel-noglvnd' 'lib32-vulkan-radeon-noglvnd' 'lib32-mesa-vdpau-noglvnd' 'lib32-mesa-noglvnd' 'lib32-mesa-libgl-noglvnd') -pkgver=17.0.5 +pkgver=17.1.0 pkgrel=1 arch=('x86_64') makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto' 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-libelf' 'lib32-llvm' 'lib32-libvdpau' - 'lib32-wayland') + 'lib32-wayland' + 'lib32-lm_sensors') url="http://mesa3d.sourceforge.net" license=('custom') source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} LICENSE - remove-libpthread-stubs.patch) -sha256sums=('668efa445d2f57a26e5c096b1965a685733a3b57d9c736f9d6460263847f9bfe' + remove-gbm_bo_create_with_modifiers.patch) +sha256sums=('cf234a6ed4764673886b6661553b54675776ef0898f774716173cec890ac3b17' 'SKIP' '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' - '75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f') + '0ee964bfd975b6b19e74be5f9a9fe6215ea171d0f895ffc7e9f73ee728d576ae') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com> +validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # "Andres Gomez <tanty@igalia.com>" prepare() { cd ${srcdir}/mesa-${pkgver} - # Now mesa checks for libpthread-stubs - so remove the check - patch -Np1 -i ../remove-libpthread-stubs.patch + patch -Np1 -i ../remove-gbm_bo_create_with_modifiers.patch autoreconf -fiv } @@ -45,14 +46,17 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,virgl,svga \ + --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr \ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ - --with-egl-platforms=x11,drm,wayland \ + --with-platforms=x11,drm,wayland \ --with-vulkan-drivers=intel,radeon \ --disable-xvmc \ - --enable-gallium-llvm \ + --disable-libunwind \ + --disable-libglvnd \ + --enable-llvm \ --enable-llvm-shared-libs \ --enable-shared-glapi \ + --enable-lmsensors \ --enable-glx-tls \ --enable-egl \ --enable-glx \ @@ -60,11 +64,11 @@ build() { --enable-gles2 \ --enable-gbm \ --enable-dri \ - --enable-osmesa \ + --enable-gallium-osmesa \ + --enable-gallium-extra-hud \ --enable-texture-float \ --enable-nine \ --enable-vdpau - #--with-sha1=libgcrypt \ make @@ -80,10 +84,10 @@ package_lib32-vulkan-intel-noglvnd() { replaces=('lib32-vulkan-intel' 'lib32-vulkan-intel-git') install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d - mv -v ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/ + cp -rv ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/ install -m755 -d ${pkgdir}/usr/lib32 - mv -v ${srcdir}/fakeinstall/usr/lib32/libvulkan_intel.so ${pkgdir}/usr/lib32/ + cp -rv ${srcdir}/fakeinstall/usr/lib32/libvulkan_intel.so ${pkgdir}/usr/lib32/ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-vulkan-intel" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-vulkan-intel/" @@ -91,16 +95,16 @@ package_lib32-vulkan-intel-noglvnd() { package_lib32-vulkan-radeon-noglvnd() { pkgdesc="Radeon's Vulkan mesa driver (32-bit) - non-libglvnd version" - depends=('lib32-wayland' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-libdrm' 'lib32-libelf' 'lib32-libxshmfence') + depends=('lib32-wayland' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-libdrm' 'lib32-libelf' 'lib32-lm_sensors' 'lib32-libxshmfence') provides=('lib32-vulkan-driver' 'lib32-vulkan-radeon') conflicts=('lib32-vulkan-radeon' 'lib32-vulkan-radeon-git') replaces=('lib32-vulkan-radeon' 'lib32-vulkan-radeon-git') install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d - mv -v ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/ + cp -rv ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/ install -m755 -d ${pkgdir}/usr/lib32 - mv -v ${srcdir}/fakeinstall/usr/lib32/libvulkan_radeon.so ${pkgdir}/usr/lib32/ + cp -rv ${srcdir}/fakeinstall/usr/lib32/libvulkan_radeon.so ${pkgdir}/usr/lib32/ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-vulkan-radeon" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-vulkan-radeon/" @@ -114,15 +118,15 @@ package_lib32-mesa-vdpau-noglvnd() { replaces=('lib32-mesa-vdpau') install -m755 -d ${pkgdir}/usr/lib32 - mv -v ${srcdir}/fakeinstall/usr/lib32/vdpau ${pkgdir}/usr/lib32 - + cp -rv ${srcdir}/fakeinstall/usr/lib32/vdpau ${pkgdir}/usr/lib32 + install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau/" } package_lib32-mesa-noglvnd() { pkgdesc="an open-source implementation of the OpenGL specification (32-bit) - non-libglvnd version" - depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' + depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-lm_sensors' 'lib32-libelf' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-libtxc_dxtn' 'mesa') optdepends=('opengl-man-pages: for the OpenGL API man pages' 'lib32-mesa-vdpau-noglvnd: for accelerated video playback') @@ -131,19 +135,22 @@ package_lib32-mesa-noglvnd() { replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri' 'lib32-mesa' 'lib32-mesa-git') install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri # ati-dri, nouveay-dri, intel-dri, swrast - mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/* ${pkgdir}/usr/lib32/xorg/modules/dri + cp -rv ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/* ${pkgdir}/usr/lib32/xorg/modules/dri install -m755 -d ${pkgdir}/usr/lib32 - mv -v ${srcdir}/fakeinstall/usr/lib32/d3d ${pkgdir}/usr/lib32 - mv -v ${srcdir}/fakeinstall/usr/lib32/*.so* ${pkgdir}/usr/lib32/ + cp -rv ${srcdir}/fakeinstall/usr/lib32/d3d ${pkgdir}/usr/lib32 + cp -rv ${srcdir}/fakeinstall/usr/lib32/lib{gbm,glapi}.so* ${pkgdir}/usr/lib32/ + cp -rv ${srcdir}/fakeinstall/usr/lib32/libOSMesa.so* ${pkgdir}/usr/lib32/ + cp -rv ${srcdir}/fakeinstall/usr/lib32/libwayland*.so* ${pkgdir}/usr/lib32/ + cp -rv ${srcdir}/fakeinstall/usr/lib32/libswrAVX*.so* ${pkgdir}/usr/lib32/ - mv -v ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/ + cp -rv ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/ install -m755 -d ${pkgdir}/usr/lib32/mesa # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ? - mv -v ${pkgdir}/usr/lib32/libGL.so* ${pkgdir}/usr/lib32/mesa/ - mv -v ${pkgdir}/usr/lib32/libEGL.so* ${pkgdir}/usr/lib32/mesa/ - mv -v ${pkgdir}/usr/lib32/libGLES*.so* ${pkgdir}/usr/lib32/mesa/ + cp -rv ${srcdir}/fakeinstall/usr/lib32/libGL.so* ${pkgdir}/usr/lib32/mesa/ + cp -rv ${srcdir}/fakeinstall/usr/lib32/libEGL.so* ${pkgdir}/usr/lib32/mesa/ + cp -rv ${srcdir}/fakeinstall/usr/lib32/libGLES*.so* ${pkgdir}/usr/lib32/mesa/ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa/" diff --git a/remove-gbm_bo_create_with_modifiers.patch b/remove-gbm_bo_create_with_modifiers.patch new file mode 100644 index 000000000000..972e215aab75 --- /dev/null +++ b/remove-gbm_bo_create_with_modifiers.patch @@ -0,0 +1,28 @@ +--- a/src/egl/drivers/dri2/platform_drm.c 2017-05-10 16:13:57.000000000 +0200 ++++ b/src/egl/drivers/dri2/platform_drm.c 2017-05-28 20:52:57.507271447 +0200 +@@ -230,21 +230,10 @@ + + if (dri2_surf->back == NULL) + return -1; +- if (dri2_surf->back->bo == NULL) { +- if (surf->base.modifiers) +- dri2_surf->back->bo = gbm_bo_create_with_modifiers(&dri2_dpy->gbm_dri->base.base, +- surf->base.width, surf->base.height, +- surf->base.format, +- surf->base.modifiers, +- surf->base.count); +- else +- dri2_surf->back->bo = gbm_bo_create(&dri2_dpy->gbm_dri->base.base, +- surf->base.width, +- surf->base.height, +- surf->base.format, +- surf->base.flags); +- +- } ++ if (dri2_surf->back->bo == NULL) ++ dri2_surf->back->bo = gbm_bo_create(&dri2_dpy->gbm_dri->base.base, ++ surf->base.width, surf->base.height, ++ surf->base.format, surf->base.flags); + if (dri2_surf->back->bo == NULL) + return -1; + diff --git a/remove-libpthread-stubs.patch b/remove-libpthread-stubs.patch deleted file mode 100644 index efe8aaddd097..000000000000 --- a/remove-libpthread-stubs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 54416b4..8a708d3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -824,7 +824,7 @@ test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread" - - dnl pthread-stubs is mandatory on targets where it exists - case "$host_os" in --cygwin* ) -+cygwin* | linux* ) - pthread_stubs_possible="no" - ;; - * ) |