Limbo - 6.0.0

metadata/com.limbo.emu.main.yml

@@ -110,6 +110,49 @@ Builds:
       - make limbo BUILD_HOST=armeabi-v7a
     ndk: r14b
 
+  - versionName: 6.0.0-x86
+    versionCode: 60000
+    commit: v6.0.0-LimboEmulator
+    subdir: limbo-android-x86
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y libltdl-dev g++-multilib texinfo
+    gradle:
+      - yes
+    srclibs:
+      - qemu@v5.1.0
+      - glib@2.56.1
+      - libffi@v3.3
+      - pixman@pixman-0.40.0
+      - SDL@release-2.0.8
+    prebuild:
+      - cd ../limbo-android-lib/src/main/jni
+      - export PATH=$PATH:$$NDK$$
+      - export NDK_MODULE_PATH=$$NDK$$/sources/
+      - sed -i -e '/NDK_ROOT/d' android-config/android-limbo-config.mak
+      - cp -r $$qemu$$ qemu
+      - cp -r $$glib$$ glib
+      - cp -r $$libffi$$ libffi
+      - cp -r $$pixman$$ pixman
+      - cp -r $$SDL$$ SDL2
+      - patch -d qemu -p1 < patches/qemu-5.1.0.patch
+      - patch -d glib -p1 < patches/glib-2.56.1.patch
+      - patch -d SDL2 -p1 < patches/sdl2-2.0.8.patch
+      - make clean
+    scandelete:
+      - limbo-android-lib
+    build:
+      - cd ../limbo-android-lib/src/main/jni
+      - export USE_QEMU_VERSION=5.1.0
+      - export NDK_ROOT=$$NDK$$
+      - export NDK_MODULE_PATH=$$NDK$$/sources/
+      - make -C qemu/roms bios seavgabios
+      - export BUILD_GUEST=x86_64-softmmu
+      - make limbo BUILD_HOST=arm64-v8a
+      - make distclean
+      - make limbo BUILD_HOST=armeabi-v7a
+    ndk: r22b
+
 MaintainerNotes: |-
     We only build x86 emulation on ARM devices for now.
     ARM emulation on x86 devices would require a separate build recipe (the app ID is different).

srclibs/qemu.yml

@@ -1,5 +1,8 @@
-Repo: git://git.qemu.org/qemu.git
+Repo: git://gitlab.com/qemu-project/qemu/
 RepoType: git
 
 Prepare: |
+  sed -i -e 's/git.qemu.org\/git/gitlab.com\/qemu-project/g' .gitmodules
   git submodule update --init
+# Switch to the Gitlab mirror to avoid Let's Encrypt certs issue, might be reverted after main repo gets new certs
+# sed submodules paths in the mirror for 5.1.0, but was fixed in newer versions