jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-01 15:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3452 from MilhouseVH/le10_graphics_dedupe

Browse Source 
config/graphic+mesa: simplify dedupe by using space-delimited lists
This commit is contained in:
Jernej Škrabec 2019-05-01 21:52:17 +02:00 committed by GitHub
commit 08d2d12903
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
config/graphic
View File

@ -1,10 +1,10 @@
if [ "$OPENGL" = no ]; then
if [ "${OPENGL}" = no ]; then
OPENGL_SUPPORT="no"
else
OPENGL_SUPPORT="yes"
fi
if [ "$OPENGLES" = no ]; then
if [ "${OPENGLES}" = no ]; then
OPENGLES_SUPPORT="no"
else
OPENGLES_SUPPORT="yes"
@ -22,111 +22,109 @@ get_graphicdrivers() {
VAAPI_SUPPORT="no"
V4L2_SUPPORT="no"
if [ "$GRAPHIC_DRIVERS" = "all" ]; then
if [ "${GRAPHIC_DRIVERS}" = "all" ]; then
GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeonsi nvidia nvidia-legacy vmware virtio vc4"
fi
if listcontains "$GRAPHIC_DRIVERS" "etnaviv"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,etnaviv,imx"
if listcontains "${GRAPHIC_DRIVERS}" "etnaviv"; then
GALLIUM_DRIVERS+=" etnaviv imx"
V4L2_SUPPORT="yes"
VAAPI_SUPPORT="no"
VDPAU_SUPPORT="no"
fi
if listcontains "$GRAPHIC_DRIVERS" "freedreno"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,freedreno"
if listcontains "${GRAPHIC_DRIVERS}" "freedreno"; then
GALLIUM_DRIVERS+=" freedreno"
V4L2_SUPPORT="yes"
VAAPI_SUPPORT="no"
VDPAU_SUPPORT="no"
fi
if listcontains "$GRAPHIC_DRIVERS" "i915"; then
DRI_DRIVERS="$DRI_DRIVERS,i915"
XORG_DRIVERS="$XORG_DRIVERS intel"
if listcontains "${GRAPHIC_DRIVERS}" "i915"; then
DRI_DRIVERS+=" i915"
XORG_DRIVERS+=" intel"
COMPOSITE_SUPPORT="yes"
VAAPI_SUPPORT="yes"
fi
if listcontains "$GRAPHIC_DRIVERS" "i965"; then
DRI_DRIVERS="$DRI_DRIVERS,i965"
XORG_DRIVERS="$XORG_DRIVERS intel"
if listcontains "${GRAPHIC_DRIVERS}" "i965"; then
DRI_DRIVERS+=" i965"
XORG_DRIVERS+=" intel"
COMPOSITE_SUPPORT="yes"
VAAPI_SUPPORT="yes"
fi
if listcontains "$GRAPHIC_DRIVERS" "lima"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,kmsro,lima"
if listcontains "${GRAPHIC_DRIVERS}" "lima"; then
GALLIUM_DRIVERS+=" kmsro lima"
V4L2_SUPPORT="yes"
fi
if listcontains "$GRAPHIC_DRIVERS" "nvidia"; then
XORG_DRIVERS="$XORG_DRIVERS nvidia"
if listcontains "${GRAPHIC_DRIVERS}" "nvidia"; then
XORG_DRIVERS+=" nvidia"
VDPAU_SUPPORT="yes"
fi
if listcontains "$GRAPHIC_DRIVERS" "nvidia-legacy"; then
XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
if listcontains "${GRAPHIC_DRIVERS}" "nvidia-legacy"; then
XORG_DRIVERS+=" nvidia-legacy"
VDPAU_SUPPORT="yes"
fi
if listcontains "$GRAPHIC_DRIVERS" "panfrost"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,kmsro,panfrost"
if listcontains "${GRAPHIC_DRIVERS}" "panfrost"; then
GALLIUM_DRIVERS+=" kmsro panfrost"
V4L2_SUPPORT="yes"
fi
if listcontains "$GRAPHIC_DRIVERS" "r200"; then
DRI_DRIVERS="$DRI_DRIVERS,r200"
XORG_DRIVERS="$XORG_DRIVERS ati"
if listcontains "${GRAPHIC_DRIVERS}" "r200"; then
DRI_DRIVERS+=" r200"
XORG_DRIVERS+=" ati"
COMPOSITE_SUPPORT="yes"
fi
if listcontains "$GRAPHIC_DRIVERS" "r300"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
XORG_DRIVERS="$XORG_DRIVERS ati"
if listcontains "${GRAPHIC_DRIVERS}" "r300"; then
GALLIUM_DRIVERS+=" r300"
XORG_DRIVERS+=" ati"
LLVM_SUPPORT="yes"
COMPOSITE_SUPPORT="yes"
VDPAU_SUPPORT="yes"
fi
if listcontains "$GRAPHIC_DRIVERS" "r600"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
XORG_DRIVERS="$XORG_DRIVERS ati"
if listcontains "${GRAPHIC_DRIVERS}" "r600"; then
GALLIUM_DRIVERS+=" r600"
XORG_DRIVERS+=" ati"
LLVM_SUPPORT="yes"
COMPOSITE_SUPPORT="yes"
VDPAU_SUPPORT="yes"
VAAPI_SUPPORT="yes"
fi
if listcontains "$GRAPHIC_DRIVERS" "radeonsi"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,radeonsi"
XORG_DRIVERS="$XORG_DRIVERS ati amdgpu"
if listcontains "${GRAPHIC_DRIVERS}" "radeonsi"; then
GALLIUM_DRIVERS+=" radeonsi"
XORG_DRIVERS+=" ati amdgpu"
LLVM_SUPPORT="yes"
COMPOSITE_SUPPORT="yes"
VDPAU_SUPPORT="yes"
VAAPI_SUPPORT="yes"
fi
if listcontains "$GRAPHIC_DRIVERS" "vc4"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,vc4"
if listcontains "${GRAPHIC_DRIVERS}" "vc4"; then
GALLIUM_DRIVERS+=" vc4"
V4L2_SUPPORT="yes"
VAAPI_SUPPORT="no"
VDPAU_SUPPORT="no"
fi
if listcontains "$GRAPHIC_DRIVERS" "virtio"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,virgl"
if listcontains "${GRAPHIC_DRIVERS}" "virtio"; then
GALLIUM_DRIVERS+=" virgl"
fi
if listcontains "$GRAPHIC_DRIVERS" "vmware"; then
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga"
XORG_DRIVERS="$XORG_DRIVERS vmware"
if listcontains "${GRAPHIC_DRIVERS}" "vmware"; then
GALLIUM_DRIVERS+=" svga"
XORG_DRIVERS+=" vmware"
COMPOSITE_SUPPORT="yes"
fi
# remove leading comma if present
[[ $GALLIUM_DRIVERS =~ ^, ]] && GALLIUM_DRIVERS="${GALLIUM_DRIVERS:1}"
[[ $DRI_DRIVERS =~ ^, ]] && DRI_DRIVERS="${DRI_DRIVERS:1}"
# remove duplicate entries
XORG_DRIVERS="$(echo $XORG_DRIVERS | xargs -n1 | sort -u | xargs)"
GALLIUM_DRIVERS="$(echo ${GALLIUM_DRIVERS} | xargs -n1 | sort -u | xargs)"
XORG_DRIVERS="$(echo ${XORG_DRIVERS} | xargs -n1 | sort -u | xargs)"
DRI_DRIVERS="$(echo ${DRI_DRIVERS} | xargs -n1 | sort -u | xargs)"
}

4
packages/graphics/mesa/package.mk
View File

@ -15,8 +15,8 @@ PKG_BUILD_FLAGS="+lto"
get_graphicdrivers
PKG_MESON_OPTS_TARGET="-Ddri-drivers=$DRI_DRIVERS \
-Dgallium-drivers=$GALLIUM_DRIVERS \
PKG_MESON_OPTS_TARGET="-Ddri-drivers=${DRI_DRIVERS// /,} \
-Dgallium-drivers=${GALLIUM_DRIVERS// /,} \
-Dgallium-extra-hud=false \
-Dgallium-xvmc=false \
-Dgallium-omx=disabled \