diff --git a/builder/dockerfile.opensuse_15.build b/builder/dockerfile.opensuse_15.build index 954ada8..800c752 100644 --- a/builder/dockerfile.opensuse_15.build +++ b/builder/dockerfile.opensuse_15.build @@ -45,7 +45,10 @@ RUN zypper install -ny \ xorg-x11-util-devel \ zlib-devel -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-14 100 +RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 140 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-14 \ + --slave /usr/bin/gcov gcov /usr/bin/gcov-14 + RUN useradd -u 1000 docker && \ groupadd -g 1000 docker && \ diff --git a/builder/scripts/build-webp b/builder/scripts/build-webp index a6b2fd0..e5e19f1 100755 --- a/builder/scripts/build-webp +++ b/builder/scripts/build-webp @@ -2,7 +2,7 @@ set -euo pipefail -WEBP_VERSION="1.2.4" +WEBP_VERSION="1.5.0" WEBP_TAR_URL="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz" WEBP_TAR_FILE="/tmp/libwebp-${WEBP_VERSION}.tar.gz" WEBP_SRC_DIR="/tmp/libwebp-${WEBP_VERSION}" @@ -21,7 +21,7 @@ prepare_source() { build_and_install() { export MAKEFLAGS=-j$(nproc) - ./configure --enable-static --disable-shared + ./configure --enable-static --disable-shared --enable-threading --enable-sse2 --enable-neon make make install } diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am index a25d214..c3226eb 100644 --- a/unix/xserver/hw/vnc/Makefile.am +++ b/unix/xserver/hw/vnc/Makefile.am @@ -52,7 +52,7 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DKASMVNC -DNO_MODULE_EXTS \ -I$(top_srcdir)/dri3 @LIBDRM_CFLAGS@ Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ - $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11 -lwebp -lssl -lcrypto -lcrypt \ + $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11 -lwebp -lsharpyuv -lssl -lcrypto -lcrypt \ -lfreetype Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -fopenmp