RomanNum3ral
/
breezy-desktop
mirror of https://github.com/wheaney/breezy-desktop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix permissions issues, vkBasalt binary issue

This commit is contained in:
wheaney 2023-10-03 13:57:43 -07:00
parent 086f30d61f
commit b3f100bd0c
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/package_vulkan
View File

@ -37,8 +37,10 @@ cp $VKBASALT_BUILD_DIR/builddir/src/libvkbasalt.so $PACKAGE_DIR/vkBasalt.64/
cp $VKBASALT_BUILD_DIR/builddir/config/vkBasalt.json $PACKAGE_DIR/vkBasalt.64/
cp $VKBASALT_BUILD_DIR/builddir.32/src/libvkbasalt.so $PACKAGE_DIR/vkBasalt.32/
# copy Sombrero FX
# copy Sombrero FX, get ReShade headers
cp $VULKAN_MODULES/sombrero/IMUAdjust.fx $PACKAGE_DIR
wget -P $PACKAGE_DIR https://raw.githubusercontent.com/crosire/reshade-shaders/384465d0287999caa6190b5ebea506200b4f4a0a/Shaders/ReShade.fxh
wget -P $PACKAGE_DIR https://raw.githubusercontent.com/crosire/reshade-shaders/384465d0287999caa6190b5ebea506200b4f4a0a/Shaders/ReShadeUI.fxh
# copy vulkan setup scripts and configs
cp -r $VULKAN_DIR/bin $PACKAGE_DIR

10
vulkan/bin/breezy_vulkan_uninstall
View File

@ -25,8 +25,12 @@ rm $USER_HOME/.local/lib32/libvkbasalt.so
rm $USER_HOME/.local/share/vulkan/implicit_layer.d/vkBasalt.json
rm $USER_HOME/.local/share/vulkan/implicit_layer.d/vkBasalt.x86.json
[ "$for_install" -eq 0 ] && echo "Removing vkBasalt config at $USER_HOME/.config/vkBasalt/vkBasalt.conf"
rm $USER_HOME/.config/vkBasalt/vkBasalt.conf
[ "$for_install" -eq 0 ] && echo "Removing vkBasalt and reshade directories at $USER_HOME/.config/"
rm -rf $USER_HOME/.config/vkBasalt
rm -rf $USER_HOME/.config/reshade
[ "$for_install" -eq 0 ] && echo "SKIPPING xrealAirLinuxDriver uninstall to keep mouse/joystick driver functionality."
[ "$for_install" -eq 0 ] && echo "To manually uninstall xrealAirLinuxDriver, do: \"sudo ~/bin/xreal_driver_uninstall\""
[ "$for_install" -eq 0 ] && echo "To manually uninstall xrealAirLinuxDriver, do: \"sudo ~/bin/xreal_driver_uninstall\""
# this script is self-deleting, leave this as the last command
rm -f $USER_HOME/bin/breezy_vulcan_uninstall

13
vulkan/bin/setup
View File

@ -14,7 +14,7 @@ fi
echo "Copying the breezy_vulkan scripts to ${USER_HOME}/bin"
if [ ! -d "$USER_HOME/bin" ]; then
mkdir $USER_HOME/bin
su -c 'mkdir -p '$USER_HOME'/bin' $USER
fi
cp bin/breezy_vulkan_uninstall $USER_HOME/bin
@ -22,10 +22,12 @@ echo "Installing vkBasalt; copying binaries, configs, and shader files to ${USER
# much of the setup below was informed by https://github.com/simons-public/steam-deck-vkbasalt-install
# copy the vkBasalt binaries and configs
mkdir -p ${USER_HOME}/.local/{lib,lib32,share/vulkan/implicit_layer.d}
mkdir -p ${USER_HOME}/.config/{vkBasalt,reshade}
su -c 'mkdir -p '$USER_HOME'/.local/{lib,lib32,share/vulkan/implicit_layer.d}' $USER
su -c 'mkdir -p '$USER_HOME'/.config/{vkBasalt,reshade/Shaders,reshade/Textures}' $USER
cp vkBasalt.64/libvkbasalt.so $USER_HOME/.local/lib/
cp vkBasalt.32/libvkbasalt.so $USER_HOME/.local/lib32/
chown $USER:$USER $USER_HOME/.local/lib/libvkbasalt.so
chown $USER:$USER $USER_HOME/.local/lib32/libvkbasalt.so
# there is only one vkBasalt.json file, use the 64-bit directory for both, copy and make replacements
if grep -q SteamOS /etc/os-release ; then
@ -35,12 +37,15 @@ else
sed -e "s|libvkbasalt.so|${USER_HOME}/.local/lib/libvkbasalt.so|" vkBasalt.64/vkBasalt.json > $USER_HOME/.local/share/vulkan/implicit_layer.d/vkBasalt.json
sed -e "s|libvkbasalt.so|${USER_HOME}/.local/lib32/libvkbasalt.so|" vkBasalt.64/vkBasalt.json > $USER_HOME/.local/share/vulkan/implicit_layer.d/vkBasalt.x86.json
fi
chown $USER:$USER $USER_HOME/.local/share/vulkan/implicit_layer.d/vkBasalt.*
# copy the vkBasalt.conf file and make replacements
sed -e "s|/path/to/reshade-shaders|${USER_HOME}/.config/reshade|" -e "s|/path/to/sombrero|${USER_HOME}/.config/reshade/Shaders/IMUAdjust.fx|" config/vkBasalt.conf > $USER_HOME/.config/vkBasalt/vkBasalt.conf
chown -R $USER:$USER $USER_HOME/.config/vkBasalt
echo "Installing the Sombrero shader to ${USER_HOME}/.config/reshade/Shaders/IMUAdjust.fx"
cp IMUAdjust.fx $USER_HOME/.config/reshade/Shaders
cp *.fx* $USER_HOME/.config/reshade/Shaders
chown -R $USER:$USER $USER_HOME/.config/reshade
# set up the XREAL driver using the local binary
echo "Installing xrealAirLinuxDriver"

2
vulkan/modules/vkBasalt

@ -1 +1 @@
Subproject commit 77260be44112b54933d6c6a4f4af38581191fd14
Subproject commit cbd53f7c2da3e130b2a9fb8772914c8a061d31d3