From c3f375f5a445ae9fa7ef282b0dc8bae80a3b43d9 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Fri, 30 Jun 2017 15:54:06 +0000
Subject: graphics-common: Update LLVM, libdrm, Mesa, ragel and fontconfig

Upgrades:

  * LLVM (4.0.1)
  * libdrm (2.4.81)
  * Mesa (17.1.3)
  * ragel (6.10)
  * fontconfig (2.12.3)

This fixes compile failures in Mesa that occur with GCC 7.1. The libdrm
and LLVM updates are required for latest Mesa.

The LLVM AMDGPU driver is needed by Mesa for the r600 driver. However,
the r600 driver is disabled in Mesa until we integrate libelf

Ragel is updated to fix a build error with GCC 7.

Fontconfig is updated to fix this:

    In file included from fcmatch.c:287:0:
    fcobjs.h:54:3: error: 'PRI_CHAR_WIDTH_STRONG' undeclared here (not in a function); did you mean 'PRI_WIDTH_STRONG'?
     FC_OBJECT (CHAR_WIDTH,  FcTypeInteger, NULL)
       ^~~~~~~~~~~~~~~~~~~~~
       PRI_WIDTH_STRONG
    fcobjs.h:54:26: error: 'PRI_CHAR_WIDTH_WEAK' undeclared here (not in a function); did you mean 'PRI_WIDTH_WEAK'?
     FC_OBJECT (CHAR_WIDTH,  FcTypeInteger, NULL)
                              ^~~~~~~~~~~~~~~~~~~
                              PRI_WIDTH_WEAK
---
 strata/graphics-common.morph  |  8 ++++----
 strata/libdrm-common.morph    |  4 ++--
 strata/llvm-common.morph      |  4 ++--
 strata/llvm-common/llvm.morph | 27 ++++++++++++++++++++-------
 strata/mesa-common.morph      |  4 ++--
 strata/mesa-common/mesa.morph |  2 +-
 6 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
index c3848719..f99e6093 100644
--- a/strata/graphics-common.morph
+++ b/strata/graphics-common.morph
@@ -23,8 +23,8 @@ chunks:
   build-system: autotools
 - name: ragel-tarball
   repo: upstream:ragel-tarball
-  ref: eafd7a3974e8605fd02794269db6114a3446e016
-  unpetrify-ref: ragel-6.9
+  ref: d13d67a31c451ebd78ce708a4ef85803d429f158
+  unpetrify-ref: ragel-6.10
   build-system: autotools
   build-depends:
   - colm-tarball
@@ -44,8 +44,8 @@ chunks:
 - name: fontconfig
   morph: strata/graphics-common/fontconfig.morph
   repo: upstream:fontconfig
-  ref: 9260b7ec39c34ce68d74e16d47917290a8c3f35a
-  unpetrify-ref: 2.11.1
+  ref: 690f822a1b26b089d86e9843746cab80f3c07fe3
+  unpetrify-ref: 2.12.3
   build-depends:
   - freetype2-harfbuzz
 - name: freefont-otf
diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph
index 2155019c..ebaf207e 100644
--- a/strata/libdrm-common.morph
+++ b/strata/libdrm-common.morph
@@ -11,7 +11,7 @@ chunks:
 - name: drm
   repo: upstream:drm
   morph: strata/libdrm-common/drm.morph
-  ref: a44c9c31b7b38b3eedf3d26648f9e68dcc377c4c
-  unpetrify-ref: libdrm-2.4.71
+  ref: 81312f3730c14a2930a7784493701809c7f04a26
+  unpetrify-ref: libdrm-2.4.81
   build-depends:
   - xorg-lib-libpciaccess
diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph
index 794a7fc5..66bfed43 100644
--- a/strata/llvm-common.morph
+++ b/strata/llvm-common.morph
@@ -6,5 +6,5 @@ chunks:
 - name: llvm
   morph: strata/llvm-common/llvm.morph
   repo: upstream:llvm
-  ref: 19ade095e8c3ea61f84b71074433309f0c7c7b3b
-  unpetrify-ref: release_36
+  ref: c8fccc53ed66d505898f8850bcc690c977a7c9a7
+  unpetrify-ref: release_40
diff --git a/strata/llvm-common/llvm.morph b/strata/llvm-common/llvm.morph
index dca81043..08c32fa5 100644
--- a/strata/llvm-common/llvm.morph
+++ b/strata/llvm-common/llvm.morph
@@ -1,11 +1,24 @@
 name: llvm
 kind: chunk
 description: Low Level Virtual Machine
-build-system: autotools
+build-system: cmake
 configure-commands:
-- ./configure --prefix="$PREFIX" --sysconfdir=/etc
-              --enable-shared
-              --enable-targets=host
-              --enable-optimized
-              --disable-assertions
-              --with-python=/usr/bin/python3
+- |
+  mkdir build/
+  cd build/
+
+  CC=gcc CXX=g++                              \
+  cmake -DCMAKE_INSTALL_PREFIX="$PREFIX"      \
+        -DLLVM_ENABLE_FFI=ON                  \
+        -DCMAKE_BUILD_TYPE=Release            \
+        -DLLVM_BUILD_LLVM_DYLIB=ON            \
+        -DLLVM_TARGETS_TO_BUILD="host;AMDGPU" \
+        -Wno-dev ..
+build-commands:
+- |
+  cd build/
+  make
+install-commands:
+- |
+  cd build/
+  make DESTDIR="$DESTDIR" install
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index 15e660c7..79215bdc 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -11,8 +11,8 @@ chunks:
 - name: mesa
   morph: strata/mesa-common/mesa.morph
   repo: upstream:mesa
-  ref: 3255d10da4c2703bfdfcefd8f59b0d8f21dbb43f
-  unpetrify-ref: mesa-13.0.4
+  ref: f60875e211388e299724063af40c01738cc5d819
+  unpetrify-ref: mesa-17.1.3
 - name: libepoxy
   repo: upstream:libepoxy
   ref: e2c33af5bfcfc9d168f9e776156dd47c33f428b3
diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph
index e7a3eee7..abd58b87 100644
--- a/strata/mesa-common/mesa.morph
+++ b/strata/mesa-common/mesa.morph
@@ -12,7 +12,7 @@ configure-commands:
     ;;
   *)
     DRIDRIVERS=yes
-    GALLIUMDRIVERS=r300,r600,svga,swrast,virgl,swr
+    GALLIUMDRIVERS=r300,svga,swrast,virgl,swr
     VULKANDRIVERS=intel
     ;;
   esac
-- 
cgit v1.2.1