From 1f2419354be12e31790eea22a5be2f61fae4fe47 Mon Sep 17 00:00:00 2001 From: smp79 Date: Tue, 1 Jul 2025 23:22:56 +0300 Subject: [PATCH] remove Generic-gl device and switch Generic to OpenGL --- projects/Generic/devices/Generic-gl/options | 25 ------------------- projects/Generic/devices/gbm/options | 4 +-- .../usr/share/bootloader/canupdate.sh | 2 +- 3 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 projects/Generic/devices/Generic-gl/options diff --git a/projects/Generic/devices/Generic-gl/options b/projects/Generic/devices/Generic-gl/options deleted file mode 100644 index 550acfe9ea..0000000000 --- a/projects/Generic/devices/Generic-gl/options +++ /dev/null @@ -1,25 +0,0 @@ -# OpenGL(X) implementation to use (mesa / no) - OPENGL="mesa" - -# OpenGL-ES implementation to use (mesa / no) - OPENGLES="no" - -# Vulkan implementation to use (vulkan-loader / no) - VULKAN="no" - -# Displayserver to use (weston / x11 / no) - DISPLAYSERVER="no" - -# Windowmanager to use (fluxbox / weston / no) - WINDOWMANAGER="no" - -# KODI Player implementation to use (mesa / default) - KODIPLAYER_DRIVER="mesa" - -# set the addon project - ADDON_PROJECT="Generic" - -# Mesa 3D Graphic drivers to use (all / crocus,i915,iris,r300,r600,radeonsi,vmware,virtio) -# Space separated list is supported, -# e.g. GRAPHIC_DRIVERS="crocus i915 iris r300 r600 radeonsi vmware virtio" - GRAPHIC_DRIVERS="crocus i915 iris r300 r600 radeonsi vmware virtio" diff --git a/projects/Generic/devices/gbm/options b/projects/Generic/devices/gbm/options index f8843b03a7..550acfe9ea 100644 --- a/projects/Generic/devices/gbm/options +++ b/projects/Generic/devices/gbm/options @@ -1,8 +1,8 @@ # OpenGL(X) implementation to use (mesa / no) - OPENGL="no" + OPENGL="mesa" # OpenGL-ES implementation to use (mesa / no) - OPENGLES="mesa" + OPENGLES="no" # Vulkan implementation to use (vulkan-loader / no) VULKAN="no" diff --git a/projects/Generic/filesystem/usr/share/bootloader/canupdate.sh b/projects/Generic/filesystem/usr/share/bootloader/canupdate.sh index 259de335c4..69eea69ddb 100644 --- a/projects/Generic/filesystem/usr/share/bootloader/canupdate.sh +++ b/projects/Generic/filesystem/usr/share/bootloader/canupdate.sh @@ -2,7 +2,7 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Allow upgrades between different Generic builds -if [ "$1" = "Virtual.x86_64" -o "$1" = "Generic.x86_64" -o "$1" = "Generic-gl.x86_64" -o "$1" = "Generic-legacy.x86_64" -o "$1" = "gbm.x86_64" -o "$1" = "wayland.x86_64" -o "$1" = "x11.x86_64" ]; then +if [ "$1" = "Virtual.x86_64" -o "$1" = "Generic.x86_64" -o "$1" = "Generic-legacy.x86_64" -o "$1" = "gbm.x86_64" -o "$1" = "wayland.x86_64" -o "$1" = "x11.x86_64" ]; then exit 0 else exit 1