storm/configure-stormux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fixes for Xlibre integration.

Browse Source
This commit is contained in:
Storm Dragon 2025-06-18 23:37:31 -04:00
parent 419522c475
commit 41f91fc610
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.includes/functions.sh
View File

@ -74,7 +74,7 @@ install_xlibre() {
# Build X11Libre server first # Build X11Libre server first
infobox "Building X11Libre server (this may take 10-15 minutes)..." infobox "Building X11Libre server (this may take 10-15 minutes)..."
cd "$buildDir/xlibre-server-git" cd "$buildDir/xlibre-server-git"
if ! makepkg --noconfirm; then if ! makepkg -crs --noconfirm; then
msgbox "Failed to build X11Libre server. Installation aborted." msgbox "Failed to build X11Libre server. Installation aborted."
cd / && rm -rf "$buildDir" cd / && rm -rf "$buildDir"
return 1 return 1
@ -88,7 +88,7 @@ install_xlibre() {
sed -i "s/makedepends=.*/makedepends=('xlibre-server-devel' 'X-ABI-XINPUT_VERSION=26.0')/" PKGBUILD sed -i "s/makedepends=.*/makedepends=('xlibre-server-devel' 'X-ABI-XINPUT_VERSION=26.0')/" PKGBUILD
sed -i "s/conflicts=.*/conflicts=('xf86-input-libinput' 'xorg-server<1.19.0' 'X-ABI-XINPUT_VERSION<26' 'X-ABI-XINPUT_VERSION>=27')/" PKGBUILD sed -i "s/conflicts=.*/conflicts=('xf86-input-libinput' 'xorg-server<1.19.0' 'X-ABI-XINPUT_VERSION<26' 'X-ABI-XINPUT_VERSION>=27')/" PKGBUILD
if ! makepkg --noconfirm; then if ! makepkg -crs --noconfirm; then
msgbox "Failed to build X11Libre input driver. Installation aborted." msgbox "Failed to build X11Libre input driver. Installation aborted."
cd / && rm -rf "$buildDir" cd / && rm -rf "$buildDir"
return 1 return 1
@ -105,7 +105,7 @@ install_xlibre() {
sed -i "/'SKIP'/d" PKGBUILD sed -i "/'SKIP'/d" PKGBUILD
sed -i '/validpgpkeys=/s/^/#/' PKGBUILD sed -i '/validpgpkeys=/s/^/#/' PKGBUILD
if ! makepkg --noconfirm; then if ! makepkg -crs --noconfirm; then
msgbox "Failed to build X11Libre dummy video driver. Installation aborted." msgbox "Failed to build X11Libre dummy video driver. Installation aborted."
cd / && rm -rf "$buildDir" cd / && rm -rf "$buildDir"
return 1 return 1
@ -161,7 +161,7 @@ install_xlibre() {
sed -i "s/makedepends=.*/makedepends=('xlibre-server-devel-git' 'X-ABI-VIDEODRV_VERSION=28.0')/" PKGBUILD sed -i "s/makedepends=.*/makedepends=('xlibre-server-devel-git' 'X-ABI-VIDEODRV_VERSION=28.0')/" PKGBUILD
sed -i "s/conflicts=.*/conflicts=('xorg-server<21.1.1' 'X-ABI-VIDEODRV_VERSION<28' 'X-ABI-VIDEODRV_VERSION>=29')/" PKGBUILD sed -i "s/conflicts=.*/conflicts=('xorg-server<21.1.1' 'X-ABI-VIDEODRV_VERSION<28' 'X-ABI-VIDEODRV_VERSION>=29')/" PKGBUILD
if ! makepkg --noconfirm; then if ! makepkg -crs --noconfirm; then
msgbox "Failed to build fbdev driver for X11Libre." msgbox "Failed to build fbdev driver for X11Libre."
cd / && rm -rf "$buildDir" cd / && rm -rf "$buildDir"
return 1 return 1

15
.includes/gui.sh
View File

@ -16,18 +16,15 @@ esac
./.includes/toggle-screen.sh -n ./.includes/toggle-screen.sh -n
# Install X11Libre instead of Xorg # Install X11Libre
if ! install_xlibre; then if ! install_xlibre; then
msgbox "X11Libre installation failed. Falling back to standard Xorg installation." msgbox "X11Libre installation failed. Installation aborted."
install_package ${packages} firefox nodm-dgw orca speech-dispatcher xclip xorg-drivers xorg-server xorg-xinit return 1
# replace xf86-video-dummy with xf86-video-dummy-with-vt for Xorg fallback
yay --noconfirm -Rdd xf86-video-dummy 2>/dev/null || true
url_install 'https://stormux.org/packages/xf86-video-dummy-with-vt-0.4.1-1-aarch64.pkg.tar.xz'
else
# X11Libre installed successfully, install remaining packages
install_package ${packages} firefox nodm-dgw orca speech-dispatcher xclip xorg-xinit
fi fi
# X11Libre installed successfully, install remaining packages
install_package ${packages} firefox nodm-dgw orca speech-dispatcher xclip xorg-xinit
# GUI bluetooth manager # GUI bluetooth manager
if [[ "${architecture}" == "aarch64" ]]; then if [[ "${architecture}" == "aarch64" ]]; then
install_package blueman install_package blueman