Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 20:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Linux) Added checks that SDL is configured with PipeWire support when building the AppImage.

Browse source
This commit is contained in:
Leon Styhre 2023-01-31 18:44:45 +01:00
parent 960677d9b1
commit f5b4356444
2 changed files with 42 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
tools/create_AppImage.sh
View file

@ -42,13 +42,13 @@ fi
chmod a+x linuxdeploy-x86_64.AppImage chmod a+x linuxdeploy-x86_64.AppImage
if [ ! -f external/SDL/build/${SDL_SHARED_LIBRARY} ]; then if [ ! -f external/SDL/build/${SDL_SHARED_LIBRARY} ]; then
echo echo
echo "Building the SDL library..." echo "Building the SDL library..."
cd external cd external
rm -rf SDL rm -rf SDL
git clone https://github.com/libsdl-org/SDL.git git clone https://github.com/libsdl-org/SDL.git
cd SDL cd SDL
git checkout $SDL_RELEASE_TAG git checkout $SDL_RELEASE_TAG
# Temporary workaround until a proper fix has been implemented in the SDL library: # Temporary workaround until a proper fix has been implemented in the SDL library:
# https://github.com/libsdl-org/SDL/issues/7160 # https://github.com/libsdl-org/SDL/issues/7160
@ -81,14 +81,21 @@ index 0809706c2..bbabfcaa7 100644
if (_this && _this->StartTextInput) { if (_this && _this->StartTextInput) {
EOF EOF
mkdir build mkdir build
cd build cd build
cmake -DCMAKE_BUILD_TYPE=Release -S .. -B . cmake -DCMAKE_BUILD_TYPE=Release -S .. -B .
make -j${JOBS}
cd ../../.. if [ $(grep PKG_PIPEWIRE_VERSION:INTERNAL= CMakeCache.txt) = "PKG_PIPEWIRE_VERSION:INTERNAL=" ]; then
else
echo echo
echo -e "The SDL library has already been built, skipping this step\n" echo -e "The SDL library is not configured with PipeWire support, aborting."
exit
fi
make -j${JOBS}
cd ../../..
else
echo
echo -e "The SDL library has already been built, skipping this step\n"
fi fi
rm -rf ./AppDir rm -rf ./AppDir

35
tools/create_AppImage_SteamDeck.sh
View file

@ -38,13 +38,13 @@ fi
chmod a+x linuxdeploy-x86_64.AppImage chmod a+x linuxdeploy-x86_64.AppImage
if [ ! -f external/SDL/build/${SDL_SHARED_LIBRARY} ]; then if [ ! -f external/SDL/build/${SDL_SHARED_LIBRARY} ]; then
echo echo
echo "Building the SDL library..." echo "Building the SDL library..."
cd external cd external
rm -rf SDL rm -rf SDL
git clone https://github.com/libsdl-org/SDL.git git clone https://github.com/libsdl-org/SDL.git
cd SDL cd SDL
git checkout $SDL_RELEASE_TAG git checkout $SDL_RELEASE_TAG
# Temporary workaround until a proper fix has been implemented in the SDL library: # Temporary workaround until a proper fix has been implemented in the SDL library:
# https://github.com/libsdl-org/SDL/issues/7160 # https://github.com/libsdl-org/SDL/issues/7160
@ -77,14 +77,21 @@ index 0809706c2..bbabfcaa7 100644
if (_this && _this->StartTextInput) { if (_this && _this->StartTextInput) {
EOF EOF
mkdir build mkdir build
cd build cd build
cmake -DCMAKE_BUILD_TYPE=Release -S .. -B . cmake -DCMAKE_BUILD_TYPE=Release -S .. -B .
make -j${JOBS}
cd ../../.. if [ $(grep PKG_PIPEWIRE_VERSION:INTERNAL= CMakeCache.txt) = "PKG_PIPEWIRE_VERSION:INTERNAL=" ]; then
else
echo echo
echo -e "The SDL library has already been built, skipping this step\n" echo -e "The SDL library is not configured with PipeWire support, aborting."
exit
fi
make -j${JOBS}
cd ../../..
else
echo
echo -e "The SDL library has already been built, skipping this step\n"
fi fi
rm -rf ./AppDir rm -rf ./AppDir