diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 1-3-clover-Fix-build-after-llvm-r332881.patch | 40 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
3 files changed, 5 insertions, 51 deletions
@@ -1,6 +1,6 @@ pkgbase = mesa-git pkgdesc = an open-source implementation of the OpenGL specification, git version - pkgver = 18.2.0_devel.102412.79fe00efb4 + pkgver = 18.2.0_devel.102461.d3ff478732 pkgrel = 1 url = http://mesa3d.sourceforge.net arch = x86_64 @@ -51,10 +51,8 @@ pkgbase = mesa-git conflicts = mesa-vdpau source = mesa::git://anongit.freedesktop.org/mesa/mesa source = LICENSE - source = 1-3-clover-Fix-build-after-llvm-r332881.patch sha512sums = SKIP sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2 - sha512sums = 650beb81d694b3042aaf2933bd8a97ca0e57a917c84292bfd6f0a284e1ba8b94c4030f855cf82daa76dd05f7a53394db226dff9f2bdc00d8b1d3106de57ae6d5 pkgname = mesa-git diff --git a/1-3-clover-Fix-build-after-llvm-r332881.patch b/1-3-clover-Fix-build-after-llvm-r332881.patch deleted file mode 100644 index 49d0bfdebbcb..000000000000 --- a/1-3-clover-Fix-build-after-llvm-r332881.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/gallium/state_trackers/clover/llvm/codegen/native.cpp b/src/gallium/state_trackers/clover/llvm/codegen/native.cpp -index 409f8ac32f..4b589ef50c 100644 ---- a/src/gallium/state_trackers/clover/llvm/codegen/native.cpp -+++ b/src/gallium/state_trackers/clover/llvm/codegen/native.cpp -@@ -126,13 +126,12 @@ namespace { - { - compat::pass_manager pm; - ::llvm::raw_svector_ostream os { data }; -- compat::raw_ostream_to_emit_file fos(os); - - mod.setDataLayout(compat::get_data_layout(*tm)); - tm->Options.MCOptions.AsmVerbose = - (ft == TargetMachine::CGFT_AssemblyFile); - -- if (tm->addPassesToEmitFile(pm, fos, ft)) -+ if (compat::add_passes_to_emit_file(*tm, pm, os, ft)) - fail(r_log, build_error(), "TargetMachine can't emit this file"); - - pm.run(mod); -diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp b/src/gallium/state_trackers/clover/llvm/compat.hpp -index 2e070b2eef..96ba798970 100644 ---- a/src/gallium/state_trackers/clover/llvm/compat.hpp -+++ b/src/gallium/state_trackers/clover/llvm/compat.hpp -@@ -245,6 +245,16 @@ namespace clover { - ::llvm::WriteBitcodeToFile(mod, os); - #else - ::llvm::WriteBitcodeToFile(&mod, os); -+#endif -+ } -+ template<typename TM, typename PM, typename OS, typename FT> -+ bool add_passes_to_emit_file(TM &tm, PM &pm, OS &os, FT &ft) -+ { -+ compat::raw_ostream_to_emit_file fos(os); -+#if HAVE_LLVM >= 0x0700 -+ return tm.addPassesToEmitFile(pm, fos, nullptr, ft); -+#else -+ return tm.addPassesToEmitFile(pm, fos, ft); - #endif - } - } @@ -12,7 +12,7 @@ pkgbase=mesa-git pkgname=('mesa-git') pkgdesc="an open-source implementation of the OpenGL specification, git version" -pkgver=18.2.0_devel.102412.79fe00efb4 +pkgver=18.2.0_devel.102461.d3ff478732 pkgrel=1 arch=('x86_64') makedepends=('git' 'python2-mako' 'llvm-svn' 'clang-svn' 'xorgproto' @@ -27,17 +27,13 @@ url="http://mesa3d.sourceforge.net" license=('custom') source=('mesa::git://anongit.freedesktop.org/mesa/mesa' 'LICENSE' - '1-3-clover-Fix-build-after-llvm-r332881.patch' ) sha512sums=('SKIP' '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2' - '650beb81d694b3042aaf2933bd8a97ca0e57a917c84292bfd6f0a284e1ba8b94c4030f855cf82daa76dd05f7a53394db226dff9f2bdc00d8b1d3106de57ae6d5') +) prepare() { cd mesa - # https://bugs.freedesktop.org/show_bug.cgi?id=106619 - # https://patchwork.freedesktop.org/patch/224857/ - patch -Np1 -i ../1-3-clover-Fix-build-after-llvm-r332881.patch autoreconf -vfi } @@ -118,9 +114,9 @@ package_mesa-git() { make DESTDIR="$pkgdir" install # remove files provided by libglvnd - rm "$pkgdir"/usr/lib/libGLESv{1_CM,2}.so* + rm "$pkgdir"/usr/lib/libGLESv{1_CM,2}.so* - # remove files provided by wayland + # remove files provided by wayland rm "$pkgdir"/usr/lib/libwayland-egl.so* rm "$pkgdir"/usr/lib/pkgconfig/wayland-egl.pc |