diff options
| -rw-r--r-- | .SRCINFO | 36 | ||||
| -rw-r--r-- | PKGBUILD | 84 | ||||
| -rw-r--r-- | remove-libpthread-stubs.patch | 13 |
3 files changed, 68 insertions, 65 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Mon Dec 14 14:13:57 UTC 2015 +# Mon Nov 21 23:42:34 UTC 2016 pkgbase = mesa-nowayland - pkgdesc = an open-source implementation of the OpenGL specification - pkgver = 11.0.7 + pkgdesc = An open-source implementation of the OpenGL specification + pkgver = 13.0.1 pkgrel = 1 url = http://mesa3d.sourceforge.net arch = i686 @@ -25,59 +25,43 @@ pkgbase = mesa-nowayland makedepends = llvm makedepends = systemd makedepends = libomxil-bellagio + makedepends = libgcrypt makedepends = libclc makedepends = clang depends = libdrm depends = libxxf86vm depends = libxdamage depends = libxshmfence - depends = systemd depends = elfutils depends = libomxil-bellagio - depends = expat + depends = libgcrypt depends = libtxc_dxtn depends = llvm-libs optdepends = opengl-man-pages: for the OpenGL API man pages optdepends = mesa-vdpau: for accelerated video playback optdepends = libva-mesa-driver: for accelerated video playback - provides = mesa=11.0.7 - provides = libglapi - provides = osmesa - provides = libgbm - provides = libgles - provides = libegl - provides = khrplatform-devel + provides = mesa=13.0.1 provides = ati-dri provides = intel-dri provides = nouveau-dri provides = svga-dri provides = mesa-dri - conflicts = libglapi - conflicts = osmesa - conflicts = libgbm - conflicts = libgles - conflicts = libegl - conflicts = khrplatform-devel conflicts = ati-dri conflicts = intel-dri conflicts = nouveau-dri conflicts = svga-dri conflicts = mesa-dri - replaces = libglapi - replaces = osmesa - replaces = libgbm - replaces = libgles - replaces = libegl - replaces = khrplatform-devel replaces = ati-dri replaces = intel-dri replaces = nouveau-dri replaces = svga-dri replaces = mesa-dri - source = ftp://ftp.freedesktop.org/pub/mesa/11.0.7/mesa-11.0.7.tar.xz + source = ftp://ftp.freedesktop.org/pub/mesa/13.0.1/mesa-13.0.1.tar.xz source = LICENSE - sha256sums = e7e90a332ede6c8fd08eff90786a3fd1605a4e62ebf3a9b514047838194538cb + source = remove-libpthread-stubs.patch + sha256sums = 71962fb2bf77d33b0ad4a565b490dbbeaf4619099c6d9722f04a73187957a731 sha256sums = 7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2 + sha256sums = 75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f pkgname = mesa-nowayland @@ -3,99 +3,105 @@ # Maintainer of the mesa package: Andreas Radke <andyrtr@archlinux.org> pkgname=mesa-nowayland -pkgver=11.0.7 +pkgver=13.0.1 pkgrel=1 arch=('i686' 'x86_64') -pkgdesc="an open-source implementation of the OpenGL specification" +pkgdesc="An open-source implementation of the OpenGL specification" makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'elfutils' 'llvm' - 'systemd' 'libomxil-bellagio' 'libclc' 'clang') -depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' - 'libomxil-bellagio' 'expat' 'libtxc_dxtn' 'llvm-libs') + 'systemd' 'libomxil-bellagio' 'libgcrypt' 'libclc' 'clang') +depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'elfutils' + 'libomxil-bellagio' 'libgcrypt' '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') conflicts=("mesa") provides=("mesa=$pkgver" - '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') +conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') +replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') url="http://mesa3d.sourceforge.net" license=('custom') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz - LICENSE) -sha256sums=('e7e90a332ede6c8fd08eff90786a3fd1605a4e62ebf3a9b514047838194538cb' - '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2') + LICENSE + remove-libpthread-stubs.patch) +sha256sums=('71962fb2bf77d33b0ad4a565b490dbbeaf4619099c6d9722f04a73187957a731' + '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' + '75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f') prepare() { - cd ${srcdir}/?esa-* + cd ${srcdir}/mesa-${pkgver} + + # Now mesa checks for libpthread-stubs - so remove the check + patch -Np1 -i ../remove-libpthread-stubs.patch - # Fix detection of libLLVM when built with CMake - sed -i 's/LLVM_SO_NAME=.*/LLVM_SO_NAME=LLVM/' configure + autoreconf -fiv } build() { - cd ${srcdir}/?esa-* - - #autoreconf -vfi # our automake is far too new for their build system :) + cd ${srcdir}/mesa-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ + --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl \ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ --with-egl-platforms=x11,drm \ - --enable-llvm-shared-libs \ - --enable-egl \ - --enable-gbm \ + --with-vulkan-drivers=intel,radeon \ + --with-sha1=libgcrypt \ + --disable-xvmc \ --enable-gallium-llvm \ + --enable-llvm-shared-libs \ --enable-shared-glapi \ + --enable-egl \ --enable-glx \ --enable-glx-tls \ - --enable-dri \ - --enable-osmesa \ --enable-gles1 \ --enable-gles2 \ + --enable-gbm \ + --enable-dri \ + --enable-osmesa \ --enable-texture-float \ --enable-xa \ --enable-vdpau \ --enable-omx \ --enable-nine \ - --enable-opencl --enable-opencl-icd \ + --enable-opencl \ + --enable-opencl-icd \ --with-clang-libdir=/usr/lib - # --help - make # fake installation - mkdir $srcdir/fakeinstall + mkdir -p $srcdir/fakeinstall make DESTDIR=${srcdir}/fakeinstall install } package() { install -m755 -d ${pkgdir}/etc - mv -v ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc + cp -rv ${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 + cp -av ${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/ + cp -rv ${srcdir}/fakeinstall/usr/lib/bellagio ${pkgdir}/usr/lib + cp -rv ${srcdir}/fakeinstall/usr/lib/d3d ${pkgdir}/usr/lib + cp -rv ${srcdir}/fakeinstall/usr/lib/lib{gbm,glapi}.so* ${pkgdir}/usr/lib/ + cp -rv ${srcdir}/fakeinstall/usr/lib/libOSMesa.so* ${pkgdir}/usr/lib/ + cp -rv ${srcdir}/fakeinstall/usr/lib/libxatracker.so* ${pkgdir}/usr/lib/ - mv -v ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr - mv -v ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/ + cp -rv ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr + cp -rv ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/ + # remove vulkan headers + rm -rf ${pkgdir}/usr/include/vulkan + 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/ - mv -v ${pkgdir}/usr/lib/libEGL.so* ${pkgdir}/usr/lib/mesa/ - mv -v ${pkgdir}/usr/lib/libGLES*.so* ${pkgdir}/usr/lib/mesa/ + cp -rv ${srcdir}/fakeinstall/usr/lib/libGL.so* ${pkgdir}/usr/lib/mesa/ + cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL.so* ${pkgdir}/usr/lib/mesa/ + cp -rv ${srcdir}/fakeinstall/usr/lib/libGLES*.so* ${pkgdir}/usr/lib/mesa/ install -m755 -d "${pkgdir}/usr/share/licenses/mesa" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" diff --git a/remove-libpthread-stubs.patch b/remove-libpthread-stubs.patch new file mode 100644 index 000000000000..efe8aaddd097 --- /dev/null +++ b/remove-libpthread-stubs.patch @@ -0,0 +1,13 @@ +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" + ;; + * ) |