The XTConvert sub-module

.github/workflows/macos-ci.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - master
       - stable
-      - wip-translator
+      - wip-xtconvert
   pull_request:
     branches:
       - master
@@ -153,12 +153,21 @@ jobs:
 
     - name: Rename package
       shell: bash
+      if: success() && github.event_name != 'pull_request' && github.event_name != 'workflow_dispatch' && steps.event-check.outputs.is_pull_request == 'false' && steps.upload-check.outputs.available == 'true'
       run: |
         mv ./bin-cmake-release/pge-project-${BRANCH_NAME}-macosx.pkg ./bin-cmake-release/pge-project-${BRANCH_NAME}-macosx-${{ matrix.config.arch }}.pkg
         # mv ./bin-cmake-release/pge-project-${BRANCH_NAME}-macosx.dmg ./bin-cmake-release/pge-project-${BRANCH_NAME}-macosx-${{ matrix.config.arch }}.dmg
 
+    - name: Upload artifact
+      if: success() && steps.upload-check.outputs.available == 'true'
+      uses: actions/upload-artifact@v4
+      continue-on-error: true
+      with:
+        path: bin-cmake-release/*.pkg
+        name: ${{ matrix.config.name }} ${{ matrix.config.build_type }}
+
     - name: Deploy to builds.wohlsoft.ru
-      if: success() && github.event_name != 'pull_request' && steps.event-check.outputs.is_pull_request == 'false' && steps.upload-check.outputs.available == 'true'
+      if: success() && github.event_name != 'pull_request' && github.event_name != 'workflow_dispatch' && steps.event-check.outputs.is_pull_request == 'false' && steps.upload-check.outputs.available == 'true'
       shell: bash
       run: |
         if [[ ! -z "${{ matrix.config.extra_path }}" ]]; then

.github/workflows/ubuntu-ci.yml

@@ -6,7 +6,7 @@ on:
       - master
       - stable
       - versus-ci-ubuntu
-      - wip-translator
+      - wip-xtconvert
   pull_request:
     branches:
       - master
@@ -74,8 +74,7 @@ jobs:
     - name: Pull submodules
       shell: bash
       run: |
-        git submodule init
-        git submodule update
+        git submodule update --init --recursive
 
     - name: Check if a pull request
       id: event-check
@@ -214,8 +213,16 @@ jobs:
 
         ./build.sh no-pause ninja deploy static-qt qt-png portable
 
+    - name: Upload artifact
+      if: success() && steps.upload-check.outputs.available == 'true'
+      uses: actions/upload-artifact@v4
+      continue-on-error: true
+      with:
+        path: bin-cmake-release/*.tar.bz2
+        name: ${{ matrix.config.name }} ${{ matrix.config.build_type }}
+
     - name: Deploy to builds.wohlsoft.ru
-      if: success() && github.event_name != 'pull_request' && steps.event-check.outputs.is_pull_request == 'false' && steps.upload-check.outputs.available == 'true'
+      if: success() && github.event_name != 'pull_request' && github.event_name != 'workflow_dispatch' && steps.event-check.outputs.is_pull_request == 'false' && steps.upload-check.outputs.available == 'true'
       shell: bash
       run: |
         if [[ ! -z "${{ matrix.config.extra_path }}" ]]; then

.github/workflows/windows-ci.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - master
       - stable
-      - wip-translator
+      - wip-xtconvert
   pull_request:
     branches:
       - master
@@ -36,7 +36,9 @@ jobs:
             qt_download: "https://wohlsoft.ru/docs/Software/QtBuilds/Qt-5.15.10-x64-mingw-w64-13.1.0-shared-release.7z", qt_install_dir: "C:/Qt/",
             qt_dir: "C:/Qt/5.15.10-x64/bin",
             ninja_download: "https://wohlsoft.ru/docs/Software/Ninja-Build/ninja-win.zip", ninja_install_dir: "C:/MinGW-w64/mingw64/bin",
-            lftp_download: "https://wohlsoft.ru/docs/Software/lftp-4.4.15.win64-openssl-1.0.1g.7z", lftp_install_dir: "C:/MinGW-w64/mingw64/"
+            lftp_download: "https://wohlsoft.ru/docs/Software/lftp-4.4.15.win64-openssl-1.0.1g.7z", lftp_install_dir: "C:/MinGW-w64/mingw64/",
+            libxz_download: "https://wohlsoft.ru/docs/Software/MinGW/mingw-w64-x86_64-xz-5.6.4-1-any.7z", libxz_install_dir: "C:/MinGW-w64/mingw64/",
+            libgnurx_download: "https://wohlsoft.ru/docs/Software/MinGW/mingw-w64-x86_64-libgnurx-2.5.1-3-any.7z", libgnurx_install_dir: "C:/MinGW-w64/mingw64/"
           }
         - {
             name: "32-bit",
@@ -51,7 +53,9 @@ jobs:
             qt_download: "https://wohlsoft.ru/docs/Software/QtBuilds/Qt-5.6.3-i686-mingw-w64-12.2.0-shared-release.7z", qt_install_dir: "C:/Qt/",
             qt_dir: "C:/Qt/5.6.3-i686/bin",
             ninja_download: "https://wohlsoft.ru/docs/Software/Ninja-Build/ninja-win.zip", ninja_install_dir: "C:/MinGW-w64/mingw32/bin",
-            lftp_download: "https://wohlsoft.ru/docs/Software/lftp-4.4.15.win64-openssl-1.0.1g.7z", lftp_install_dir: "C:/MinGW-w64/mingw32/"
+            lftp_download: "https://wohlsoft.ru/docs/Software/lftp-4.4.15.win64-openssl-1.0.1g.7z", lftp_install_dir: "C:/MinGW-w64/mingw32/",
+            libxz_download: "https://wohlsoft.ru/docs/Software/MinGW/mingw-w64-i686-xz-5.6.4-1-any.7z", libxz_install_dir: "C:/MinGW-w64/mingw32/",
+            libgnurx_download: "https://wohlsoft.ru/docs/Software/MinGW/mingw-w64-i686-libgnurx-2.5.1-3-any.7z", libgnurx_install_dir: "C:/MinGW-w64/mingw32/"
           }
 
     steps:
@@ -99,6 +103,32 @@ jobs:
       run: |
         7z x mingw.7z -o"${{ matrix.config.mingw_install_dir }}"
 
+    - name: Download libxz
+      if: matrix.config.libxz_download
+      uses: carlosperate/download-file-action@v2
+      with:
+        file-url: "${{ matrix.config.libxz_download }}"
+        file-name: libxz.7z
+
+    - name: Extract libxz
+      if: matrix.config.libxz_install_dir
+      shell: bash
+      run: |
+        7z x libxz.7z bin lib include -o"${{ matrix.config.libxz_install_dir }}"
+
+    - name: Download libgnurx
+      if: matrix.config.libgnurx_download
+      uses: carlosperate/download-file-action@v2
+      with:
+        file-url: "${{ matrix.config.libgnurx_download }}"
+        file-name: libgnurx.7z
+
+    - name: Extract libgnurx
+      if: matrix.config.libgnurx_install_dir
+      shell: bash
+      run: |
+        7z x libgnurx.7z bin lib include -o"${{ matrix.config.libgnurx_install_dir }}"
+
     - name: Download Qt
       if: matrix.config.qt_download
       uses: carlosperate/download-file-action@v2
@@ -198,8 +228,16 @@ jobs:
         mkdir _packed
         mv bin-cmake-release/_packed/*.zip _packed
 
+    - name: Upload artifact
+      if: success() && steps.upload-check.outputs.available == 'true'
+      uses: actions/upload-artifact@v4
+      continue-on-error: true
+      with:
+        path: _packed/*.zip
+        name: ${{ matrix.config.name }} ${{ matrix.config.build_type }}
+
     - name: Deploy to builds.wohlsoft.ru
-      if: success() && github.event_name != 'pull_request' && steps.event-check.outputs.is_pull_request == 'false' && steps.upload-check.outputs.available == 'true'
+      if: success() && github.event_name != 'pull_request' && github.event_name != 'workflow_dispatch' && steps.event-check.outputs.is_pull_request == 'false' && steps.upload-check.outputs.available == 'true'
       shell: bash
       run: |
         if [[ ! -z "${{ matrix.config.extra_path }}" ]]; then

.gitmodules

@@ -50,3 +50,47 @@
 	path = _Libs/libtiff
 	url = https://github.com/WohlSoft/libtiff.git
 	branch = master
+[submodule "_Libs/tex3ds"]
+	path = _Libs/tex3ds
+	url = https://github.com/WohlSoft/xtconvert-tex3ds.git
+	branch = libtex3ds
+[submodule "_Libs/3dstools"]
+	path = _Libs/3dstools
+	url = https://github.com/WohlSoft/xtconvert-3dstools.git
+	branch = libromfs3ds
+[submodule "_Libs/libimagequant"]
+	path = _Libs/libimagequant
+	url = https://github.com/WohlSoft/xtconvert-libimagequant.git
+	branch = 2.x
+[submodule "_Libs/libarchive"]
+	path = _Libs/libarchive
+	url = https://github.com/WohlSoft/xtconvert-libarchive.git
+	branch = fix-iso-filenames
+[submodule "_Libs/mbediso"]
+	path = _Libs/mbediso
+	url = https://github.com/WohlSoft/mbediso.git
+	branch = main
+[submodule "_Libs/spc2it"]
+	path = _Libs/spc2it
+	url = https://github.com/WohlSoft/spc2it.git
+	branch = master
+[submodule "_Libs/mmutil"]
+	path = _Libs/mmutil
+	url = https://github.com/WohlSoft/mmutil.git
+	branch = master
+[submodule "_Libs/lz4"]
+	path = _Libs/lz4
+	url = https://github.com/WohlSoft/lz4.git
+	branch = release-patches
+[submodule "_Libs/libgnurx"]
+	path = _Libs/libgnurx
+	url = https://github.com/WohlSoft/libgnurx.git
+	branch = master
+[submodule "_Libs/libxz"]
+	path = _Libs/libxz
+	url = https://github.com/WohlSoft/xz.git
+	branch = master
+[submodule "_Libs/libtiff"]
+	path = _Libs/libtiff
+	url = https://github.com/WohlSoft/libtiff.git
+	branch = master

CMakeLists.txt

@@ -89,6 +89,32 @@ endif()
 option(PGE_STATIC_SDLMIXER "Prefer static assembly of SDL Mixer X and libraries" ${PGE_STATIC_SDLMIXER_PLATFORM_DEFAULT})
 option(ENABLE_ADDRESS_SANITIZER "Enable the Address Sanitizer GCC feature" OFF)
 
+set(AUDIOCODECS_ENABLE_ENCODERS OFF)
+set(SDLMIXER_USE_OGG_STB ON)
+
+if(NOT EMSCRIPTEN AND NOT ANDROID)
+    option(PGE_BUILD_GIFS2PNG "Build the GIFs2PNG utility component" ON)
+    option(PGE_BUILD_PNG2GIFS "Build the GIFs2PNG utility component" ON)
+    option(PGE_BUILD_LAZYFIXTOOL "Build the LazyFixTool utility component" ON)
+    option(PGE_BUILD_PALETTEFILTER "Build the PaletteFilter utility component" ON)
+endif()
+
+option(PGE_BUILD_ENGINE "Build the Runtime Engine component" ON)
+
+if(PGE_ENABLE_QT AND NOT ANDROID AND NOT EMSCRIPTEN)
+    option(PGE_BUILD_EDITOR "Build the PGE Editor component (Qt5 required)" ON)
+    option(PGE_BUILD_PLAYERCALIBRATOR "Build the Player Calibrator utility component (Qt5 required)" ON)
+    option(PGE_BUILD_MUSICPLAYER "Build the SDL Mixer X Music Player component (Qt5 required)" ON)
+    option(PGE_BUILD_MAINTAINER "Build the Maintainer utility component (Qt5 required)" ON)
+    option(PGE_BUILD_TRANSLATOR "Build the Translator utility component (Qt5 required)" ON)
+    option(PGE_BUILD_XTCONVERT "Build the XTConvert utility component" ON)
+
+    if(PGE_BUILD_XTCONVERT)
+        set(AUDIOCODECS_ENABLE_ENCODERS ON)
+        set(SDLMIXER_USE_OGG_STB OFF)
+    endif()
+endif()
+
 if(PGE_STATIC_SDLMIXER)
     set(PGE_SHARED_SDLMIXER OFF)
 else()
@@ -120,6 +146,10 @@ if(PGE_ENABLE_STATIC_QT AND "${CMAKE_SYSTEM}" MATCHES "Linux")
     include(_common/library_tiff.cmake)
 endif()
 
+if(PGE_ENABLE_QT AND (PGE_BUILD_MAINTAINER OR PGE_BUILD_XTCONVERT))
+    add_subdirectory(_common/qt-modules/episode_box)
+endif()
+
 if(NOT USE_SYSTEM_LIBPNG)
     add_dependencies(libpng_Local AudioCodecs_Local) #Zlib is needed to libPNG
     add_dependencies(FREETYPE_Local libpng_Local) #libPNG is needed to FreeType
@@ -153,7 +183,6 @@ endif()
 # Build dependent libraries only
 add_custom_target(libs DEPENDS ${LIBS_TARGETS})
 
-option(PGE_BUILD_ENGINE "Build the Runtime Engine component" ON)
 if(PGE_BUILD_ENGINE)
     add_subdirectory(Engine)
     # Append changelog file
@@ -165,35 +194,45 @@ if(PGE_BUILD_ENGINE)
 endif()
 
 if(NOT EMSCRIPTEN AND NOT ANDROID)
-    option(PGE_BUILD_GIFS2PNG "Build the GIFs2PNG utility component" ON)
     if(PGE_BUILD_GIFS2PNG)
         add_subdirectory(GIFs2PNG)
         InstallTextFile(FILE "${Moondust_SOURCE_DIR}/Content/readmes/GIFs2PNG_Readme.txt" RENAME "GIFs2PNG.readme.txt" DESTINATION "${PGE_INSTALL_DOCS}" COMPONENT "MoondustGifs2PNG")
     endif()
 
-    option(PGE_BUILD_PNG2GIFS "Build the GIFs2PNG utility component" ON)
     if(PGE_BUILD_PNG2GIFS)
         add_subdirectory(PNG2GIFs)
         InstallTextFile(FILE "${Moondust_SOURCE_DIR}/Content/readmes/PNG2GIFs_Readme.txt" RENAME "PNG2GIFs.readme.txt" DESTINATION "${PGE_INSTALL_DOCS}" COMPONENT "MoondustPNG2GIFs")
     endif()
 
-    option(PGE_BUILD_LAZYFIXTOOL "Build the LazyFixTool utility component" ON)
     if(PGE_BUILD_LAZYFIXTOOL)
         add_subdirectory(LazyFixTool)
         InstallTextFile(FILE "${Moondust_SOURCE_DIR}/Content/readmes/LazyFixTool_Readme.txt" RENAME "LazyFixTool.readme.txt" DESTINATION "${PGE_INSTALL_DOCS}" COMPONENT "MoondustLazyFixTool")
     endif()
 
-    option(PGE_BUILD_PALETTEFILTER "Build the PaletteFilter utility component" ON)
     if(PGE_BUILD_PALETTEFILTER)
         add_subdirectory(PaletteFilter)
         InstallTextFile(FILE "${Moondust_SOURCE_DIR}/Content/readmes/PaletteFilter_Readme.txt" RENAME "PaletteFilter.readme.txt" DESTINATION "${PGE_INSTALL_DOCS}" COMPONENT "MoondustPalleteFilter")
     endif()
+
+    if(PGE_BUILD_XTCONVERT)
+        include(_common/library_lz4.cmake)
+        include(_common/library_mbediso.cmake)
+        include(_common/library_lib3dstools.cmake)
+        include(_common/library_tex3ds.cmake)
+        include(_common/library_libimagequant.cmake)
+        include(_common/library_spc2it.cmake)
+        include(_common/library_mmutil.cmake)
+        include(_common/library_lzma.cmake)
+        include(_common/library_gnurx.cmake)
+        include(_common/library_libarchive.cmake)
+        add_subdirectory(XTConvert)
+        InstallTextFile(FILE "${Moondust_SOURCE_DIR}/Content/readmes/XTConvert_Readme.txt" RENAME "XTConvert.readme.txt" DESTINATION "${PGE_INSTALL_DIRECTORY}")
+    endif()
 endif()
 
 if(PGE_ENABLE_QT AND NOT ANDROID AND NOT EMSCRIPTEN)
     include(_common/qt-modules/qt_modules_langs.cmake)
 
-    option(PGE_BUILD_EDITOR "Build the PGE Editor component (Qt5 required)" ON)
     if(PGE_BUILD_EDITOR)
         add_subdirectory(Editor)
         # Append changelog file
@@ -202,7 +241,6 @@ if(PGE_ENABLE_QT AND NOT ANDROID AND NOT EMSCRIPTEN)
         qtDeployAdd(pge_editor)
     endif()
 
-    option(PGE_BUILD_PLAYERCALIBRATOR "Build the Player Calibrator utility component (Qt5 required)" ON)
     if(PGE_BUILD_PLAYERCALIBRATOR)
         add_subdirectory(PlayableCalibrator)
         # Append changelog file
@@ -211,7 +249,6 @@ if(PGE_ENABLE_QT AND NOT ANDROID AND NOT EMSCRIPTEN)
         qtDeployAdd(pge_calibrator)
     endif()
 
-    option(PGE_BUILD_MUSICPLAYER "Build the SDL Mixer X Music Player component (Qt5 required)" ON)
     if(PGE_BUILD_MUSICPLAYER)
         add_subdirectory(MusicPlayer)
         # Append changelog file
@@ -220,13 +257,11 @@ if(PGE_ENABLE_QT AND NOT ANDROID AND NOT EMSCRIPTEN)
         qtDeployAdd(pge_musplay)
     endif()
 
-    option(PGE_BUILD_MAINTAINER "Build the Maintainer utility component (Qt5 required)" ON)
     if(PGE_BUILD_MAINTAINER)
         add_subdirectory(Maintainer)
         qtDeployAdd(pge_maintainer)
     endif()
 
-    option(PGE_BUILD_TRANSLATOR "Build the Translator utility component (Qt5 required)" ON)
     if(PGE_BUILD_TRANSLATOR)
         add_subdirectory(Translator)
         qtDeployAdd(pge_translator)

Content/readmes/XTConvert_Readme.txt

@@ -0,0 +1 @@
+XTConvert - an experimental utility to convert episodes and game assets packs for TheXTech into various portable packages.