From d031c2182f9ef56f68d1d22460e1728d899b00af Mon Sep 17 00:00:00 2001 From: matt Date: Sun, 27 Sep 2020 19:18:10 +0000 Subject: [PATCH] Updated xorg version, static link webp --- builder/README.md | 2 +- builder/build.sh | 9 +++++---- builder/dockerfile.build | 18 ++++++++++-------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/builder/README.md b/builder/README.md index d6f5a45..41af2d8 100644 --- a/builder/README.md +++ b/builder/README.md @@ -6,7 +6,7 @@ Docker CE sudo docker build -t kasmvncbuilder:18.04 -f builder/dockerfile.build . # run the builder - sudo docker run -v /tmp:/build kasmvncbuilder:18.04 + sudo docker run -v /tmp:/build --rm kasmvncbuilder:18.04 # tar will be on /tmp of host cp /tmp/kasmvnc*.tar.gz builder/ diff --git a/builder/build.sh b/builder/build.sh index 53fb9f8..87e8a02 100755 --- a/builder/build.sh +++ b/builder/build.sh @@ -7,7 +7,7 @@ # Ubuntu applies a million patches, but here we use upstream to simplify matters cd /tmp -wget https://www.x.org/archive//individual/xserver/xorg-server-1.18.4.tar.bz2 +wget https://www.x.org/archive/individual/xserver/xorg-server-1.19.6.tar.bz2 #git clone https://kasmweb@bitbucket.org/kasmtech/kasmvnc.git #cd kasmvnc @@ -23,10 +23,10 @@ sed -i -e '/find_package(FLTK/s@^@#@' \ cmake . make -j5 -tar -C unix/xserver -xvf /tmp/xorg-server-1.18.4.tar.bz2 --strip-components=1 +tar -C unix/xserver -xvf /tmp/xorg-server-1.19.6.tar.bz2 --strip-components=1 cd unix/xserver -patch -Np1 -i ../xserver118.patch +patch -Np1 -i ../xserver119.patch autoreconf -i # Configuring Xorg is long and has many distro-specific paths. # The distro paths start after prefix and end with the font path, @@ -37,7 +37,8 @@ autoreconf -i --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-pic --without-dtrace --disable-static --disable-dri \ + --with-pic --without-dtrace --disable-dri \ + --disable-static \ --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \ --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \ --disable-config-hal --disable-config-udev \ diff --git a/builder/dockerfile.build b/builder/dockerfile.build index b922361..7ee1a42 100644 --- a/builder/dockerfile.build +++ b/builder/dockerfile.build @@ -5,20 +5,22 @@ RUN sed -i 's$# deb-src$deb-src$' /etc/apt/sources.list RUN apt-get update && \ apt-get -y install sudo -RUN apt-get -y build-dep xorg-server libxfont-dev -RUN apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver -RUN apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev +RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev +RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver +RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev # Additions for webp RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz RUN cd /tmp && tar -xzvf /tmp/libwebp-* -RUN cd /tmp/libwebp-1.0.2 && ./configure && make && make install +RUN cd /tmp/libwebp-1.0.2 && \ + ./configure --enable-static --disable-shared && \ + make && make install # Fix for older required libs -RUN cd /tmp && wget http://launchpadlibrarian.net/347526424/libxfont1-dev_1.5.2-4ubuntu2_amd64.deb && \ - wget http://launchpadlibrarian.net/347526425/libxfont1_1.5.2-4ubuntu2_amd64.deb && \ - dpkg -i libxfont1_1.5.2-4ubuntu2_amd64.deb && \ - dpkg -i libxfont1-dev_1.5.2-4ubuntu2_amd64.deb +#RUN cd /tmp && wget http://launchpadlibrarian.net/347526424/libxfont1-dev_1.5.2-4ubuntu2_amd64.deb && \ +# wget http://launchpadlibrarian.net/347526425/libxfont1_1.5.2-4ubuntu2_amd64.deb && \ +# dpkg -i libxfont1_1.5.2-4ubuntu2_amd64.deb && \ +# dpkg -i libxfont1-dev_1.5.2-4ubuntu2_amd64.deb RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo