Hopefully final cleanup for flatpak builder

Author: Motobug

Flatpak/SDL2/SDL2.json Distribution/flatpak/SDL2.jsonFlatpak/SDL2/SDL2.json renamed to Distribution/flatpak/SDL2.json

@@ -96,12 +96,15 @@ modules:
         url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz
         sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399
 
+  # build the vendored SDL2 from Externals until the runtime gets 2.30.9
+  - SDL2.json
+  
   - name: project-plus-dolphin
     buildsystem: cmake-ninja
     config-opts:
       - -DCMAKE_BUILD_TYPE=Release
       - -DENABLE_ALSA=OFF
-      - -DENABLE_SDL=OFF
+      - -DENABLE_SDL=ON
       - -DENABLE_EVDEV=ON
       - -DDISTRIBUTOR=Project Plus Development Team
       - -DCPACK_PACKAGE_CONTACT=Project Plus Development Team

Distribution/flatpak/flatpak.yml

@@ -6,7 +6,7 @@ for i in {0..9}; do
     ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i;
 done
 
-echo "Make directory /var/data/project-plus-dolphin/Wii if it doesn't exist"
+echo "Make directory /var/data/project-plus-dolphin/user/Wii if it doesn't exist"
 mkdir -p /var/data/project-plus-dolphin/Wii
 
 echo "Make directory /var/config/project-plus-dolphin if it doesn't exist"
@@ -29,23 +29,23 @@ mkdir -p /var/config/project-plus-dolphin
 # fi
 
 echo "Copy dol files to user data directory if they don't already exist"
-cp -nr /app/share/project-plus-dolphin/sys/Wii/Launcher /var/data/project-plus-dolphin/Wii/
+cp -nr /app/share/project-plus-dolphin/sys/Wii/Launcher /var/data/project-plus-dolphin/user/Wii/
 
 echo "Copy user directory to Flatpak user data directory (Overwritting any files already there with any newer files)"
 cp -ru /app/share/project-plus-dolphin/user /var/data/project-plus-dolphin/
 
 # Create and set variables for the system and user HD textures creation dates
 SystemHDTexturesCreationDate=`stat --format="%W" /app/share/project-plus-dolphin/sys/Load/Textures/RSBE01`
-UserHDTexturesCreationDate=`stat --format="%W" /var/data/project-plus-dolphin/Load/Textures/RSBE01`
+UserHDTexturesCreationDate=`stat --format="%W" /var/data/project-plus-dolphin/user/Load/Textures/RSBE01`
 
 echo "Check if there are newer HD textures"
 if [ $SystemHDTexturesCreationDate -gt ${UserHDTexturesCreationDate:=0} ];
 then
-    echo "Make directory /var/data/project-plus-dolphin/Load/Textures if it doesn't exist"
+    echo "Make directory /var/data/project-plus-dolphin/user/Load/Textures if it doesn't exist"
     mkdir -p /var/data/project-plus-dolphin/Load/Textures
 
     echo "Copy newer HD textures to user data directory"
-    cp -r /app/share/project-plus-dolphin/sys/Load/Textures/RSBE01 /var/data/project-plus-dolphin/Load/Textures
+    cp -r /app/share/project-plus-dolphin/sys/Load/Textures/RSBE01 /var/data/project-plus-dolphin/user/Load/Textures
 else
     echo "HD textures are already at latest version"
 fi