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

replace DISPLAYSERVER var "weston" by "wl"

Browse Source 
- 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:
SupervisedThinking 2021-11-24 17:25:54 +01:00
parent 3869beae70
commit eca639105e
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ if [ "${DISPLAYSERVER}" = "x11" ]; then
PKG_DEPENDS_TARGET+=" xorgproto libXext libXdamage libXfixes libXxf86vm libxcb libX11 libxshmfence libXrandr libglvnd" PKG_DEPENDS_TARGET+=" xorgproto libXext libXdamage libXfixes libXxf86vm libxcb libX11 libxshmfence libXrandr libglvnd"
export X11_INCLUDES= export X11_INCLUDES=
PKG_MESON_OPTS_TARGET+=" -Dplatforms=x11 -Ddri3=enabled -Dglx=dri -Dglvnd=true" 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_DEPENDS_TARGET+=" wayland wayland-protocols"
PKG_MESON_OPTS_TARGET+=" -Dplatforms=wayland -Ddri3=disabled -Dglx=disabled -Dglvnd=false" PKG_MESON_OPTS_TARGET+=" -Dplatforms=wayland -Ddri3=disabled -Dglx=disabled -Dglvnd=false"
else else

4
packages/mediacenter/kodi/package.mk
View File

@ -30,7 +30,7 @@ configure_package() {
PKG_DEPENDS_TARGET+=" libX11 libXext libdrm libXrandr" PKG_DEPENDS_TARGET+=" libX11 libXext libdrm libXrandr"
KODI_PLATFORM="-DCORE_PLATFORM_NAME=x11 \ KODI_PLATFORM="-DCORE_PLATFORM_NAME=x11 \
-DAPP_RENDER_SYSTEM=gl" -DAPP_RENDER_SYSTEM=gl"
elif [ "${DISPLAYSERVER}" = "weston" ]; then elif [ "${DISPLAYSERVER}" = "wl" ]; then
PKG_DEPENDS_TARGET+=" wayland waylandpp" PKG_DEPENDS_TARGET+=" wayland waylandpp"
CFLAGS+=" -DEGL_NO_X11" CFLAGS+=" -DEGL_NO_X11"
CXXFLAGS+=" -DEGL_NO_X11" CXXFLAGS+=" -DEGL_NO_X11"
@ -273,7 +273,7 @@ post_makeinstall_target() {
# set default display environment # set default display environment
if [ "${DISPLAYSERVER}" = "x11" ]; then if [ "${DISPLAYSERVER}" = "x11" ]; then
echo "DISPLAY=:0.0" >> ${INSTALL}/usr/lib/kodi/kodi.conf 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 echo "WAYLAND_DISPLAY=wayland-0" >> ${INSTALL}/usr/lib/kodi/kodi.conf
fi fi

2
packages/multimedia/intel-vaapi-driver/package.mk
View File

@ -15,7 +15,7 @@ PKG_TOOLCHAIN="meson"
if [ "${DISPLAYSERVER}" = "x11" ]; then if [ "${DISPLAYSERVER}" = "x11" ]; then
DISPLAYSERVER_LIBVA="-Dwith_x11=yes -Dwith_wayland=no" DISPLAYSERVER_LIBVA="-Dwith_x11=yes -Dwith_wayland=no"
elif [ "${DISPLAYSERVER}" = "weston" ]; then elif [ "${DISPLAYSERVER}" = "wl" ]; then
DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_wayland=yes" DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_wayland=yes"
else else
DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_wayland=no" DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_wayland=no"

2
packages/multimedia/libva/package.mk
View File

@ -15,7 +15,7 @@ PKG_TOOLCHAIN="meson"
if [ "${DISPLAYSERVER}" = "x11" ]; then if [ "${DISPLAYSERVER}" = "x11" ]; then
PKG_DEPENDS_TARGET="toolchain libX11 libXext libXfixes libdrm" PKG_DEPENDS_TARGET="toolchain libX11 libXext libXfixes libdrm"
DISPLAYSERVER_LIBVA="-Dwith_x11=yes -Dwith_glx=no -Dwith_wayland=no" 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" DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_glx=no -Dwith_wayland=yes"
PKG_DEPENDS_TARGET="toolchain libdrm wayland" PKG_DEPENDS_TARGET="toolchain libdrm wayland"
else else

2
packages/wayland/libxkbcommon/package.mk
View File

@ -16,7 +16,7 @@ PKG_MESON_OPTS_TARGET="-Denable-docs=false"
if [ "${DISPLAYSERVER}" = "x11" ]; then if [ "${DISPLAYSERVER}" = "x11" ]; then
PKG_MESON_OPTS_TARGET+=" -Denable-x11=true \ PKG_MESON_OPTS_TARGET+=" -Denable-x11=true \
-Denable-wayland=false" -Denable-wayland=false"
elif [ "${DISPLAYSERVER}" = "weston" ]; then elif [ "${DISPLAYSERVER}" = "wl" ]; then
PKG_MESON_OPTS_TARGET+=" -Denable-x11=false \ PKG_MESON_OPTS_TARGET+=" -Denable-x11=false \
-Denable-wayland=true" -Denable-wayland=true"
else else