Skip to content

Commit

Permalink
Add glycin to release build for flatpak
Browse files Browse the repository at this point in the history
  • Loading branch information
@blissd
blissd committed Apr 10, 2024
1 parent 9ccf9b9 commit 7fba7d4
Show file tree
Hide file tree
Showing 2 changed files with 127 additions and 65 deletions.
18 changes: 2 additions & 16 deletions build-aux/dev.romantics.Photos.Devel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,29 +109,15 @@
"sources": [
{
"type": "archive",
"url": "https://download.gnome.org/sources/glycin-loaders/1.0/glycin-loaders-1.0.0.tar.xz",
"sha256": "cd2a3979259fee56cbd882a4d890437684bf1926e65afeafcb904ca9d17ae282",
"url": "https://download.gnome.org/sources/glycin-loaders/1.0/glycin-loaders-1.0.1.tar.xz",
"sha256": "d0f022462ff555856e85ea940474470bb36b37c9ffcbcba63a03fe5e954370cf",
"x-checker-data": {
"type": "gnome",
"name": "glycin-loaders"
}
}
]
},
{
"name": "glycin",
"buildsystem": "meson",
"config-opts": [
"-Dprofile=dev"
],
"sources": [
{
"type": "git",
"url": "https://gitlab.gnome.org/sophie-h/glycin.git",
"commit": "5c57603d9455aa74b802f4fcc7e5121dcaa67b10"
}
]
},

{
"name": "photo-romantic",
Expand Down
174 changes: 125 additions & 49 deletions build-aux/dev.romantics.Photos.json
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,131 @@
{
"id": "dev.romantics.Photos",
"runtime": "org.gnome.Platform",
"runtime-version": "45",
"sdk": "org.gnome.Sdk",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.rust-stable",
"org.freedesktop.Sdk.Extension.llvm16"
"id": "dev.romantics.Photos.Devel",
"runtime": "org.gnome.Platform",
"runtime-version": "45",
"sdk": "org.gnome.Sdk",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.rust-stable",
"org.freedesktop.Sdk.Extension.llvm16"
],
"command": "photo-romantic",
"finish-args": [
"--share=ipc",
"--socket=fallback-x11",
"--socket=wayland",
"--device=dri",
"--filesystem=xdg-pictures:ro",
"--env=RUST_LOG=photo_romantic=debug",
"--env=G_MESSAGES_DEBUG=none",
"--env=RUST_BACKTRACE=1"
],
"build-options": {
"append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin",
"build-args": [
"--share=network"
],
"command": "photo-romantic",
"finish-args": [
"--share=ipc",
"--socket=fallback-x11",
"--socket=wayland",
"--device=dri",
"--filesystem=xdg-pictures:ro",
"--env=RUST_LOG=photo_romantic=debug",
"--env=G_MESSAGES_DEBUG=none",
"--env=RUST_BACKTRACE=1"
],
"build-options": {
"append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin",
"build-args": [
"--share=network"
],
"env": {
"CARGO_REGISTRIES_CRATES_IO_PROTOCOL": "sparse",
"CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang",
"CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold",
"CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER": "clang",
"CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold"
},
"test-args": [
"--socket=x11",
"--share=network"
]
"env": {
"CARGO_REGISTRIES_CRATES_IO_PROTOCOL": "sparse",
"CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang",
"CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold",
"CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER": "clang",
"CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold"
},
"modules": [
"test-args": [
"--socket=x11",
"--share=network"
]
},
"add-extensions": {
/* Exile HEIC (x265) codec into extension */
"org.gnome.Loupe.Devel.HEIC": {
/* Relative to app dir */
"directory": "lib/libheif-heic",
/* Relative to directory above */
"add-ld-path": "lib",
/* Remove extension data from main flatpak package */
"bundle": true,
/* Remove this extension when Loupe is deinstalled */
"autodelete": true
}
},
"modules": [
{
"name": "libde265",
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_INSTALL_PREFIX=/app/lib/libheif-heic",
"-DENABLE_SDL=Off"
],
"sources": [
{
"name": "photo-romantic",
"buildsystem": "meson",
"run-tests": true,
"config-opts": [
"-Dprofile=default"
],
"sources": [
{
"type": "dir",
"path": "../"
}
]
"type": "git",
"url": "https://github.com/strukturag/libde265.git",
"commit": "17bb8d9fcea62db8cdeb0fc7ef8d15dbd19a22e4",
"tag": "v1.0.15",
"x-checker-data": {
"type": "git",
"tag-pattern": "^v([\\d.]+)$"
}
}
]
]
},
{
"name": "libheif",
"buildsystem": "cmake-ninja",
"config-opts": [
"-DWITH_LIBDE265_PLUGIN=On",
"-DPLUGIN_DIRECTORY=/app/lib/libheif-heic/lib",
"-DLIBDE265_INCLUDE_DIR=/app/lib/libheif-heic/include",
"-DLIBDE265_PKGCONF_LIBRARY_DIRS=/app/lib/libheif-heic/lib",
"-DWITH_X265=Off",
"-DWITH_SvtEnc=Off",
"-DWITH_SvtEnc_PLUGIN=Off",
"-DWITH_AOM_ENCODER=Off",
"-DWITH_RAV1E_PLUGIN=Off",
"-DWITH_RAV1E=Off",
"-DWITH_EXAMPLES=Off"
],
"sources": [
{
"type": "git",
"url": "https://github.com/strukturag/libheif.git",
"commit": "59b58566de0d8e2e9fea958abeba1d3346bda9de",
"tag": "v1.17.6",
"x-checker-data": {
"type": "git",
"tag-pattern": "^v([\\d.]+)$"
}
}
]
},
{
"name": "glycin-loaders",
"buildsystem": "meson",
"sources": [
{
"type": "archive",
"url": "https://download.gnome.org/sources/glycin-loaders/1.0/glycin-loaders-1.0.1.tar.xz",
"sha256": "d0f022462ff555856e85ea940474470bb36b37c9ffcbcba63a03fe5e954370cf",
"x-checker-data": {
"type": "gnome",
"name": "glycin-loaders"
}
}
]
},
{
"name": "photo-romantic",
"buildsystem": "meson",
"run-tests": true,
"config-opts": [
"-Dprofile=default"
],
"sources": [
{
"type": "dir",
"path": "../"
}
]
}
]
}

0 comments on commit 7fba7d4

Please sign in to comment.