mirror of
https://github.com/kasmtech/KasmVNC.git
synced 2025-06-27 05:01:41 +02:00
Merge branch 'feature/KASM-7126-webp-version-upgrade' into 'master'
upgrading to libwebp 1.5.0 abd adding sharpyuv as an included library based... Closes KASM-7126 See merge request kasm-technologies/internal/KasmVNC!169
This commit is contained in:
commit
a2496294e1
@ -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 && \
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user