mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-03 14:49:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge a87d24efa9 into 84d28a4272

Browse source
This commit is contained in:
petterreinholdtsen 2025-02-02 12:46:46 -05:00 • committed by GitHub
commit 1d5a1cb19d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMake/ScmRevGen.cmake
View file

@ -71,5 +71,5 @@ if(APPLE)
endif() endif()
if(LINUX) if(LINUX)
configure_source_file("Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml") configure_source_file("Flatpak/org.dolphin_emu.dolphin_emu.metainfo.xml")
endif() endif()

6
CMakeLists.txt
View file

@ -795,8 +795,8 @@ endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Linux") if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Flatpak) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Flatpak)
if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml) if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.dolphin_emu.dolphin_emu.metainfo.xml)
file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml) file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.dolphin_emu.dolphin_emu.metainfo.xml)
endif() endif()
endif() endif()
@ -807,7 +807,7 @@ endif()
add_custom_target( add_custom_target(
dolphin_scmrev dolphin_scmrev
${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} -DDISTRIBUTOR=${DISTRIBUTOR} -DDOLPHIN_DEFAULT_UPDATE_TRACK=${DOLPHIN_DEFAULT_UPDATE_TRACK} -DGIT_FOUND=${GIT_FOUND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DDOLPHIN_WC_REVISION=${DOLPHIN_WC_REVISION} -DDOLPHIN_WC_DESCRIBE=${DOLPHIN_WC_DESCRIBE} -DDOLPHIN_WC_BRANCH=${DOLPHIN_WC_BRANCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/ScmRevGen.cmake ${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} -DDISTRIBUTOR=${DISTRIBUTOR} -DDOLPHIN_DEFAULT_UPDATE_TRACK=${DOLPHIN_DEFAULT_UPDATE_TRACK} -DGIT_FOUND=${GIT_FOUND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DDOLPHIN_WC_REVISION=${DOLPHIN_WC_REVISION} -DDOLPHIN_WC_DESCRIBE=${DOLPHIN_WC_DESCRIBE} -DDOLPHIN_WC_BRANCH=${DOLPHIN_WC_BRANCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/ScmRevGen.cmake
BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/DolphinQt/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/MacUpdater/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml" BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/DolphinQt/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/MacUpdater/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.dolphin_emu.dolphin_emu.metainfo.xml"
VERBATIM VERBATIM
) )

2
Flatpak/org.DolphinEmu.dolphin-emu.yml
View file

@ -63,7 +63,7 @@ modules:
- /share/man - /share/man
post-install: post-install:
- install -D -t ${FLATPAK_DEST}/bin/ ../dolphin-emu-wrapper - install -D -t ${FLATPAK_DEST}/bin/ ../dolphin-emu-wrapper
- install -Dm644 -t ${FLATPAK_DEST}/share/metainfo/ Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml - install -Dm644 -t ${FLATPAK_DEST}/share/metainfo/ Flatpak/org.dolphin_emu.dolphin_emu.metainfo.xml
- desktop-file-edit --set-key=Exec --set-value='/app/bin/dolphin-emu-wrapper' - desktop-file-edit --set-key=Exec --set-value='/app/bin/dolphin-emu-wrapper'
/app/share/applications/dolphin-emu.desktop /app/share/applications/dolphin-emu.desktop
sources: sources:

13
Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml.in → Flatpak/org.dolphin_emu.dolphin_emu.metainfo.xml.in
View file

@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2016 Jeremy Newton --> <!-- Copyright 2016 Jeremy Newton -->
<component type="desktop-application"> <component type="desktop-application">
<id>org.DolphinEmu.dolphin-emu</id> <id>org.dolphin_emu.dolphin_emu</id>
<name>Dolphin Emulator</name> <name>Dolphin Emulator</name>
<developer id="org.dolphin-emu">
<name>Dolphin Emulator Project</name>
</developer>
<summary>GameCube / Wii</summary> <summary>GameCube / Wii</summary>
<metadata_license>CC-BY-SA-3.0</metadata_license> <metadata_license>CC-BY-SA-3.0</metadata_license>
<project_license>GPL-2.0+</project_license> <project_license>GPL-2.0+</project_license>
@ -15,19 +12,19 @@
<screenshots> <screenshots>
<screenshot type="default"> <screenshot type="default">
<caption>Dolphin's main window</caption> <caption>Dolphin's main window</caption>
<image type="source">http://dolphin-emu.org/m/user/flatpak/screenshot_1.png</image> <image type="source">https://dolphin-emu.org/m/user/flatpak/screenshot_1.png</image>
</screenshot> </screenshot>
<screenshot> <screenshot>
<caption>In-game</caption> <caption>In-game</caption>
<image type="source">http://dolphin-emu.org/m/user/flatpak/screenshot_2.png</image> <image type="source">https://dolphin-emu.org/m/user/flatpak/screenshot_2.png</image>
</screenshot> </screenshot>
<screenshot> <screenshot>
<caption>Graphics configuration</caption> <caption>Graphics configuration</caption>
<image type="source">http://dolphin-emu.org/m/user/flatpak/screenshot_3.png</image> <image type="source">https://dolphin-emu.org/m/user/flatpak/screenshot_3.png</image>
</screenshot> </screenshot>
<screenshot> <screenshot>
<caption>Controller configuration</caption> <caption>Controller configuration</caption>
<image type="source">http://dolphin-emu.org/m/user/flatpak/screenshot_4.png</image> <image type="source">https://dolphin-emu.org/m/user/flatpak/screenshot_4.png</image>
</screenshot> </screenshot>
</screenshots> </screenshots>
<launchable type="desktop-id">dolphin-emu.desktop</launchable> <launchable type="desktop-id">dolphin-emu.desktop</launchable>