Update Debian build dependencies

Try to organise this better to make it clear which dependencies are
ours, and which we've gotten just because Xvnc is based on xorg-server.

Also update the dependency list to the current state of things.

2 files changed, 94 insertions, 138 deletions

diff --git a/contrib/packages/deb/ubuntu-bionic/debian/control b/contrib/packages/deb/ubuntu-bionic/debian/control
index 25248ca4..184d7eda 100644
--- a/contrib/packages/deb/ubuntu-bionic/debian/control
+++ b/contrib/packages/deb/ubuntu-bionic/debian/control
@@ -4,17 +4,46 @@ Priority: optional
 Maintainer: Brian P. Hinz <bphinz@users.sourceforge.net>
 Standards-Version: 3.8.4
 Build-Depends:
+# TigerVNC dependencies
  debhelper (>= 9),
  dh-autoreconf,
  po-debconf,
  dpkg-dev (>= 1.16.1),
- quilt,
  appstream,
+ cmake,
+ pkg-config,
+ gettext,
+ libpixman-1-dev,
+ zlib1g-dev,
+ libjpeg-turbo8-dev,
+ libavcodec-dev,
+ libavutil-dev,
+ libswscale-dev,
+ libgnutls28-dev,
+ nettle-dev,
+ libgmp-dev,
+ libpam0g-dev,
+ libpng-dev,
+ libxext-dev,
+ libxi-dev,
+ libxtst-dev,
+ libxrandr-dev,
+ libxdamage-dev,
+ libxfixes-dev,
+ libfltk1.3-dev,
+ xorg-server-source,
+ xserver-xorg-dev,
+ openjdk-8-jdk,
+# Xorg dependencies
+ debhelper (>= 9),
+ dh-autoreconf,
+ po-debconf,
+ dpkg-dev (>= 1.16.1),
+ quilt,
  lsb-release,
  pkg-config,
  bison,
  flex,
- xauth,
  xutils-dev (>= 1:7.6+4),
  xfonts-utils (>= 1:7.5+1),
  x11proto-bigreqs-dev (>= 1:1.1.0),
@@ -73,66 +102,19 @@ Build-Depends:
  libxv-dev,
  libxinerama-dev,
  libxshmfence-dev (>= 1.1) [!hurd-i386],
+# glamor
  libepoxy-dev [linux-any kfreebsd-any],
  libegl1-mesa-dev [linux-any kfreebsd-any],
  libgbm-dev (>= 10.2) [linux-any kfreebsd-any],
- libxcb1-dev,
- libxcb-xkb-dev,
- libxcb-shape0-dev,
- libxcb-render0-dev,
- libxcb-render-util0-dev,
- libxcb-util0-dev,
- libxcb-image0-dev,
- libxcb-icccm4-dev,
- libxcb-shm0-dev,
- libxcb-keysyms1-dev,
- libxcb-randr0-dev,
- libxcb-xv0-dev,
- libxcb-glx0-dev,
- libxcb-xf86dri0-dev (>= 1.6),
+# unit tests
  xkb-data,
  x11-xkb-utils,
+# arc4random_buf(), getpeereid()
  libbsd-dev,
- libwayland-dev [linux-any],
- wayland-protocols (>= 1.9) [linux-any],
+#logind
  libdbus-1-dev (>= 1.0) [linux-any],
+# systemd-daemon
  libsystemd-dev [linux-any],
- libmirclient-dev (>= 0.13.1) [!powerpc !ppc64el !s390x],
- mir-client-platform-mesa-dev,
- zlib1g-dev,
- libjpeg-turbo8-dev,
- perl-modules,
- cmake,
- gnutls-dev,
- nettle-dev,
- libgmp-dev,
- libpam0g-dev,
- libpng-dev,
- automake,
- autoconf,
- libtool,
- pkg-config,
- openjdk-8-jdk,
- xorg-server-source,
- libfltk1.3-dev,
- fluid,
- curl,
- bzip2,
- quilt,
- libosmesa6-dev,
- libgl1-mesa-dri,
- libgl1-mesa-glx,
- libxft-dev,
- xfonts-base,
- libexpat1-dev,
- libfontconfig1-dev,
- libglu1-mesa-dev,
- libxcursor-dev,
- libxrandr-dev,
- libcairo2-dev,
- libavcodec-dev,
- libavutil-dev,
- libswscale-dev
 Homepage: http://www.tigervnc.com
 
 Package: tigervncserver
diff --git a/contrib/packages/deb/ubuntu-focal/debian/control b/contrib/packages/deb/ubuntu-focal/debian/control
index 0a939edd..b668e436 100644
--- a/contrib/packages/deb/ubuntu-focal/debian/control
+++ b/contrib/packages/deb/ubuntu-focal/debian/control
@@ -4,44 +4,50 @@ Priority: optional
 Maintainer: Brian P. Hinz <bphinz@users.sourceforge.net>
 Standards-Version: 3.8.4
 Build-Depends:
+# TigerVNC dependencies
  debhelper (>= 9),
  dh-autoreconf,
  po-debconf,
  dpkg-dev (>= 1.16.1),
- quilt,
  appstream,
+ cmake,
+ pkg-config,
+ gettext,
+ libpixman-1-dev,
+ zlib1g-dev,
+ libjpeg-turbo8-dev,
+ libavcodec-dev,
+ libavutil-dev,
+ libswscale-dev,
+ libgnutls28-dev,
+ nettle-dev,
+ libgmp-dev,
+ libpam0g-dev,
+ libpng-dev,
+ libxext-dev,
+ libxi-dev,
+ libxtst-dev,
+ libxrandr-dev,
+ libxdamage-dev,
+ libxfixes-dev,
+ libfltk1.3-dev,
+ xorg-server-source,
+ xserver-xorg-dev,
+ openjdk-8-jdk,
+# Xorg dependencies
+ debhelper (>= 10),
+ po-debconf,
+ dpkg-dev (>= 1.16.1),
+ quilt,
  lsb-release,
  pkg-config,
  bison,
  flex,
- xauth,
  xutils-dev (>= 1:7.6+4),
  xfonts-utils (>= 1:7.5+1),
- x11proto-bigreqs-dev (>= 1:1.1.0),
- x11proto-composite-dev (>= 1:0.4),
- x11proto-core-dev (>= 7.0.31),
- x11proto-damage-dev (>= 1.1),
- x11proto-fixes-dev (>= 1:5.0),
- x11proto-fonts-dev (>= 2.1.3),
- x11proto-kb-dev (>= 1.0.3),
- x11proto-xinerama-dev,
- x11proto-randr-dev (>= 1.5.0),
- x11proto-record-dev (>= 1.13.99.1),
- x11proto-render-dev (>= 2:0.11),
- x11proto-resource-dev (>= 1.2.0),
- x11proto-scrnsaver-dev,
- x11proto-video-dev,
- x11proto-xcmisc-dev (>= 1.2.0),
- x11proto-xext-dev (>= 7.2.99.901),
- x11proto-xf86bigfont-dev (>= 1.2.0),
- x11proto-xf86dga-dev (>= 2.0.99.1),
- x11proto-xf86vidmode-dev (>= 2.2.99.1),
- x11proto-present-dev,
- x11proto-dri3-dev,
+ x11proto-dev (>= 2018.4),
  xtrans-dev (>= 1.3.5),
  libxau-dev (>= 1:1.0.5-2),
- x11proto-input-dev (>= 2.3),
- x11proto-dri2-dev (>= 2.8),
  libxdmcp-dev (>= 1:0.99.1),
  libxfont-dev (>= 1:2.0.1),
  libxkbfile-dev (>= 1:0.99.1),
@@ -52,16 +58,14 @@ Build-Depends:
  libudev-dev (>= 151-3) [linux-any],
  libselinux1-dev (>= 2.0.80) [linux-any],
  libaudit-dev [linux-any],
- x11proto-xf86dri-dev (>= 2.1.0),
- libdrm-dev (>= 2.4.46) [!hurd-i386],
- x11proto-gl-dev (>= 1.4.17),
+ libdrm-dev (>= 2.4.89) [!hurd-i386],
  libgl1-mesa-dev (>= 9.2),
+ libunwind-dev [amd64 arm64 armel armhf hppa i386 ia64 mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4],
  libxmuu-dev (>= 1:0.99.1),
  libxext-dev (>= 1:0.99.1),
  libx11-dev (>= 2:1.6),
  libxrender-dev (>= 1:0.9.0),
  libxi-dev (>= 2:1.6.99.1),
- x11proto-dmx-dev (>= 1:2.2.99.1),
  libdmx-dev (>= 1:1.0.1),
  libxpm-dev (>= 1:3.5.3),
  libxaw7-dev (>= 1:0.99.1),
@@ -73,67 +77,37 @@ Build-Depends:
  libxv-dev,
  libxinerama-dev,
  libxshmfence-dev (>= 1.1) [!hurd-i386],
+# glamor
  libepoxy-dev [linux-any kfreebsd-any],
  libegl1-mesa-dev [linux-any kfreebsd-any],
  libgbm-dev (>= 10.2) [linux-any kfreebsd-any],
- libxcb1-dev,
- libxcb-xkb-dev,
- libxcb-shape0-dev,
- libxcb-render0-dev,
- libxcb-render-util0-dev,
- libxcb-util0-dev,
- libxcb-image0-dev,
- libxcb-icccm4-dev,
- libxcb-shm0-dev,
- libxcb-keysyms1-dev,
- libxcb-randr0-dev,
- libxcb-xv0-dev,
- libxcb-glx0-dev,
- libxcb-xf86dri0-dev (>= 1.6),
+## XCB bits for Xephyr
+# libxcb1-dev,
+# libxcb-xkb-dev,
+# libxcb-shape0-dev,
+# libxcb-render0-dev,
+# libxcb-render-util0-dev,
+# libxcb-util0-dev,
+# libxcb-image0-dev,
+# libxcb-icccm4-dev,
+# libxcb-shm0-dev,
+# libxcb-keysyms1-dev,
+# libxcb-randr0-dev,
+# libxcb-xv0-dev,
+# libxcb-glx0-dev,
+# libxcb-xf86dri0-dev (>= 1.6),
+# unit tests
  xkb-data,
  x11-xkb-utils,
+# arc4random_buf(), getpeereid()
  libbsd-dev,
- libwayland-dev [linux-any],
- wayland-protocols (>= 1.9) [linux-any],
- libdbus-1-dev (>= 1.0) [linux-any],
- libsystemd-dev [linux-any],
- libmirclient-dev (>= 0.13.1) [!powerpc !ppc64el !s390x],
- mir-client-platform-mesa-dev,
- zlib1g-dev,
- libjpeg-turbo8-dev,
- perl-modules,
- cmake,
- gnutls-dev,
- nettle-dev,
- libgmp-dev,
- libpam0g-dev,
- libpng-dev,
- automake,
- autoconf,
- libtool,
- pkg-config,
- openjdk-8-jdk,
- xorg-server-source,
- libfltk1.3-dev,
- fluid,
- curl,
- bzip2,
- quilt,
- libosmesa6-dev,
- libgl1-mesa-dri,
- libgl1-mesa-glx,
- libxft-dev,
- xfonts-base,
- libexpat1-dev,
- libfontconfig1-dev,
- libglu1-mesa-dev,
- libxcursor-dev,
- libxrandr-dev,
- libcairo2-dev,
- mesa-common-dev,
- libavcodec-dev,
- libavutil-dev,
- libswscale-dev
+## xwayland
+# libwayland-dev [linux-any],
+# wayland-protocols (>= 1.10) [linux-any],
+#logind
+  libdbus-1-dev (>= 1.0) [linux-any],
+# systemd-daemon
+  libsystemd-dev [linux-any],
 Homepage: http://www.tigervnc.com
 
 Package: tigervncserver