Skip to content

Commit

Permalink
v3.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
jcelerier committed Jul 1, 2024
1 parent 3708b2a commit 4ef3f88
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 25 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/libossia
Submodule libossia updated 1 files
+1 −1 3rdparty/libremidi
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ list(GET QT_VERSION 0 QT_PREFIX)

set(SCORE_VERSION_MAJOR 3)
set(SCORE_VERSION_MINOR 2)
set(SCORE_VERSION_PATCH 2)
set(SCORE_VERSION_PATCH 3)
set(SCORE_VERSION_EXTRA "")
set(SCORE_CODENAME "Samarcande")

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Releases are available for [Windows, Linux (via AppImage) and macOS](https://git
| Debian (Bookworm, Trixie) | [![Debian](https://github.com/ossia/score/actions/workflows/debian-builds.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/debian-builds.yaml) |
| Ubuntu (22.04, 23.04, 24.04) | [![Ubuntu](https://github.com/ossia/score/actions/workflows/ubuntu-builds.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/ubuntu-builds.yaml) |
| Raspberry Pi (Bookworm AArch64) | [![RPi](https://github.com/ossia/score/actions/workflows/embedded.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/embedded.yaml) |
| Flatpak | [![Flatpak](https://github.com/ossia/score/actions/workflows/flatpak.yml/badge.svg)](https://github.com/ossia/score/actions/workflows/flatpak.yml) |
| Nix | [![Nix](https://github.com/ossia/score/actions/workflows/nix-builds.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/nix-builds.yaml) |
| WebAssembly | [![WASM](https://github.com/ossia/score/actions/workflows/wasm.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/wasm.yaml) |
| Plug-in templates | [![Template check](https://github.com/ossia/score/actions/workflows/templates.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/templates.yaml) |
Expand Down
45 changes: 23 additions & 22 deletions cmake/Deployment/Linux/Flatpak/io.ossia.score.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ finish-args:
# BLE support
- --allow=bluetooth

# Access user's data and media libraries, plug-ins etc
# Access user's data and media libraries, plug-ins etc
- --filesystem=host

# GPU rendering support
# GPU rendering support
- --device=dri

# Raw input support
# Raw input support
- --device=input

# Required for USB & MIDI devices support as well as JACK (/dev/shm) and raw GPIO I/O
Expand All @@ -27,13 +27,13 @@ finish-args:
# X11 is used by default
- --socket=x11

# Wayland still has rendering regressions compared to X11 as of Qt 6.7
# - --socket=wayland
# Wayland still has rendering regressions compared to X11 as of Qt 6.7
- --socket=wayland

# Used by X11
- --share=ipc

# Network access
# Network access
- --share=network

# Permit PipeWire and user music directory access
Expand All @@ -58,8 +58,11 @@ finish-args:
# For correct cursor scaling under Wayland
- --env=XCURSOR_PATH=/run/host/user-share/icons:/run/host/share/icons

- --persist=ossia
# Plugins
- --env=LV2_PATH=$HOME/.lv2:/app/extensions/Plugins/lv2:/app/lib/lv2

# Config persistence
- --persist=ossia

add-extensions:
# Linux audio plugins base extension
Expand All @@ -71,13 +74,13 @@ add-extensions:
subdirectories: true
no-autodownload: true

# Full codec support for FFMPEG
# Full codec support for FFMPEG
org.freedesktop.Platform.openh264:
directory: lib/openh264,
add-ld-path: .,
version: "2.4.1"
org.freedesktop.Platform.ffmpeg-full:

org.freedesktop.Platform.ffmpeg-full:
directory: lib/ffmpeg,
add-ld-path: .
version: "23.08"
Expand Down Expand Up @@ -205,7 +208,7 @@ modules:
config-opts:
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON
- -DBUILD_SHARED_LIBS=OFF
- -DBUILD_SHARED_LIBS=OFF
sources:
- type: archive
url: https://github.com/abseil/abseil-cpp/releases/download/20240116.2/abseil-cpp-20240116.2.tar.gz
Expand Down Expand Up @@ -247,10 +250,8 @@ modules:
# ossia uses boost
- name: boost
buildsystem: simple
build-commands:
build-commands:
- mkdir -p "${FLATPAK_DEST}/include/"
- ls
- pwd
- cp -rf boost "${FLATPAK_DEST}/include/"
sources:
- type: archive
Expand All @@ -275,7 +276,7 @@ modules:
# ossia uses mDNS for multiple protocol discovery mechanisms
- name: avahi
builddir: true
config-opts:
config-opts:
- --with-distro=none
- --disable-qt3
- --disable-qt4
Expand All @@ -292,24 +293,24 @@ modules:
- --disable-dbm
- --disable-gdbm
- --disable-manpage
post-install:

post-install:
- make -C avahi-common install
- make -C avahi-client install
sources:

sources:
- type: archive
url: https://github.com/avahi/avahi/releases/download/v0.8/avahi-0.8.tar.gz
sha256: 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda

- name: ossia-score
buildsystem: cmake-ninja
builddir: true
no-make-install: true
sources:
- type: dir
path: ../../../../
config-opts:
config-opts:
# Note: don't use RelWithDebInfo as ossia release builds explicitly expect Release build type.
- -DCMAKE_BUILD_TYPE=Release
- -Wno-dev
Expand All @@ -321,7 +322,7 @@ modules:
- -DOSSIA_USE_SYSTEM_LIBRARIES=1
- -DSCORE_USE_SYSTEM_LIBRARIES=1
- -DSCORE_NO_QTCONF=1

post-install:
- cmake -DCMAKE_INSTALL_DO_STRIP=1 -DCOMPONENT=OssiaScore -P cmake_install.cmake
- install -Dm644 /run/build/ossia-score/cmake/Deployment/Linux/Flatpak/io.ossia.score.metainfo.xml /app/share/metainfo/io.ossia.score.metainfo.xml
Expand Down
2 changes: 1 addition & 1 deletion cmake/ScoreQtConf.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if(SCORE_DEPLOYMENT_BUILD)
if(SCORE_DEPLOYMENT_BUILD AND NOT SCORE_NO_QTCONF)
if(WIN32)
if(SCORE_MSYS2_PACKAGE)
set(SCORE_QTCONF_CONTENT
Expand Down

0 comments on commit 4ef3f88

Please sign in to comment.