KASM-3806 fix builds and deps for oracle and opensuse

builder/build.sh

@@ -89,18 +89,30 @@ ensure_crashpad_can_fetch_line_number_by_address
 if [ "${KASMVNC_BUILD_OS}" == "opensuse" ]; then
   sed -i 's/LIBGL="gl >= 7.1.0"/LIBGL="gl >= 1.1"/g' configure
 fi
-./configure --prefix=/opt/kasmweb \
-	--with-xkb-path=/usr/share/X11/xkb \
-	--with-xkb-output=/var/lib/xkb \
-	--with-xkb-bin-directory=/usr/bin \
-	--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins" \
-  --with-sha1=libcrypto \
-	--without-dtrace --disable-dri \
+./configure \
+        --disable-config-hal \
+        --disable-config-udev \
+        --disable-dmx \
+        --disable-dri \
+        --disable-dri2 \
+        --disable-kdrive \
         --disable-static \
-	--disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \
-	--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
-	--disable-config-hal --disable-config-udev \
-	--disable-dri2 --enable-glx --disable-xwayland
+        --disable-xephyr \
+        --disable-xinerama \
+        --disable-xnest \
+        --disable-xorg \
+        --disable-xvfb \
+        --disable-xwayland \
+        --disable-xwin \
+        --enable-dri3 \
+        --enable-glx \
+        --prefix=/opt/kasmweb \
+        --with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins" \
+        --without-dtrace \
+        --with-sha1=libcrypto \
+        --with-xkb-bin-directory=/usr/bin \
+        --with-xkb-output=/var/lib/xkb \
+        --with-xkb-path=/usr/share/X11/xkb
 make -j5
 
 # modifications for the servertarball

builder/dockerfile.opensuse_15.build

@@ -19,6 +19,7 @@ RUN zypper install -ny \
   gzip \
   lbzip2 \
   libbz2-devel \
+  libgbm-devel \
   libGLw-devel \
   libgnutls-devel \
   libjpeg8-devel \
@@ -27,6 +28,7 @@ RUN zypper install -ny \
   libtiff-devel \
   libXfont2-devel \
   libxkbcommon-x11-devel \
+  libxshmfence-devel \
   make \
   Mesa-dri \
   Mesa-libglapi-devel \

builder/dockerfile.oracle_8.build

@@ -5,27 +5,31 @@ ENV KASMVNC_BUILD_OS_CODENAME 8
 ENV XORG_VER 1.20.10
 
 # Install from stock repos
-RUN dnf install -y \
-  bzip2-devel \
-  ca-certificates \
-  cmake \
-  dnf-plugins-core \
-  gcc \
-  gcc-c++ \
-  git \
-  gnutls-devel \
-  libjpeg-turbo-devel \
-  libpng-devel \
-  libtiff-devel \
-  make \
-  mesa-dri-drivers \
-  openssl-devel \
-  openssl-devel \
-  patch \
-  tigervnc-server \
-  wget \
-  xorg-x11-font-utils \
-  zlib-devel
+RUN \
+  dnf install -y 'dnf-command(config-manager)' && \
+  dnf config-manager --set-enabled ol8_codeready_builder && \
+  dnf install -y \
+    bzip2-devel \
+    ca-certificates \
+    cmake \
+    dnf-plugins-core \
+    gcc \
+    gcc-c++ \
+    git \
+    gnutls-devel \
+    libjpeg-turbo-devel \
+    libpng-devel \
+    libtiff-devel \
+    libxshmfence-devel \
+    make \
+    mesa-dri-drivers \
+    mesa-libgbm-devel \
+    openssl-devel \
+    patch \
+    tigervnc-server \
+    wget \
+    xorg-x11-font-utils \
+    zlib-devel
 
 # Enable additional repos (epel, powertools, and fusion)
 RUN dnf config-manager --set-enabled ol8_codeready_builder

opensuse/kasmvncserver.spec

@@ -7,7 +7,7 @@ License: GPLv2+
 URL: https://github.com/kasmtech/KasmVNC
 
 BuildRequires: rsync
-Requires: xauth, hostname, libxkbcommon-x11-0, xkeyboard-config, x11-tools, openssl, perl, libpixman-1-0, libjpeg8, libgomp1, libXfont2-2, libXdmcp6, libglvnd, xkbcomp, perl-Switch, perl-YAML-Tiny, perl-Hash-Merge-Simple, perl-Scalar-List-Utils, perl-List-MoreUtils, perl-Try-Tiny
+Requires: xauth, hostname, libxkbcommon-x11-0, xkeyboard-config, x11-tools, openssl, perl, libpixman-1-0, libjpeg8, libgomp1, libXfont2-2, libXdmcp6, libglvnd, xkbcomp, perl-Switch, perl-YAML-Tiny, perl-Hash-Merge-Simple, perl-Scalar-List-Utils, perl-List-MoreUtils, perl-Try-Tiny, libgbm1, libxshmfence1
 Conflicts: tigervnc, tigervnc-x11vnc
 
 %description

oracle/kasmvncserver.spec

@@ -7,7 +7,7 @@ License: GPLv2+
 URL: https://github.com/kasmtech/KasmVNC
 
 BuildRequires: rsync
-Requires: xorg-x11-xauth, xorg-x11-xkb-utils, xkeyboard-config, xorg-x11-server-utils, openssl, perl, perl-Switch, perl-YAML-Tiny, perl-Hash-Merge-Simple, perl-Scalar-List-Utils, perl-List-MoreUtils, perl-Try-Tiny, hostname
+Requires: xorg-x11-xauth, xorg-x11-xkb-utils, xkeyboard-config, xorg-x11-server-utils, openssl, perl, perl-Switch, perl-YAML-Tiny, perl-Hash-Merge-Simple, perl-Scalar-List-Utils, perl-List-MoreUtils, perl-Try-Tiny, hostname, mesa-libgbm, libxshmfence
 Conflicts: tigervnc-server, tigervnc-server-minimal
 
 %description