rebase and fix conflicts

2023-03-07 07:23:03 -05:00
parent 8a9fd18228 47bdc828c1
commit 252fc2f20c
53 changed files with 1398 additions and 114 deletions
--- a/builder/dockerfile.opensuse_15.build
+++ b/builder/dockerfile.opensuse_15.build
@@ -19,6 +19,7 @@ RUN zypper install -ny \
  gzip \
  lbzip2 \
  libbz2-devel \
+  libgbm-devel \
  libGLw-devel \
  libgnutls-devel \
  libopenssl-devel \
@@ -26,6 +27,7 @@ RUN zypper install -ny \
  libtiff-devel \
  libXfont2-devel \
  libxkbcommon-x11-devel \
+  libxshmfence-devel \
  make \
  Mesa-dri \
  Mesa-libglapi-devel \