mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 05:36:47 +00:00
replace DISPLAYSERVER var "weston" by "wl"
- as the displayserver var is more likely a protocol than the windowmanager/compositor wl (short for wayland) should be used instead
This commit is contained in:
parent
3869beae70
commit
eca639105e
@ -38,7 +38,7 @@ if [ "${DISPLAYSERVER}" = "x11" ]; then
|
||||
PKG_DEPENDS_TARGET+=" xorgproto libXext libXdamage libXfixes libXxf86vm libxcb libX11 libxshmfence libXrandr libglvnd"
|
||||
export X11_INCLUDES=
|
||||
PKG_MESON_OPTS_TARGET+=" -Dplatforms=x11 -Ddri3=enabled -Dglx=dri -Dglvnd=true"
|
||||
elif [ "${DISPLAYSERVER}" = "weston" ]; then
|
||||
elif [ "${DISPLAYSERVER}" = "wl" ]; then
|
||||
PKG_DEPENDS_TARGET+=" wayland wayland-protocols"
|
||||
PKG_MESON_OPTS_TARGET+=" -Dplatforms=wayland -Ddri3=disabled -Dglx=disabled -Dglvnd=false"
|
||||
else
|
||||
|
@ -30,7 +30,7 @@ configure_package() {
|
||||
PKG_DEPENDS_TARGET+=" libX11 libXext libdrm libXrandr"
|
||||
KODI_PLATFORM="-DCORE_PLATFORM_NAME=x11 \
|
||||
-DAPP_RENDER_SYSTEM=gl"
|
||||
elif [ "${DISPLAYSERVER}" = "weston" ]; then
|
||||
elif [ "${DISPLAYSERVER}" = "wl" ]; then
|
||||
PKG_DEPENDS_TARGET+=" wayland waylandpp"
|
||||
CFLAGS+=" -DEGL_NO_X11"
|
||||
CXXFLAGS+=" -DEGL_NO_X11"
|
||||
@ -273,7 +273,7 @@ post_makeinstall_target() {
|
||||
# set default display environment
|
||||
if [ "${DISPLAYSERVER}" = "x11" ]; then
|
||||
echo "DISPLAY=:0.0" >> ${INSTALL}/usr/lib/kodi/kodi.conf
|
||||
elif [ "${DISPLAYSERVER}" = "weston" ]; then
|
||||
elif [ "${DISPLAYSERVER}" = "wl" ]; then
|
||||
echo "WAYLAND_DISPLAY=wayland-0" >> ${INSTALL}/usr/lib/kodi/kodi.conf
|
||||
fi
|
||||
|
||||
|
@ -15,7 +15,7 @@ PKG_TOOLCHAIN="meson"
|
||||
|
||||
if [ "${DISPLAYSERVER}" = "x11" ]; then
|
||||
DISPLAYSERVER_LIBVA="-Dwith_x11=yes -Dwith_wayland=no"
|
||||
elif [ "${DISPLAYSERVER}" = "weston" ]; then
|
||||
elif [ "${DISPLAYSERVER}" = "wl" ]; then
|
||||
DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_wayland=yes"
|
||||
else
|
||||
DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_wayland=no"
|
||||
|
@ -15,7 +15,7 @@ PKG_TOOLCHAIN="meson"
|
||||
if [ "${DISPLAYSERVER}" = "x11" ]; then
|
||||
PKG_DEPENDS_TARGET="toolchain libX11 libXext libXfixes libdrm"
|
||||
DISPLAYSERVER_LIBVA="-Dwith_x11=yes -Dwith_glx=no -Dwith_wayland=no"
|
||||
elif [ "${DISPLAYSERVER}" = "weston" ]; then
|
||||
elif [ "${DISPLAYSERVER}" = "wl" ]; then
|
||||
DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_glx=no -Dwith_wayland=yes"
|
||||
PKG_DEPENDS_TARGET="toolchain libdrm wayland"
|
||||
else
|
||||
|
@ -16,7 +16,7 @@ PKG_MESON_OPTS_TARGET="-Denable-docs=false"
|
||||
if [ "${DISPLAYSERVER}" = "x11" ]; then
|
||||
PKG_MESON_OPTS_TARGET+=" -Denable-x11=true \
|
||||
-Denable-wayland=false"
|
||||
elif [ "${DISPLAYSERVER}" = "weston" ]; then
|
||||
elif [ "${DISPLAYSERVER}" = "wl" ]; then
|
||||
PKG_MESON_OPTS_TARGET+=" -Denable-x11=false \
|
||||
-Denable-wayland=true"
|
||||
else
|
||||
|
Loading…
x
Reference in New Issue
Block a user