Update Xorg server (#3064)

Makes Xwayland a meta-package as xorg_server contains
the Xwayland binary. Enables more features and X servers.

Use xorg_server instead of xwayland

packages/libsdl.rb

@@ -20,7 +20,7 @@ class Libsdl < Package
      x86_64: '528be8eff53afff1c1cd7973ecda09fc68adbcbea0c22453764ebf0cb7ce0a59',
   })
 
-  depends_on 'xwayland'
+  depends_on 'xorg_server'
   depends_on 'alsa_lib'
   depends_on 'pulseaudio'
   depends_on 'mesa'

packages/libsdl2.rb

@@ -20,7 +20,7 @@ class Libsdl2 < Package
      x86_64: '4a7cf8e0c57bb8485eb1cade392ca919aff3e71b811464adf6a51e1f98488a00',
   })
 
-  depends_on 'xwayland'
+  depends_on 'xorg_server'
   depends_on 'alsa_lib'
   depends_on 'pulseaudio'
   depends_on 'nasm' => :build

packages/libwmf.rb

@@ -23,7 +23,7 @@ class Libwmf < Package
   depends_on 'gtk2'
   depends_on 'libgd'
   depends_on 'libjpeg'
-  depends_on 'xwayland'
+  depends_on 'xorg_server'
 
   def self.build
     system './configure',

packages/sommelier.rb

@@ -22,7 +22,7 @@ class Sommelier < Package
 
   depends_on 'mesa'
   depends_on 'xkbcomp'
-  depends_on 'xwayland'
+  depends_on 'xorg_server'
   depends_on 'psmisc'
   depends_on 'xsetroot'
 

packages/xinit.rb

@@ -16,7 +16,7 @@ class Xinit < Package
   depends_on 'xterm'
   depends_on 'xauth'
   depends_on 'twm'
-  depends_on 'xwayland'
+  depends_on 'xorg_server'
 
   def self.build
     system "./configure",

packages/xorg_server.rb

@@ -3,21 +3,13 @@ require 'package'
 class Xorg_server < Package
   description 'The Xorg Server is the core of the X Window system.'
   homepage 'https://www.x.org'
-  version '1.19.6-0'
-  source_url 'https://www.x.org/releases/individual/xserver/xorg-server-1.19.6.tar.bz2'
-  source_sha256 'a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197'
+  version '1.20.3'
+  source_url 'https://www.x.org/releases/individual/xserver/xorg-server-1.20.3.tar.bz2'
+  source_sha256 '1b3ce466c12cacbe2252b3ad5b0ed561972eef9d09e75900d65fb1e21f9201de'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/xorg_server-1.19.6-0-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/xorg_server-1.19.6-0-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/xorg_server-1.19.6-0-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/xorg_server-1.19.6-0-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: '52b2e20370b8fcef5fd0315e5e817d70f7907dabef3533ad6cdece634b988064',
-     armv7l: '52b2e20370b8fcef5fd0315e5e817d70f7907dabef3533ad6cdece634b988064',
-       i686: '5066413429e3b561679398f23fa5c3d3bf23cbf2de92cbe64e6149c6d7594955',
-     x86_64: 'ae89f5ad22ddc6b109b9ca224565c3857a499308195df69f294b769ad0edae96',
   })
 
 
@@ -26,11 +18,10 @@ class Xorg_server < Package
   depends_on 'xorg_lib'
   depends_on 'xorg_proto'
   depends_on 'libepoxy'
-  depends_on 'libtirpc'  # fix rpc.h missing problem
+  depends_on 'libtirpc'
   depends_on 'font_util'
   depends_on 'libunwind'
-  depends_on 'libwayland'
-  depends_on 'wayland_protocols'
+  depends_on 'wayland'
   depends_on 'nettle'
   depends_on 'libbsd'
   depends_on 'dbus'
@@ -45,16 +36,18 @@ class Xorg_server < Package
              "--libdir=#{CREW_LIB_PREFIX}",
              "--enable-xfree86-utils",
              "--enable-xf86vidmode",
-             "--disable-glamor",
+             "--enable-glamor",
              "--enable-xorg",
              "--enable-xwayland",
-             "--disable-xvfb",
-             "--disable-xnest",
+             "--enable-xvfb",
+             "--enable-xnest",
              "--disable-systemd-logind"
     system "make"
   end
 
   def self.install
     system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+    system "ln", "-sf", "Xwayland", "#{CREW_DEST_PREFIX}/bin/X"
   end
 end
+

packages/xwayland.rb

-require 'package'
-
-class Xwayland < Package
-  description 'X server configured to (only) work with weston'
-  homepage 'https://x.org'
-  version '1.20.1'
-  source_url 'https://www.x.org/releases/individual/xserver/xorg-server-1.20.1.tar.bz2'
-  source_sha256 '59c99fe86fe75b8164c6567bfc6e982aecc2e4a51e6fbac1b842d5d00549e918'
-
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.1-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.1-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.1-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.1-chromeos-x86_64.tar.xz',
-  })
-  binary_sha256 ({
-    aarch64: '18a1711d3dc2383ea5ccb515916db9dbe7c1418c8c603da1a4cdd54b3ae3e3e8',
-     armv7l: '18a1711d3dc2383ea5ccb515916db9dbe7c1418c8c603da1a4cdd54b3ae3e3e8',
-       i686: 'b7ce2f3ba702cd71a03aef6d36c1e739773d8c234db8a25a1e40734f6ad18fd5',
-     x86_64: 'b4bad45b9c4a9a7bd34d61c8b31e5a621133ed7cde17b85668c33b4632477f25',
-  })
-
-  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 'xinit'
-  depends_on 'libxkbcommon'
-  depends_on 'libunwind'
-  depends_on 'font_util'
-  depends_on 'glproto'
-
-  def self.build
-    system "./configure --prefix=#{CREW_PREFIX} --disable-docs --disable-devel-docs --enable-xwayland --disable-xorg --disable-xvfb --disable-xnest --disable-xquartz --disable-xwin"
-    system "make"
-  end
-
-  def self.install
-    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
-    system "ln", "-s", "#{CREW_PREFIX}/bin/Xwayland", "#{CREW_DEST_PREFIX}/bin/X"
-  end
-end