crichardson/docker-xubuntu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added VAAPI, VDPAU and Vulkan drivers

Browse Source
This commit is contained in:
Héctor Molinero Fernández
2020-03-21 17:54:54 +01:00
parent a1ab1be01a
commit fbd74971f1
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Dockerfile.m4
View File

@@ -9,10 +9,8 @@ m4_ifdef([[CROSS_QEMU]], [[COPY --from=docker.io/hectormolinero/qemu-user-static
# Install system packages # Install system packages
RUN export DEBIAN_FRONTEND=noninteractive \ RUN export DEBIAN_FRONTEND=noninteractive \
# Uncomment source packages repositories
&& sed -i 's/^#\s*\(deb-src\s\)/\1/g' /etc/apt/sources.list \ && sed -i 's/^#\s*\(deb-src\s\)/\1/g' /etc/apt/sources.list \
m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
# Enable multiarch support
&& dpkg --add-architecture i386 \ && dpkg --add-architecture i386 \
]])m4_dnl ]])m4_dnl
&& apt-get update \ && apt-get update \
@@ -163,7 +161,7 @@ RUN ./configure \
--enable-mp3lame \ --enable-mp3lame \
--enable-pixman --enable-pixman
RUN make -j"$(nproc)" RUN make -j"$(nproc)"
RUN checkinstall --default --pkgname=xrdp --pkgversion=0 --pkgrelease=0 RUN checkinstall --default --pkgname=xrdp --pkgversion=999 --pkgrelease=0
# Build xorgxrdp # Build xorgxrdp
ARG XORGXRDP_TREEISH=v0.2.13 ARG XORGXRDP_TREEISH=v0.2.13
@@ -176,7 +174,7 @@ RUN git submodule update --init --recursive
RUN ./bootstrap RUN ./bootstrap
RUN ./configure --enable-glamor RUN ./configure --enable-glamor
RUN make -j"$(nproc)" RUN make -j"$(nproc)"
RUN checkinstall --default --pkgname=xorgxrdp --pkgversion=0 --pkgrelease=0 RUN checkinstall --default --pkgname=xorgxrdp --pkgversion=999 --pkgrelease=0
# Build XRDP PulseAudio module # Build XRDP PulseAudio module
ARG XRDP_PULSEAUDIO_TREEISH=v0.4 ARG XRDP_PULSEAUDIO_TREEISH=v0.4
@@ -195,7 +193,7 @@ RUN git submodule update --init --recursive
RUN ./bootstrap RUN ./bootstrap
RUN ./configure PULSE_DIR=/tmp/pulseaudio/ RUN ./configure PULSE_DIR=/tmp/pulseaudio/
RUN make -j"$(nproc)" RUN make -j"$(nproc)"
RUN checkinstall --default --pkgname=xrdp-pulseaudio --pkgversion=0 --pkgrelease=0 RUN checkinstall --default --pkgname=xrdp-pulseaudio --pkgversion=999 --pkgrelease=0
################################################## ##################################################
## "xubuntu" stage ## "xubuntu" stage
@@ -244,6 +242,9 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
libxv1 \ libxv1 \
locales \ locales \
mesa-opencl-icd \ mesa-opencl-icd \
mesa-va-drivers \
mesa-vdpau-drivers \
mesa-vulkan-drivers \
ocl-icd-libopencl1 \ ocl-icd-libopencl1 \
openssh-server \ openssh-server \
openssl \ openssl \
@@ -252,13 +253,13 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
pulseaudio-utils \ pulseaudio-utils \
runit \ runit \
tzdata \ tzdata \
vulkan-utils \
xserver-xorg-core-hwe-18.04 \ xserver-xorg-core-hwe-18.04 \
xserver-xorg-input-all-hwe-18.04 \ xserver-xorg-input-all-hwe-18.04 \
xserver-xorg-input-evdev-hwe-18.04 \ xserver-xorg-input-evdev-hwe-18.04 \
xserver-xorg-input-joystick-hwe-18.04 \ xserver-xorg-input-joystick-hwe-18.04 \
xserver-xorg-video-all-hwe-18.04 \ xserver-xorg-video-all-hwe-18.04 \
m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
&& apt-get install -y --no-install-recommends \
libegl1:i386 \ libegl1:i386 \
libgl1:i386 \ libgl1:i386 \
libgl1-mesa-dri:i386 \ libgl1-mesa-dri:i386 \
@@ -267,9 +268,11 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
libxtst6:i386 \ libxtst6:i386 \
libxv1:i386 \ libxv1:i386 \
mesa-opencl-icd:i386 \ mesa-opencl-icd:i386 \
mesa-va-drivers:i386 \
mesa-vdpau-drivers:i386 \
mesa-vulkan-drivers:i386 \
ocl-icd-libopencl1:i386 \ ocl-icd-libopencl1:i386 \
]])m4_dnl ]])m4_dnl
&& apt-get install -y --no-install-recommends \
adwaita-qt \ adwaita-qt \
apt-transport-https \ apt-transport-https \
apt-utils \ apt-utils \