Update to LOVE 11.5

repo/love/.github/workflows/main.yml

@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   linux-os:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - name: Update APT
       run: sudo apt-get update
@@ -17,36 +17,52 @@ jobs:
                                           libegl1-mesa-dev libibus-1.0-dev fcitx-libs-dev libsamplerate0-dev \
                                           libsndio-dev libwayland-dev libxkbcommon-dev libdrm-dev libgbm-dev
     - name: Checkout love-appimage-source
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
-        repository: MikuAuahDark/love-appimage-source
+        repository: love2d/love-appimage-source
+        ref: 11.x
     - name: Checkout LÖVE
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         path: love2d-${{ github.sha }}
+    - name: Get Dependencies for AppImage
+      shell: python
+      env:
+        LOVE_BRANCH: ${{ github.sha }}
+      run: |
+        import os
+        for i in range(250):
+            if os.system(f"make getdeps LOVE_BRANCH={os.environ['LOVE_BRANCH']}") == 0:
+                raise SystemExit(0)
+        raise Exception("make getdeps failed")
     - name: Build AppImage
       run: make LOVE_BRANCH=${{ github.sha }}
     - name: Print LuaJIT branch
       run: git -C LuaJIT-v2.1 branch -v
     - name: Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: love-x86_64.AppImage
         path: love-${{ github.sha }}.AppImage
+    - name: Artifact Debug Symbols
+      uses: actions/upload-artifact@v3
+      with:
+        name: love-x86_64-AppImage-debug
+        path: love-${{ github.sha }}.AppImage-debug.tar.gz
   windows-os:
     runs-on: windows-latest
     strategy:
       matrix:
         platform: [Win32, x64]
     steps:
     - name: Clone Megasource
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         path: megasource
         repository: love2d/megasource
-        ref: main
+        ref: 11.x
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         path: megasource/libs/love
     - name: Configure
@@ -58,26 +74,26 @@ jobs:
       shell: cmd
       run: cmake --build build --config Release --target install -j2
     - name: Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: love-windows-${{ matrix.platform }}
         path: install
     - name: Artifact JIT Modules
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: love-windows-jitmodules-${{ matrix.platform }}
         path: build/libs/LuaJIT/src/jit/*.lua
   macOS:
     runs-on: macos-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Clone Dependencies
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         path: apple-dependencies
         repository: love2d/love-apple-dependencies
-        ref: main
+        ref: 11.x
     - name: Move Dependencies
       run:
         mv apple-dependencies/macOS/Frameworks platform/xcode/macosx
@@ -91,21 +107,21 @@ jobs:
       run:
         ditto -c -k --sequesterRsrc --keepParent love-macos/love.app love-macos.zip 
     - name: Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: love-macos
         path: love-macos.zip
   iOS-Simulator:
     runs-on: macos-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Clone Dependencies
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         path: apple-dependencies
         repository: love2d/love-apple-dependencies
-        ref: main
+        ref: 11.x
     - name: Move Dependencies
       run: |
         mv apple-dependencies/iOS/libraries platform/xcode/ios

repo/love/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/love2d/love
 	branch = master
-	commit = 334b674f121b9fd226ddad8f4ad5d90f6b451b3e
+	commit = 6807e54bab3a080b7ac3f75ac8c02d1c00fd8f67
 	parent = ca768a8378b48f0dc3b9a96427c26aa8e9b4a68f
 	method = merge
-	cmdver = 0.4.3
+	cmdver = 0.4.6

repo/love/Android.mk

@@ -2,9 +2,9 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE    := liblove
-LOCAL_CFLAGS    := -g -DGL_GLEXT_PROTOTYPES -DAL_ALEXT_PROTOTYPES
 
-LOCAL_CPPFLAGS  := ${LOCAL_CFLAGS} 
+LOCAL_CFLAGS    := -g -DGL_GLEXT_PROTOTYPES -DAL_ALEXT_PROTOTYPES -fvisibility=hidden
+LOCAL_CPPFLAGS  := -fvisibility-inlines-hidden
 
 # I don't think there's armeabi-v7a device without NEON instructions in 2018
 LOCAL_ARM_NEON := true