Merge pull request #2767 from uberhacker/update-sommelier-package

Update sommelier from 1382ce0 to 1382ce08

packages/sommelier.rb

@@ -3,24 +3,25 @@ require 'package'
 class Sommelier < Package
   description 'Sommelier works by redirecting X11 and Wayland programs to the built-in ChromeOS wayland server.'
   homepage 'https://chromium.googlesource.com/chromiumos/containers/sommelier'
-  version '1382ce0'
+  version '1382ce08'
   source_url 'https://chromium.googlesource.com/chromiumos/containers/sommelier/+/0.20/README?format=TEXT'
   source_sha256 'b58d799b16d20abf92369fe0749c73f7398996f0afa9933517051778a8bb16c3'
 
   binary_url ({
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-1382ce0-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-1382ce0-chromeos-x86_64.tar.xz',
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-1382ce0-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-1382ce0-chromeos-armv7l.tar.xz',
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-1382ce08-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-1382ce08-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-1382ce08-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-1382ce08-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-       i686: 'd89dd374f3ac1adbd7ba861284506c0b515733dfaa68cb998965f73f8628405b',
-     x86_64: '694a58eead61a518cd99c75d580a84c70f8f63ed4d299bc3f9476f937156cf58',
-    aarch64: '1ce406e7806f37bddbe971f18acc3992cd55d3e6598b396fc26657dfb1128e24',
-     armv7l: '1ce406e7806f37bddbe971f18acc3992cd55d3e6598b396fc26657dfb1128e24',
+    aarch64: '90274ae7d2b2eb0dcc1d87d2f88af6cb01420df30ded001a7671f5fc4739b2b1',
+     armv7l: '90274ae7d2b2eb0dcc1d87d2f88af6cb01420df30ded001a7671f5fc4739b2b1',
+       i686: 'a063a6fe5da3dd7f9f38b389c0ac89c1077fbb1e800cdcfb0d4b8379a0982df2',
+     x86_64: 'c798a59b652619398ed781f9dc726d27da3898dba6a34f5c5ddeee67904871d1',
   })
 
   depends_on 'mesa'
+  depends_on 'xkbcomp'
   depends_on 'xwayland'
   depends_on 'psmisc'
   
@@ -32,14 +33,14 @@ class Sommelier < Package
       system "sed -i 's,-I.,-I. -I#{CREW_PREFIX}/include/pixman-1,g' Makefile"
       system "make PREFIX=#{CREW_PREFIX} SYSCONFDIR=#{CREW_PREFIX}/etc"
       system "echo '#!/bin/bash' > sommelierd"
-      system "echo 'sommelier -X --x-display=\$DISPLAY --no-exit-with-child /bin/sh -c \"#{CREW_PREFIX}/etc/sommelierrc\"' >> sommelierd"
+      system "echo 'sommelier -X --x-display=\$DISPLAY --scale=\$SCALE --no-exit-with-child /bin/sh -c \"#{CREW_PREFIX}/etc/sommelierrc\"' >> sommelierd"
       system "echo '#!/bin/bash' > startsommelier"
-      system "echo 'SOMM=\$(ps ax | grep \"sommelierrc\" | grep -v grep | xargs | cut -d\" \" -f1 2> /dev/null)' >> startsommelier"
+      system "echo 'SOMM=\$(pidof sommelier 2> /dev/null)' >> startsommelier"
       system "echo 'if [ -z \"\$SOMM\" ]; then' >> startsommelier"
       system "echo '  #{CREW_PREFIX}/sbin/sommelierd &' >> startsommelier"
       system "echo '  sleep 3' >> startsommelier"
       system "echo 'fi' >> startsommelier"
-      system "echo 'SOMM=\$(ps ax | grep \"sommelierrc\" | grep -v grep | xargs | cut -d\" \" -f1 2> /dev/null)' >> startsommelier"
+      system "echo 'SOMM=\$(pidof sommelier 2> /dev/null)' >> startsommelier"
       system "echo 'if [ ! -z \"\$SOMM\" ]; then' >> startsommelier"
       system "echo '  echo \"sommelier process \$SOMM is running\"' >> startsommelier"
       system "echo 'else' >> startsommelier"
@@ -47,12 +48,12 @@ class Sommelier < Package
       system "echo '  exit 1' >> startsommelier"
       system "echo 'fi' >> startsommelier"
       system "echo '#!/bin/bash' > stopsommelier"
-      system "echo 'SOMM=\$(ps ax | grep \"sommelierrc\" | grep -v grep | xargs | cut -d\" \" -f1 2> /dev/null)' >> stopsommelier"
+      system "echo 'SOMM=\$(pidof sommelier 2> /dev/null)' >> stopsommelier"
       system "echo 'if [ ! -z \"\$SOMM\" ]; then' >> stopsommelier"
-      system "echo '  killall sommelier' >> stopsommelier"
+      system "echo '  sudo killall sommelier' >> stopsommelier"
       system "echo '  sleep 3' >> stopsommelier"
       system "echo 'fi' >> stopsommelier"
-      system "echo 'SOMM=\$(ps ax | grep \"sommelierrc\" | grep -v grep | xargs | cut -d\" \" -f1 2> /dev/null)' >> stopsommelier"
+      system "echo 'SOMM=\$(pidof sommelier 2> /dev/null)' >> stopsommelier"
       system "echo 'if [ -z \"\$SOMM\" ]; then' >> stopsommelier"
       system "echo '  echo \"sommelier process stopped\"' >> stopsommelier"
       system "echo 'else' >> stopsommelier"
@@ -81,6 +82,7 @@ class Sommelier < Package
     puts "echo 'export XDG_RUNTIME_DIR=/var/run/chrome' >> ~/.bashrc".lightblue
     puts "echo 'export WAYLAND_DISPLAY=wayland-0' >> ~/.bashrc".lightblue
     puts "echo 'export DISPLAY=:0' >> ~/.bashrc".lightblue
+    puts "echo 'export SCALE=1' >> ~/.bashrc".lightblue
     puts "echo 'if [ ! -d /tmp/.X11-unix ]; then' >> ~/.bashrc".lightblue
     puts "echo 'mkdir /tmp/.X11-unix' >> ~/.bashrc".lightblue
     puts "echo 'fi' >> ~/.bashrc".lightblue
@@ -92,6 +94,8 @@ class Sommelier < Package
     puts "To start the sommelier daemon, run 'startsommelier'".lightblue
     puts "To stop the sommelier daemon, run 'stopsommelier'".lightblue
     puts
+    puts "You may need to adjust the SCALE environment variable to get the correct screen size.".lightblue
+    puts
     puts "Please be aware that gui applications may not work without the sommelier daemon running.".orange
     puts
   end