Xargon/org.DolphinEmu.dolphin-emu
1
0
Fork 0
mirror of https://github.com/RetroDECK/org.DolphinEmu.dolphin-emu.git synced 2024-11-25 07:05:38 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Misc improvements

Browse source
This commit is contained in:
Patrick Griffis 2017-11-16 18:38:51 -05:00
parent 5ae386a2cd
commit bf23be830b
5 changed files with 220 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -1,2 +1,3 @@
.flatpak-builder /.flatpak-builder/
repo /build/
/repo/

125
6033250bebe9f5dcec47c4e2ec8e5d3b102f73e7.patch Normal file
View file

@ -0,0 +1,125 @@
From 6033250bebe9f5dcec47c4e2ec8e5d3b102f73e7 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sat, 3 Dec 2016 18:36:34 +0000
Subject: [PATCH] CMake: Add an option to disable each sound backend.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
They are already disabled when the libraries can’t be found, this only
helps people who want to build without them despite having them
installed, for example to provide a package to someone else.
---
CMakeLists.txt | 80 ++++++++++++++++++++++++++++++++++++----------------------
1 file changed, 50 insertions(+), 30 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc608e7978b..f9a3abbe3b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,10 @@ option(ENABLE_PCH "Use PCH to speed up compilation" ON)
option(ENABLE_LTO "Enables Link Time Optimization" OFF)
option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" OFF)
option(ENABLE_HEADLESS "Enables running Dolphin as a headless variant" OFF)
+option(ENABLE_ALSA "Enables ALSA sound backend" ON)
+option(ENABLE_AO "Enables libao sound backend" ON)
+option(ENABLE_PULSEAUDIO "Enables PulseAudio sound backend" ON)
+option(ENABLE_OPENAL "Enables OpenAL sound backend" ON)
# Maintainers: if you consider blanket disabling this for your users, please
# consider the following points:
@@ -445,23 +449,31 @@ if (OPENGL_GL)
include_directories(${OPENGL_INCLUDE_DIR})
endif()
-include(FindALSA OPTIONAL)
-if(ALSA_FOUND)
- add_definitions(-DHAVE_ALSA=1)
- message("ALSA found, enabling ALSA sound backend")
+if(ENABLE_ALSA)
+ include(FindALSA OPTIONAL)
+ if(ALSA_FOUND)
+ add_definitions(-DHAVE_ALSA=1)
+ message("ALSA found, enabling ALSA sound backend")
+ else()
+ add_definitions(-DHAVE_ALSA=0)
+ message("ALSA NOT found, disabling ALSA sound backend")
+ endif()
else()
- add_definitions(-DHAVE_ALSA=0)
- message("ALSA NOT found, disabling ALSA sound backend")
-endif(ALSA_FOUND)
-
-check_lib(AO ao ao QUIET)
-if(AO_FOUND)
- add_definitions(-DHAVE_AO=1)
- message("ao found, enabling ao sound backend")
+ message("ALSA explicitly disabled, disabling ALSA sound backend")
+endif()
+
+if(ENABLE_AO)
+ check_lib(AO ao ao QUIET)
+ if(AO_FOUND)
+ add_definitions(-DHAVE_AO=1)
+ message("ao found, enabling ao sound backend")
+ else()
+ add_definitions(-DHAVE_AO=0)
+ message("ao NOT found, disabling ao sound backend")
+ endif()
else()
- add_definitions(-DHAVE_AO=0)
- message("ao NOT found, disabling ao sound backend")
-endif(AO_FOUND)
+ message("ao explicitly disabled, disabling ao sound backend")
+endif()
check_lib(BLUEZ bluez bluez QUIET)
if(BLUEZ_FOUND)
@@ -472,24 +484,32 @@ else()
message("bluez NOT found, disabling bluetooth support")
endif(BLUEZ_FOUND)
-check_lib(PULSEAUDIO libpulse pulse QUIET)
-if(PULSEAUDIO_FOUND)
- add_definitions(-DHAVE_PULSEAUDIO=1)
- message("PulseAudio found, enabling PulseAudio sound backend")
+if(ENABLE_PULSEAUDIO)
+ check_lib(PULSEAUDIO libpulse pulse QUIET)
+ if(PULSEAUDIO_FOUND)
+ add_definitions(-DHAVE_PULSEAUDIO=1)
+ message("PulseAudio found, enabling PulseAudio sound backend")
+ else()
+ add_definitions(-DHAVE_PULSEAUDIO=0)
+ message("PulseAudio NOT found, disabling PulseAudio sound backend")
+ endif()
else()
- add_definitions(-DHAVE_PULSEAUDIO=0)
- message("PulseAudio NOT found, disabling PulseAudio sound backend")
-endif(PULSEAUDIO_FOUND)
+ message("PulseAudio explicitly disabled, disabling PulseAudio sound backend")
+endif()
-include(FindOpenAL OPTIONAL)
-if(OPENAL_FOUND)
- add_definitions(-DHAVE_OPENAL=1)
- include_directories(${OPENAL_INCLUDE_DIR})
- message("OpenAL found, enabling OpenAL sound backend")
+if(ENABLE_OPENAL)
+ include(FindOpenAL OPTIONAL)
+ if(OPENAL_FOUND)
+ add_definitions(-DHAVE_OPENAL=1)
+ include_directories(${OPENAL_INCLUDE_DIR})
+ message("OpenAL found, enabling OpenAL sound backend")
+ else()
+ add_definitions(-DHAVE_OPENAL=0)
+ message("OpenAL NOT found, disabling OpenAL sound backend")
+ endif()
else()
- add_definitions(-DHAVE_OPENAL=0)
- message("OpenAL NOT found, disabling OpenAL sound backend")
-endif(OPENAL_FOUND)
+ message("OpenAL explicitly disabled, disabling OpenAL sound backend")
+endif()
include(FindLLVM OPTIONAL)
if (LLVM_FOUND)

9
appdata.xml
View file

@ -18,9 +18,12 @@
<url type="bugtracker">https://bugs.dolphin-emu.org/projects/emulator/issues</url> <url type="bugtracker">https://bugs.dolphin-emu.org/projects/emulator/issues</url>
<screenshots> <screenshots>
<screenshot type="default">https://raw.githubusercontent.com/flathub/org.DolphinEmu.dolphin-emu/master/screenshots/1.png</screenshot> <screenshot type="default">https://raw.githubusercontent.com/flathub/org.DolphinEmu.dolphin-emu/master/screenshots/1.png</screenshot>
<screenshot >https://raw.githubusercontent.com/flathub/org.DolphinEmu.dolphin-emu/master/screenshots/2.png</screenshot> <screenshot>https://raw.githubusercontent.com/flathub/org.DolphinEmu.dolphin-emu/master/screenshots/2.png</screenshot>
<screenshot >https://raw.githubusercontent.com/flathub/org.DolphinEmu.dolphin-emu/master/screenshots/3.png</screenshot> <screenshot>https://raw.githubusercontent.com/flathub/org.DolphinEmu.dolphin-emu/master/screenshots/3.png</screenshot>
<screenshot >https://raw.githubusercontent.com/flathub/org.DolphinEmu.dolphin-emu/master/screenshots/3.png</screenshot> <screenshot>https://raw.githubusercontent.com/flathub/org.DolphinEmu.dolphin-emu/master/screenshots/4.png</screenshot>
</screenshots> </screenshots>
<releases>
<release date="2016-06-24" version="5.0"/>
</releases>
<update_contact>b@bpiotrowski.pl</update_contact> <update_contact>b@bpiotrowski.pl</update_contact>
</application> </application>

25
dolphin-emu-5.0-gtk3.patch Normal file
View file

@ -0,0 +1,25 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -773,18 +773,10 @@ if(NOT DISABLE_WX AND NOT ANDROID)
execute_process(COMMAND lsb_release -c -s
OUTPUT_VARIABLE DIST_NAME
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}
- VERSION_EQUAL 2.8.2 OR "${DIST_NAME}" STREQUAL "natty")
- check_lib(GTK2 gtk+-2.0 gtk+-2.0 gtk.h REQUIRED)
- else()
- include(FindGTK2)
- if(GTK2_FOUND)
- include_directories(${GTK2_INCLUDE_DIRS})
- list(APPEND LIBS ${GTK2_LIBRARIES})
- else()
- message(FATAL_ERROR "GTK is required to build the WX UI. Please install the GTK development libraries.")
- endif()
- endif()
+
+ check_lib(GTK3 gtk+-3.0 gtk.h REQUIRED)
+ include_directories(${GTK3_INCLUDE_DIRS})
+ list(APPEND LIBS ${GTK3_LIBRARIES})
endif()
if(wxWidgets_FOUND)

73
org.DolphinEmu.dolphin-emu.json
View file

@ -1,16 +1,16 @@
{ {
"app-id": "org.DolphinEmu.dolphin-emu", "app-id": "org.DolphinEmu.dolphin-emu",
"version": "5.0", "branch": "stable",
"runtime": "org.gnome.Platform", "runtime": "org.freedesktop.Platform",
"runtime-version": "3.24", "runtime-version": "1.6",
"sdk": "org.gnome.Sdk", "sdk": "org.freedesktop.Sdk",
"command": "dolphin-emu", "command": "dolphin-emu",
"rename-desktop-file": "dolphin-emu.desktop", "rename-desktop-file": "dolphin-emu.desktop",
"rename-icon": "dolphin-emu", "rename-icon": "dolphin-emu",
"rename-appdata-file": "dolphin-emu.appdata.xml", "rename-appdata-file": "dolphin-emu.appdata.xml",
"finish-args": [ "finish-args": [
"--device=dri", "--device=dri",
"--filesystem=home:ro", "--filesystem=host:ro",
"--socket=pulseaudio", "--socket=pulseaudio",
"--socket=wayland", "--socket=wayland",
"--socket=x11", "--socket=x11",
@ -18,13 +18,55 @@
], ],
"modules": [ "modules": [
{ {
"name": "dolphin-emu", "name": "wxWidgets",
"buildsystem": "cmake", "rm-configure": true,
"build-options": { "cleanup": [
"config-opts": [ "/bin",
"-DENABLE_SDL=ON", "/include",
"-DENABLE_EVDEV=OFF" "/share/bakefile",
"/share/aclocal"
], ],
"config-opts": [
"--with-libpng",
"--with-zlib",
"--disable-sdltest",
"--disable-webkit",
"--disable-webview",
"--disable-webviewwebkit",
"--disable-ribbon",
"--disable-html",
"--disable-propgrid",
"--disable-xru",
"--disable-richtext",
"--with-expat=builtin",
"--with-libiconv=/usr"
],
"sources": [
{
"type": "archive",
"url": "https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.3.1/wxWidgets-3.0.3.1.tar.bz2",
"sha256":"3164ad6bc5f61c48d2185b39065ddbe44283eb834a5f62beb13f1d0923e366e4"
},
{
"type": "script",
"dest-filename": "autogen.sh",
"commands": [
"cp -p /usr/share/automake-*/config.{sub,guess} .",
"autoconf -f -B build/autoconf_prepend-include"
]
}
]
},
{
"name": "dolphin-emu",
"buildsystem": "cmake-ninja",
"config-opts": [
"-DENABLE_ALSA=OFF",
"-DENABLE_SDL=ON",
"-DENABLE_EVDEV=OFF",
"-DDISTRIBUTOR=Flathub"
],
"build-options": {
"arch": { "arch": {
"arm": { "arm": {
"config-opts": [ "config-opts": [
@ -33,6 +75,7 @@
} }
} }
}, },
"cleanup": [ "/bin/dolphin-emu-nogui" ],
"post-install": [ "post-install": [
"install -Dm644 appdata.xml /app/share/appdata/dolphin-emu.appdata.xml" "install -Dm644 appdata.xml /app/share/appdata/dolphin-emu.appdata.xml"
], ],
@ -42,6 +85,14 @@
"url": "https://github.com/dolphin-emu/dolphin/archive/5.0.tar.gz", "url": "https://github.com/dolphin-emu/dolphin/archive/5.0.tar.gz",
"sha256": "62c4602055767ab314ff50a3b94ea57f792832aa1629e6b1117ebce10518dc0b" "sha256": "62c4602055767ab314ff50a3b94ea57f792832aa1629e6b1117ebce10518dc0b"
}, },
{
"type": "patch",
"path": "dolphin-emu-5.0-gtk3.patch"
},
{
"type": "patch",
"path": "6033250bebe9f5dcec47c4e2ec8e5d3b102f73e7.patch"
},
{ {
"type": "file", "type": "file",
"path": "appdata.xml" "path": "appdata.xml"