Merge pull request #5402 from satmandu/graphics_updates

new mesa and xorg binaries

packages/mesa.rb

@@ -3,26 +3,25 @@ require 'package'
 class Mesa < Package
   description 'Open-source implementation of the OpenGL specification'
   homepage 'https://www.mesa3d.org'
-  @_ver = '20.3.3'
+  @_ver = '21.0.0'
   version @_ver
   compatibility 'all'
   source_url "https://mesa.freedesktop.org/archive/mesa-#{@_ver}.tar.xz"
-  source_sha256 'f74e212d4838e982a10c203ffa998817d1855c5cf448ae87b58f96edea61d156'
+  source_sha256 'e6204e98e6a8d77cf9dc5d34f99dd8e3ef7144f3601c808ca0dd26ba522e0d84'
 
-  binary_url ({
-     aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/mesa-20.3.3-chromeos-armv7l.tar.xz',
-      armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/mesa-20.3.3-chromeos-armv7l.tar.xz',
-        i686: 'https://dl.bintray.com/chromebrew/chromebrew/mesa-20.3.3-chromeos-i686.tar.xz',
-      x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/mesa-20.3.3-chromeos-x86_64.tar.xz',
+  binary_url({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/mesa-21.0.0-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/mesa-21.0.0-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/mesa-21.0.0-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/mesa-21.0.0-chromeos-x86_64.tar.xz'
   })
-  binary_sha256 ({
-     aarch64: '6831a61a10ae5ad851a1de731d49f26d9131afa94c2c41d4686c846b2b4a588b',
-      armv7l: '6831a61a10ae5ad851a1de731d49f26d9131afa94c2c41d4686c846b2b4a588b',
-        i686: 'f41ddb3e53293fc0432a5ce347c8555c0e63cf78a48620d55391d7fb0fd52de5',
-      x86_64: '59d6d87f66a5ae4c1c540ad57e95d970d5ab691a73eefceffa59d27f798ed69f',
+  binary_sha256({
+    aarch64: '98e8f7551123894e27cba186b902e907d4d4676628f0c6c293c66339512b79da',
+     armv7l: '98e8f7551123894e27cba186b902e907d4d4676628f0c6c293c66339512b79da',
+       i686: 'e9d7a58868a977a3eba49aea0012b80fa01bcf2185b79e809b612d1c3d0e4e01',
+     x86_64: '65464f8aa7a9d88ef46326463654c86fcd882446d686585e92e5d546932acf8e'
   })
 
-  depends_on 'llvm' => :build
   depends_on 'elfutils'
   depends_on 'glslang'
   depends_on 'libdrm'
@@ -38,23 +37,27 @@ class Mesa < Package
   depends_on 'vulkan_headers' => :build
   depends_on 'vulkan_icd_loader'
   depends_on 'wayland_protocols'
-  depends_on 'zstd'
   depends_on 'lm_sensors'
 
   def self.build
-    system "pip3 uninstall -y Mako MarkupSafe || :"
+    case ARCH
+    when 'i686'
+      @vk = 'intel,swrast'
+      @galliumdrivers = 'swrast,svga,virgl,swr,lima,zink,d3d12'
+    when 'x86_64', 'aarch64', 'armv7l'
+      @vk = 'auto'
+      @galliumdrivers = 'auto'
+    end
+    system 'pip3 uninstall -y Mako MarkupSafe || :'
     system "pip3 install --no-warn-script-location --prefix \"#{CREW_PREFIX}\" --root \"#{CREW_DEST_DIR}\" Mako"
     system "pip3 install --prefix \"#{CREW_PREFIX}\" Mako"
-
-    # With llvm 11.1 b_asneeded=false appears to be needed to get lld to be used.
-    #
-    system "meson #{CREW_MESON_OPTIONS} \
-    -Dc_link_args='-fuse-ld=lld' \
-    -Dcpp_link_args='-fuse-ld=lld' \
+    system "meson #{CREW_MESON_LTO_OPTIONS} \
     -Db_asneeded=false \
+    -Dvulkan-drivers=#{@vk} \
+    -Dgallium-drivers=#{@galliumdrivers} \
      builddir"
-    system "meson configure builddir"
-    system "ninja -C builddir"
+    system 'meson configure builddir'
+    system 'ninja -C builddir'
   end
 
   def self.install

packages/xorg_server.rb

@@ -4,28 +4,37 @@ class Xorg_server < Package
   description 'The Xorg Server is the core of the X Window system.'
   homepage 'https://www.x.org'
   @_ver = '1.20.10'
-  version @_ver + '-1'
+  version "#{@_ver}-1"
   compatibility 'all'
   source_url "https://github.com/freedesktop/xorg-xserver/archive/xorg-server-#{@_ver}.tar.gz"
   source_sha256 '499d2b79fdf78e2e06b0c17a4d735fe25ba9d44f689e06a7e82612c35083c4ad'
 
+  binary_url({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/xorg_server-1.20.10-1-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/xorg_server-1.20.10-1-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/xorg_server-1.20.10-1-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/xorg_server-1.20.10-1-chromeos-x86_64.tar.xz'
+  })
+  binary_sha256({
+    aarch64: '0ce4d77d557a5cc438e7257c157584eb8d2e62f88a250e3f0abd1d35e5f76154',
+     armv7l: '0ce4d77d557a5cc438e7257c157584eb8d2e62f88a250e3f0abd1d35e5f76154',
+       i686: '1886cb710830cb55660b407c9bcc31b8a1ca85dad3115778ea561fd46b673f19',
+     x86_64: '5cc436f10f8c8219284b629597f912d08ebeb1a221ebb16dbe97902a4045f706'
+  })
+
   depends_on 'libepoxy'
-  depends_on 'xorg_proto'
   depends_on 'libxtrans'
   depends_on 'libxkbfile'
   depends_on 'wayland'
   depends_on 'eudev'
   depends_on 'libxfont'
   depends_on 'libbsd'
-  depends_on 'nettle'
-  depends_on 'libtirpc'
   depends_on 'pixman'
   depends_on 'graphite'
   depends_on 'libxkbcommon'
   depends_on 'libunwind'
   depends_on 'font_util'
   depends_on 'xorg_lib'
-  depends_on 'libtirpc'
   depends_on 'font_util'
   depends_on 'libbsd'
   depends_on 'dbus'
@@ -41,12 +50,12 @@ class Xorg_server < Package
   depends_on 'mesa'
 
   case ARCH
-    when 'armv7l', 'aarch64'
-      PEER_CMD_PREFIX='/lib/ld-linux-armhf.so.3'
-    when 'i686'
-      PEER_CMD_PREFIX='/lib/ld-linux-i686.so.2'
-    when 'x86_64'
-      PEER_CMD_PREFIX='/lib64/ld-linux-x86-64.so.2'
+  when 'armv7l', 'aarch64'
+    @peer_cmd_prefix = '/lib/ld-linux-armhf.so.3'
+  when 'i686'
+    @peer_cmd_prefix = '/lib/ld-linux-i686.so.2'
+  when 'x86_64'
+    @peer_cmd_prefix = '/lib64/ld-linux-x86-64.so.2'
   end
 
   def self.build
@@ -85,7 +94,7 @@ fi
 basedir=${base%/*}
 # TODO(crbug/1003841): Remove LD_ARGV0 once
 # ld.so supports forwarding the binary name.
-LD_ARGV0=\"$0\" LD_ARGV0_REL=\"../bin/Xwayland.sh\" exec   \"${basedir}/..#{PEER_CMD_PREFIX}\"   --library-path \"${basedir}/../#{ARCH_LIB}\"   --inhibit-rpath ''   \"${base}.elf\"   \"$@\"
+LD_ARGV0=\"$0\" LD_ARGV0_REL=\"../bin/Xwayland.sh\" exec   \"${basedir}/..#{@peer_cmd_prefix}\"   --library-path \"${basedir}/../#{ARCH_LIB}\"   --inhibit-rpath ''   \"${base}.elf\"   \"$@\"
 EOF"
   end