Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added com.giadamusic.Giada #1626

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "shared-modules"]
path = shared-modules
url = https://github.com/flathub/shared-modules.git
45 changes: 45 additions & 0 deletions com.giadamusic.Giada.appdata.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2020 Giada Developers -->
<component type="desktop">
hfiguiere marked this conversation as resolved.
Show resolved Hide resolved
<id>com.giadamusic.Giada</id>
<metadata_license>CC0</metadata_license>
<project_license>GPL-2.0+</project_license>
<name>Giada</name>
<summary>Your hardcore loop machine</summary>
<description>
<p>
Giada is an open source, minimalistic and hardcore music
production tool. Designed for DJs, live performers and electronic
musicians.
</p>
</description>
<content_rating type="oars-1.1" />
<launchable type="desktop-id">com.giadamusic.Giada.desktop</launchable>
<screenshots>
<screenshot type="default">
<image>
https://www.giadamusic.com/images/screenshots/giada-loop-machine-screenshot-03-large-project.png
</image>
<caption>A fairly large project with samples and MIDI events</caption>
</screenshot>
<screenshot>
<image>
https://www.giadamusic.com/images/screenshots/giada-loop-machine-screenshot-17-midi-action-editor.png
</image>
<caption>New Action Editor for MIDI events</caption>
</screenshot>
<screenshot>
<image>
https://www.giadamusic.com/images/screenshots/giada-loop-machine-screenshot-01-sample-editor.png
</image>
<caption>Chopping samples in the advanced Sample Editor</caption>
</screenshot>
</screenshots>
<update_contact>hub_AT_figuiere.net</update_contact>
<url type="homepage">https://www.giadamusic.com/</url>
<url type="help">https://www.giadamusic.com/forum</url>
<releases>
<release version="0.16.3.1" date="2020-06-21">
</release>
</releases>
</component>
8 changes: 8 additions & 0 deletions com.giadamusic.Giada.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=Giada
hfiguiere marked this conversation as resolved.
Show resolved Hide resolved
Comment=Your hardcore loop machine
Exec=giada %f
Icon=com.giadamusic.Giada
Categories=Music;
125 changes: 125 additions & 0 deletions com.giadamusic.Giada.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
{
"id": "com.giadamusic.Giada",
"runtime": "org.freedesktop.Platform",
"sdk": "org.freedesktop.Sdk//19.08",
"runtime-version": "19.08",
"command": "giada",
"finish-args": [
/* X11 + XShm access */
"--share=ipc",
"--socket=x11",
/* Note playback */
"--socket=pulseaudio",
/* MIDI */
"--device=all",
/* Allow loading, saving files from anywhere (portals don’t work yet) */
"--filesystem=home",
/* Allow other instances to see lockfiles */
"--env=TMPDIR=/var/tmp",
"--env=VST_PATH=/app/extensions/VstPlugins/lxvst"
],
"add-extensions": {
"org.freedesktop.LinuxAudio.Plugins": {
"directory": "extensions/Plugins",
"version": "19.08",
"add-ld-path": "lib",
"merge-dirs": "lxvst",
"subdirectories": true,
"no-autodownload": true
},
"org.freedesktop.LinuxAudio.VstPlugins": {
"directory": "extensions/VstPlugins",
"version": "19.08",
"add-ld-path": "lib",
"merge-dirs": "lxvst",
"subdirectories": true,
"no-autodownload": true
}
},
"cleanup": [
"/bin/jack*",
"/bin/alsa*"
],
"modules": [
{
"name": "fltk",
"config-opts": [
"--enable-threads",
"--enable-cairo",
"--enable-shared",
"--disable-static"
],
"sources": [
{
"type": "archive",
"url": "https://github.com/fltk/fltk/archive/release-1.3.5.tar.gz",
"sha256": "5c534287b0e03b9520ff866704a5649268986b371bdf8f6ac003fa240e761901"
}
],
"cleanup": [
"/bin",
"/include",
"/man",
"/share/doc",
"/share/man",
"/lib/pkgconfig",
"*.so",
"*.la",
"*.a"
]
},
{
"name": "rtmidi",
"cleanup": [
"/include",
"/lib/pkgconfig",
"*.la",
"*.a",
"*.so"
],
"sources": [
{
"type": "archive",
"url": "http://www.music.mcgill.ca/~gary/rtmidi/release/rtmidi-4.0.0.tar.gz",
"sha256": "370cfe710f43fbeba8d2b8c8bc310f314338c519c2cf2865e2d2737b251526cd"
}
]
},
"shared-modules/linux-audio/jack2.json",
{
"name": "giada",
"buildsystem": "autotools",
"config_opts": [
"--target=linux",
"--enable-vst"
],
"cleanup": [],
"post_install": [
"install -Dm0644 extras/giada-logo.png /app/share/icons/com.giadamusic.Giada.png",
"install -Dm0644 -t /app/share/metainfo com.giadamusic.Giada.appdata.xml",
"install -Dm0644 -t /app/share/applications com.giadamusic.Giada.desktop",
"install -d /app/extensions/Plugins",
"install -d /app/extensions/VstPlugins"
],
"sources": [
{
"type": "archive",
"url": "https://www.giadamusic.com/data/giada-0.16.3.1-src.tar.gz",
"sha256": "70979ec9346d5e16dd2628e6ccb0bdbabe9fcff9b7c5333c15347c139f23a189"
},
{
"type": "patch",
"path": "giada-juce.patch"
},
{
"type": "file",
"path": "com.giadamusic.Giada.desktop"
},
{
"type": "file",
"path": "com.giadamusic.Giada.appdata.xml"
}
]
}
]
}
34 changes: 34 additions & 0 deletions giada-juce.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff --git a/src/deps/juce/modules/juce_graphics/colour/juce_PixelFormats.h b/src/deps/juce/modules/juce_graphics/colour/juce_PixelFormats.h
index 9be9ba09..20002cac 100644
--- a/src/deps/juce/modules/juce_graphics/colour/juce_PixelFormats.h
+++ b/src/deps/juce/modules/juce_graphics/colour/juce_PixelFormats.h
@@ -111,19 +111,6 @@ public:
forcedinline uint8 getGreen() const noexcept { return components.g; }
forcedinline uint8 getBlue() const noexcept { return components.b; }

- #if JUCE_GCC
- // NB these are here as a workaround because GCC refuses to bind to packed values.
- forcedinline uint8& getAlpha() noexcept { return comps [indexA]; }
- forcedinline uint8& getRed() noexcept { return comps [indexR]; }
- forcedinline uint8& getGreen() noexcept { return comps [indexG]; }
- forcedinline uint8& getBlue() noexcept { return comps [indexB]; }
- #else
- forcedinline uint8& getAlpha() noexcept { return components.a; }
- forcedinline uint8& getRed() noexcept { return components.r; }
- forcedinline uint8& getGreen() noexcept { return components.g; }
- forcedinline uint8& getBlue() noexcept { return components.b; }
- #endif
-
//==============================================================================
/** Copies another pixel colour over this one.

@@ -342,9 +329,6 @@ private:
{
uint32 internal;
Components components;
- #if JUCE_GCC
- uint8 comps[4]; // helper struct needed because gcc does not allow references to packed union members
- #endif
};
}
#ifndef DOXYGEN
1 change: 1 addition & 0 deletions shared-modules
Submodule shared-modules added at 2ea43b