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

Fix build issues, rename driver package to match Github repo

This commit is contained in:
wheaney 2024-05-30 19:26:06 -07:00
parent a2d2a01ec5
commit 0dd0b8384a
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -2,8 +2,8 @@
path = vulkan/modules/vkBasalt path = vulkan/modules/vkBasalt
url = https://github.com/wheaney/vkBasalt.git url = https://github.com/wheaney/vkBasalt.git
branch = runtime_uniforms branch = runtime_uniforms
[submodule "modules/xrealAirLinuxDriver"] [submodule "modules/XRLinuxDriver"]
path = modules/xrealAirLinuxDriver path = modules/XRLinuxDriver
url = https://github.com/wheaney/XRLinuxDriver.git url = https://github.com/wheaney/XRLinuxDriver.git
[submodule "modules/sombrero"] [submodule "modules/sombrero"]
path = modules/sombrero path = modules/sombrero

5
bin/package_gnome
View File

@ -17,7 +17,7 @@ PACKAGE_DIR=$GNOME_BUILD_DIR/breezy_gnome
rm -rf $PACKAGE_DIR rm -rf $PACKAGE_DIR
mkdir -p $PACKAGE_DIR mkdir -p $PACKAGE_DIR
XREAL_DRIVER_DIR=$ROOT_DIR/modules/xrealAirLinuxDriver XREAL_DRIVER_DIR=$ROOT_DIR/modules/XRLinuxDriver
source $XREAL_DRIVER_DIR/bin/inject_ua source $XREAL_DRIVER_DIR/bin/inject_ua
# check out submodules, recursively for nested ones # check out submodules, recursively for nested ones
@ -41,6 +41,9 @@ if [ ! -e "$XREAL_BINARY" ] || [ "$1" != "--skip-module-builds" ]; then
cp $VULKAN_DIR/custom_banner_config.yml $XREAL_DRIVER_DIR cp $VULKAN_DIR/custom_banner_config.yml $XREAL_DRIVER_DIR
fi fi
# strange issue where the base library produces a .so file if the build is not cleaned
rm -rf build/
BREEZY_DESKTOP=1 bin/package BREEZY_DESKTOP=1 bin/package
fi fi

6
bin/package_vulkan
View File

@ -3,7 +3,7 @@
# exit when any command fails # exit when any command fails
set -e set -e
XREAL_DRIVER_DIR=modules/xrealAirLinuxDriver XREAL_DRIVER_DIR=modules/XRLinuxDriver
source $XREAL_DRIVER_DIR/bin/inject_ua source $XREAL_DRIVER_DIR/bin/inject_ua
# check out submodules, recursively for nested ones # check out submodules, recursively for nested ones
@ -66,6 +66,10 @@ if [ ! -e "$XREAL_BINARY" ] || [ "$1" != "--skip-module-builds" ]; then
fi fi
pushd $XREAL_DRIVER_DIR pushd $XREAL_DRIVER_DIR
# strange issue where the base library produces a .so file if the build is not cleaned
rm -rf build/
bin/package bin/package
else else
pushd $XREAL_DRIVER_DIR pushd $XREAL_DRIVER_DIR

1
modules/XRLinuxDriver Submodule

@ -0,0 +1 @@
Subproject commit da9bfe14cdf198b3cd58ecf997324ebd358e8a61

1
modules/xrealAirLinuxDriver

@ -1 +0,0 @@
Subproject commit 4e3f653d71dc4dca36a8f45c376ee9d853fb6b66