From f29c0269fe6b265a5322c1c71bf32321b57a0290 Mon Sep 17 00:00:00 2001 From: squidbus <175574877+squidbus@users.noreply.github.com> Date: Mon, 15 Jun 2026 23:57:34 -0700 Subject: [PATCH] build,ci: Minor clean-up (#4583) --- .github/workflows/build.yml | 4 +- .../workflows/scripts}/clang-format.sh | 0 .../scripts}/linux-appimage-sdl.sh | 0 CMakeLists.txt | 8 +- REUSE.toml | 2 - dist/MacOSBundleInfo.plist.in | 65 ++++------ dist/net.shadps4.shadPS4.metainfo.xml | 121 ------------------ dist/net.shadps4.shadPS4_metadata.pot | 65 ---------- externals/CMakeLists.txt | 2 +- externals/mesa-kosmickrisp | 2 +- 10 files changed, 39 insertions(+), 230 deletions(-) rename {.ci => .github/workflows/scripts}/clang-format.sh (100%) rename .github/{ => workflows/scripts}/linux-appimage-sdl.sh (100%) delete mode 100644 dist/net.shadps4.shadPS4.metainfo.xml delete mode 100644 dist/net.shadps4.shadPS4_metadata.pot diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d5af4caa..dc02f3efb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: - name: Build env: COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} - run: ./.ci/clang-format.sh + run: ./.github/workflows/scripts/clang-format.sh get-info: runs-on: ubuntu-24.04 @@ -300,7 +300,7 @@ jobs: path: ${{ github.workspace }}/build/shadps4 - name: Run AppImage packaging script - run: ./.github/linux-appimage-sdl.sh + run: ./.github/workflows/scripts/linux-appimage-sdl.sh - name: Package and Upload Linux SDL artifact run: | diff --git a/.ci/clang-format.sh b/.github/workflows/scripts/clang-format.sh similarity index 100% rename from .ci/clang-format.sh rename to .github/workflows/scripts/clang-format.sh diff --git a/.github/linux-appimage-sdl.sh b/.github/workflows/scripts/linux-appimage-sdl.sh similarity index 100% rename from .github/linux-appimage-sdl.sh rename to .github/workflows/scripts/linux-appimage-sdl.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dda0d0b5..018f5c866 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -217,7 +217,8 @@ set(EMULATOR_VERSION_PATCH "1") set_source_files_properties(src/shadps4.rc PROPERTIES COMPILE_DEFINITIONS "EMULATOR_VERSION_MAJOR=${EMULATOR_VERSION_MAJOR};EMULATOR_VERSION_MINOR=${EMULATOR_VERSION_MINOR};EMULATOR_VERSION_PATCH=${EMULATOR_VERSION_PATCH}") -set(APP_VERSION "${EMULATOR_VERSION_MAJOR}.${EMULATOR_VERSION_MINOR}.${EMULATOR_VERSION_PATCH} WIP") +set(APP_VERSION_NUM "${EMULATOR_VERSION_MAJOR}.${EMULATOR_VERSION_MINOR}.${EMULATOR_VERSION_PATCH}") +set(APP_VERSION "${APP_VERSION_NUM} WIP") set(APP_IS_RELEASE false) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/common/scm_rev.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/src/common/scm_rev.cpp" @ONLY) @@ -1251,6 +1252,11 @@ if (APPLE) # Replacement for std::chrono::time_zone target_link_libraries(shadps4 PRIVATE date::date-tz epoll-shim) + + # Create and embed Info.plist + set(INFO_PLIST_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/Info.plist) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dist/MacOSBundleInfo.plist.in ${INFO_PLIST_PATH}) + target_link_options(shadps4 PRIVATE LINKER:-sectcreate,__TEXT,__info_plist,${INFO_PLIST_PATH}) elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") target_link_libraries(shadps4 PRIVATE date::date-tz epoll-shim) endif() diff --git a/REUSE.toml b/REUSE.toml index 911d2b849..168309a5d 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -14,8 +14,6 @@ path = [ ".gitmodules", "dist/MacOSBundleInfo.plist.in", "dist/net.shadps4.shadPS4.desktop", - "dist/net.shadps4.shadPS4_metadata.pot", - "dist/net.shadps4.shadPS4.metainfo.xml", "documents/changelog.md", "documents/Quickstart/2.png", "documents/Screenshots/*", diff --git a/dist/MacOSBundleInfo.plist.in b/dist/MacOSBundleInfo.plist.in index 70cbfb4ab..d79258897 100644 --- a/dist/MacOSBundleInfo.plist.in +++ b/dist/MacOSBundleInfo.plist.in @@ -2,45 +2,36 @@ - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL + CFBundleAllowMixedLocalizations + + CFBundleDevelopmentRegion + English + CFBundleExecutable + shadps4 + CFBundleIdentifier + com.shadps4-emu.shadps4 + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + shadps4 + CFBundlePackageType + APPL + CFBundleShortVersionString + ${APP_VERSION} + CFBundleSignature + ???? + CFBundleVersion + ${APP_VERSION_NUM} - CFBundleName - shadps4 - CFBundleIdentifier - com.shadps4-emu.shadps4 - CFBundleExecutable - shadps4 + GCSupportsGameMode + - CFBundleVersion - 1.0.0 - CFBundleShortVersionString - ${MACOSX_BUNDLE_SHORT_VERSION_STRING} + LSApplicationCategoryType + public.app-category.games + LSMinimumSystemVersion + ${CMAKE_OSX_DEPLOYMENT_TARGET} - LSMinimumSystemVersion - ${CMAKE_OSX_DEPLOYMENT_TARGET} - LSApplicationCategoryType - public.app-category.games - GCSupportsGameMode - - - NSHumanReadableCopyright - - - CFBundleIconFile - ${MACOSX_BUNDLE_ICON_FILE} - - CFBundleDevelopmentRegion - en - CFBundleAllowMixedLocalizations - - - NSPrincipalClass - NSApplication - - NSSupportsAutomaticGraphicsSwitching - + NSPrincipalClass + NSApplication diff --git a/dist/net.shadps4.shadPS4.metainfo.xml b/dist/net.shadps4.shadPS4.metainfo.xml deleted file mode 100644 index 8b653a29f..000000000 --- a/dist/net.shadps4.shadPS4.metainfo.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - net.shadps4.shadPS4 - shadPS4 - - shadPS4 Contributors - https://github.com/shadps4-emu/shadps4/graphs/contributors - - PS4 Emulator - CC0-1.0 - GPL-2.0 - net.shadps4.shadPS4.desktop - https://shadps4.net/ - https://github.com/shadps4-emu/shadPS4 - -

shadPS4 is an early PlayStation 4 emulator for Windows, Linux and macOS written in C++.

-

The emulator is still early in development, so don't expect a flawless experience. Nonetheless, the emulator can already run a number of commercial games.

- - - - https://cdn.jsdelivr.net/gh/shadps4-emu/shadps4@main/documents/Screenshots/1.png - Bloodborne by From Software - - - https://cdn.jsdelivr.net/gh/shadps4-emu/shadps4@main/documents/Screenshots/2.png - Hatsune Miku Project DIVA Future Tone by SEGA - - - https://cdn.jsdelivr.net/gh/shadps4-emu/shadps4@main/documents/Screenshots/3.png - Yakuza 0 by SEGA - - - https://cdn.jsdelivr.net/gh/shadps4-emu/shadps4@main/documents/Screenshots/4.png - DRIVECLUB™ by Evolution Studios - - - - Game - - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.16.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.15.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.14.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.13.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.12.5 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.12.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.11.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.10.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.9.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.8.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.7.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.6.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.5.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.4.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.3.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v.0.2.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/0.1.0 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v0.0.3 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v0.0.2 - - - https://github.com/shadps4-emu/shadPS4/releases/tag/v0.0.1 - - - - - keyboard - - - gamepad - - - offline-only - - - shadps4 - - - emulator - emulation - playstation - ps4 - - diff --git a/dist/net.shadps4.shadPS4_metadata.pot b/dist/net.shadps4.shadPS4_metadata.pot deleted file mode 100644 index d77947b7a..000000000 --- a/dist/net.shadps4.shadPS4_metadata.pot +++ /dev/null @@ -1,65 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-11-08 09:07+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. (itstool) path: component/name -#: ./net.shadps4.shadPS4.metainfo.xml:4 -msgid "shadPS4" -msgstr "" - -#. (itstool) path: developer/name -#: ./net.shadps4.shadPS4.metainfo.xml:6 -msgid "shadPS4 Contributors" -msgstr "" - -#. (itstool) path: component/summary -#: ./net.shadps4.shadPS4.metainfo.xml:9 -msgid "PS4 Emulator" -msgstr "" - -#. (itstool) path: description/p -#: ./net.shadps4.shadPS4.metainfo.xml:16 -msgid "shadPS4 is an early PlayStation 4 emulator for Windows, Linux and macOS written in C++." -msgstr "" - -#. (itstool) path: description/p -#: ./net.shadps4.shadPS4.metainfo.xml:17 -msgid "The emulator is still early in development, so don't expect a flawless experience. Nonetheless, the emulator can already run a number of commercial games." -msgstr "" - -#. (itstool) path: screenshot/caption -#: ./net.shadps4.shadPS4.metainfo.xml:22 -msgid "Bloodborne" -msgstr "" - -#. (itstool) path: screenshot/caption -#: ./net.shadps4.shadPS4.metainfo.xml:26 -msgid "Hatsune Miku: Project DIVA Future Tone" -msgstr "" - -#. (itstool) path: screenshot/caption -#: ./net.shadps4.shadPS4.metainfo.xml:30 -msgid "Yakuza Kiwami" -msgstr "" - -#. (itstool) path: screenshot/caption -#: ./net.shadps4.shadPS4.metainfo.xml:34 -msgid "Persona 4 Golden" -msgstr "" - -#. (itstool) path: keywords/keyword -#: ./net.shadps4.shadPS4.metainfo.xml:59 -msgid "emulator" -msgstr "" - -#. (itstool) path: keywords/keyword -#: ./net.shadps4.shadPS4.metainfo.xml:60 -msgid "emulation" -msgstr "" diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 42d87d691..be1848cef 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -373,7 +373,7 @@ else() endif() # macOS Vulkan driver -if (APPLE AND NOT ENABLE_SYSTEM_VULKAN) +if (APPLE AND NOT ENABLE_SYSTEM_VULKAN AND NOT ENABLE_TESTS) add_subdirectory(vulkan-loader) set(VULKAN_LOADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/vulkan-loader/loader/libvulkan.dylib" PARENT_SCOPE) diff --git a/externals/mesa-kosmickrisp b/externals/mesa-kosmickrisp index 73e64c4fc..14db2f36c 160000 --- a/externals/mesa-kosmickrisp +++ b/externals/mesa-kosmickrisp @@ -1 +1 @@ -Subproject commit 73e64c4fc8468a786700ae4cec97aba4a341ff2b +Subproject commit 14db2f36c8036ed73bbe519cc6041f16f6a9c2e3