Update flatpak builds to use 24.08 Freedesktop Runtime and SDK

.github/workflows/build-flatpak.yml

@@ -15,7 +15,7 @@ jobs:
       options: --privileged
 
     env:
-      MANIFEST_PATH: build-aux/flatpak/${{ inputs.flatpak_branch }}/com.inochi2d.inochi-creator.yml
+      MANIFEST_PATH: build-aux/linux/flatpak/com.inochi2d.inochi-creator.yml
       FLATPAK_BRANCH: ${{ inputs.flatpak_branch }}
       FLATPAK_BUILD_DIR: build-dir
       FLATPAK_BUILD_REPO: build-repo

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "res/flatpak/shared-modules"]
-	path = build-aux/flatpak/shared-modules
-	url = https://github.com/flathub/shared-modules.git

build-aux/flatpak/nightly/com.inochi2d.inochi-creator.yml → build-aux/linux/flatpak/com.inochi2d.inochi-creator.yml

@@ -1,34 +1,27 @@
 id: com.inochi2d.inochi-creator
 runtime: org.freedesktop.Platform
-runtime-version: '22.08'
+runtime-version: '24.08'
 sdk: org.freedesktop.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.ldc
-  - org.freedesktop.Sdk.Extension.llvm14
+  - org.freedesktop.Sdk.Extension.llvm18
+add-extensions:
+  - org.freedesktop.Platform.ffmpeg-full:
+    version: '24.08'
+    directory: lib/ffmpeg
+    add-ld-path: .
 command: inochi-creator
 finish-args:
-  - --device=all     #OpenGL rendering, webcams (may be required? not sure)
+  - --device=all          # OpenGL rendering, webcams (may be required? not sure)
   - --socket=fallback-x11
   - --share=ipc
   - --socket=wayland
-  - --filesystem=host     #This is a dev tool, it should probably have as much access to the host as it can. Also needs it for "Recent Files"
-
-## freedesktop ffmpeg extension doesn't provide rawvideo demuxer
-##This extension will be needed in some newer releases, as of https://github.com/Inochi2D/inochi-creator/commit/5d67cded1273aced9033d327a8eb29c6f078a3c0
-#add-extensions:
-#  org.freedesktop.Platform.ffmpeg-full:
-#    version: '22.08'
-#    autodownload: true
-#    autodelete: false
-
+  - --filesystem=host     # This is a dev tool, it should probably have as much access to the host as it can. Also needs it for "Recent Files"
+cleanup-commands:
+  - mkdir -p ${FLATPAK_DEST}/lib/ffmpeg
 
 modules:
 
-  - ../shared-modules/SDL2/SDL2-with-libdecor.json
-
-  # Add ffmpeg to support animation recording
-  - ../modules/ffmpeg.yml
-
   # --- Inochi Creator ---
   - name: Inochi-Creator
     buildsystem: simple
@@ -37,17 +30,20 @@ modules:
         - "--share=network"
 
       append-path: /usr/lib/sdk/ldc/bin
+      prepend-path: /usr/lib/sdk/llvm18/bin
+      prepend-ld-library-path: /usr/lib/sdk/llvm18/lib
+      env:
+        DFLAGS: '-g --d-debug'
     build-commands:
       - chmod +x ./gentl.sh; ./gentl.sh
       - git clone https://github.com/Inochi2D/i2d-imgui.git --recurse-submodules;
-        git clone -b v0_8 https://github.com/Inochi2D/inochi2d.git;
         git clone https://github.com/Inochi2D/dcv-i2d;
         dub add-local i2d-imgui/ "0.8.0";
-        dub add-local inochi2d/ "0.8.5";
         dub add-local dcv-i2d/ "0.3.0";
+        dub build --config=update-version;
         dub build --config=meta;
         dub build --config=linux-nightly --debug=InExperimental
-      - install -m 755 ./out/inochi-creator /app/bin/inochi-creator
+      - install -Dm 755 ./out/inochi-creator /app/bin/inochi-creator
       - install -Dm644 ./out/*.mo /app/bin
 
     sources:
@@ -70,4 +66,4 @@ modules:
         commit: a412602d346ba69c63237217ae286112e300927d
 
       - type: dir
-        path: ../../linux/flatpak/nightly/
+        path: ./nightly/

build-aux/linux/flatpak/nightly/com.inochi2d.inochi-creator.metainfo.xml

@@ -2,8 +2,10 @@
 <component type="desktop">
   <id>com.inochi2d.inochi-creator</id>
   <name>Inochi Creator</name>
-  <summary>Tool to create and edit Inochi2D puppets.</summary>
-  <developer_name>Luna Nielsen</developer_name>
+  <summary>Create and edit Inochi2D puppets</summary>
+  <developer id="com.inochi2d">
+    <name>Luna the Foxgirl</name>
+  </developer>
   <launchable type="desktop-id">com.inochi2d.inochi-creator.desktop</launchable>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>BSD-2-Clause</project_license>
@@ -37,9 +39,13 @@
   <categories>
     <category>Graphics</category>
   </categories>
-  <requires>
+  <recommends>
     <control>pointing</control>
     <control>keyboard</control>
-  </requires>
+  </recommends>
+  <branding>
+    <color type="primary" scheme_preference="light">#dbdbdb</color>
+    <color type="primary" scheme_preference="dark">#242424</color>
+  </branding>
   <content_rating type="oars-1.1"/>
 </component>

build-aux/linux/flatpak/release/com.inochi2d.inochi-creator.metainfo.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>com.inochi2d.inochi-creator</id>
+  <name>Inochi Creator</name>
+  <summary>Create and edit Inochi2D puppets</summary>
+  <developer id="com.inochi2d">
+    <name>Luna the Foxgirl</name>
+  </developer>
+  <launchable type="desktop-id">com.inochi2d.inochi-creator.desktop</launchable>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>BSD-2-Clause</project_license>
+  <description>
+    <p>Inochi2D is a framework for realtime 2D puppet animation which can be used for VTubing, 
+      game development and digital animation.</p>
+    <p>Inochi Creator is a tool that lets you create and edit Inochi2D puppets.</p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <caption>Title screen</caption>
+      <image type="source">https://user-images.githubusercontent.com/7032834/194462402-74c4a3e0-50ca-4b50-8e8d-164d97371f5a.png</image>
+    </screenshot>
+  </screenshots>
+  <releases>
+    <release version="stable"/>
+  </releases>
+  <url type="homepage">https://lunafoxgirlvt.itch.io/inochi-creator</url>
+  <url type="bugtracker">https://github.com/Inochi2D/inochi-creator/issues</url>
+  <url type="help">https://docs.inochi2d.com</url>
+  <url type="donation">https://inochi2d.com/#donate</url>
+  <url type="vcs-browser">https://github.com/Inochi2D/inochi-creator</url>
+  <url type="contribute">https://github.com/Inochi2D/inochi-creator</url>
+  <categories>
+    <category>Graphics</category>
+  </categories>
+  <recommends>
+    <control>pointing</control>
+    <control>keyboard</control>
+  </recommends>
+  <branding>
+    <color type="primary" scheme_preference="light">#dbdbdb</color>
+    <color type="primary" scheme_preference="dark">#242424</color>
+  </branding>
+  <content_rating type="oars-1.1"/>
+</component>

build-aux/linux/flatpak/release/inochi-creator.desktop

@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Inochi Creator
+Exec=inochi-creator
+Icon=com.inochi2d.inochi-creator
+Type=Application
+Categories=Utility

source/creator/core/package.d

@@ -195,6 +195,7 @@ ImGuiID incGetViewportDockSpace() {
 */
 void incOpenWindow() {
     import std.process : environment;
+    import std.string : fromStringz;
 
     switch(environment.get("XDG_SESSION_DESKTOP")) {
         case "i3":
@@ -249,10 +250,10 @@ void incOpenWindow() {
     }
 
 
-    int code = SDL_Init(SDL_INIT_EVERYTHING);
+    int code = SDL_Init(SDL_INIT_EVERYTHING & ~SDL_INIT_AUDIO);
     enforce(
         code == 0,
-        "Error initializing SDL2! %s".format(SDL_GetError())
+        "Error initializing SDL2! %s".format(SDL_GetError().fromStringz)
     );
 
     version(Windows) {