mirror of
https://github.com/morgan9e/FreeRDP
synced 2026-04-14 00:14:11 +09:00
Merge pull request #11609 from akallabeth/flatpak-update
[packaging,flatpak] update build scripts
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
"org.freedesktop.Platform.openh264": {
|
||||
"add-ld-path": ".",
|
||||
"directory": "lib/openh264",
|
||||
"version": "2.5.0"
|
||||
"version": "2.5.1"
|
||||
}
|
||||
},
|
||||
"app-id": "com.freerdp.FreeRDP",
|
||||
@@ -27,7 +27,7 @@
|
||||
"/share/examples",
|
||||
"/share/man"
|
||||
],
|
||||
"command": "freerdp.sh",
|
||||
"command": "sdl-freerdp",
|
||||
"finish-args": [
|
||||
"--device=dri",
|
||||
"--share=ipc",
|
||||
@@ -36,7 +36,8 @@
|
||||
"--socket=pulseaudio",
|
||||
"--socket=cups",
|
||||
"--socket=wayland",
|
||||
"--filesystem=xdg-download"
|
||||
"--filesystem=xdg-download",
|
||||
"--env=OPENSSL_CONF=/app/share/legacy-openssl.cnf"
|
||||
],
|
||||
"modules": [
|
||||
"modules/openssl.json",
|
||||
@@ -59,6 +60,7 @@
|
||||
"-DCMAKE_VERBOSE_MAKEFILE=ON",
|
||||
"-DCMAKE_BUILD_TYPE:STRING=Release",
|
||||
"-DCMAKE_INSTALL_LIBDIR:PATH=lib",
|
||||
"-DWITHOUT_FREERDP_3x_DEPRECATED=ON",
|
||||
"-DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON",
|
||||
"-DCHANNEL_TSMF:BOOL=OFF",
|
||||
"-DCHANNEL_URBDRC:BOOL=ON",
|
||||
@@ -97,7 +99,7 @@
|
||||
},
|
||||
{
|
||||
"build-commands": [
|
||||
"install -D freerdp.sh /app/bin/freerdp.sh",
|
||||
"install -D legacy-openssl.cnf $FLATPAK_DEST/share/legacy-openssl.cnf",
|
||||
"mkdir -p /app/lib/ffmpeg",
|
||||
"mkdir -p /app/lib/openh264"
|
||||
],
|
||||
@@ -105,7 +107,7 @@
|
||||
"name": "wrapper",
|
||||
"sources": [
|
||||
{
|
||||
"path": "freerdp.sh",
|
||||
"path": "legacy-openssl.cnf",
|
||||
"type": "file"
|
||||
}
|
||||
]
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ -z ${FREERDP_SDL_OFF} ]; then
|
||||
echo "SDL $(which sdl-freerdp)"
|
||||
sdl-freerdp $@
|
||||
exit $rc
|
||||
else
|
||||
if [ -z $XDG_SESSION_TYPE ]; then
|
||||
echo "XDG_SESSION_TYPE undefined"
|
||||
exit -1
|
||||
elif [ "$XDG_SESSION_TYPE" = "wayland" ]; then
|
||||
if [ -z $FREERDP_WAYLAND_OFF ]; then
|
||||
echo "wayland $(which wlfreerdp)"
|
||||
wlfreerdp $@
|
||||
exit $rc
|
||||
else
|
||||
echo "X11 $(which xfreerdp)"
|
||||
xfreerdp $@
|
||||
exit $rc
|
||||
fi
|
||||
elif [ "$XDG_SESSION_TYPE" = "x11" ]; then
|
||||
echo "X11 $(which xfreerdp)"
|
||||
xfreerdp $@
|
||||
exit $rc
|
||||
else
|
||||
echo "XDG_SESSION_TYPE $XDG_SESSION_TYPE not handled"
|
||||
exit -1
|
||||
fi
|
||||
fi
|
||||
12
packaging/flatpak/legacy-openssl.cnf
Normal file
12
packaging/flatpak/legacy-openssl.cnf
Normal file
@@ -0,0 +1,12 @@
|
||||
[openssl_init]
|
||||
providers = provider_sect
|
||||
|
||||
[provider_sect]
|
||||
default = default_sect
|
||||
legacy = legacy_sect
|
||||
|
||||
[default_sect]
|
||||
activate = 1
|
||||
|
||||
[legacy_sect]
|
||||
activate = 1
|
||||
@@ -1,33 +0,0 @@
|
||||
{
|
||||
"builddir": true,
|
||||
"buildsystem": "cmake-ninja",
|
||||
"cleanup": [
|
||||
"/include",
|
||||
"/lib/*.la",
|
||||
"/lib/*.a",
|
||||
"/lib/cmake",
|
||||
"/share/aclocal",
|
||||
"/lib/pkgconfig"
|
||||
],
|
||||
"config-opts": [
|
||||
"-DCMAKE_VERBOSE_MAKEFILE=ON",
|
||||
"-DCMAKE_BUILD_TYPE:STRING=Release",
|
||||
"-DCMAKE_INSTALL_LIBDIR:PATH=lib"
|
||||
],
|
||||
"name": "SDL2_image",
|
||||
"sources": [
|
||||
{
|
||||
"sha256": "f7c06a8783952cfe960adccdd3d8472b63ab31475b4390d10cfdcc1aea61238f",
|
||||
"type": "archive",
|
||||
"url":
|
||||
"https://github.com/libsdl-org/SDL_image/releases/download/release-2.8.4/SDL2_image-2.8.4.tar.gz",
|
||||
"x-checker-data": {
|
||||
"project-id": 4781,
|
||||
"stable-only": true,
|
||||
"type": "anitya",
|
||||
"url-template":
|
||||
"https://github.com/libsdl-org/SDL_image/releases/download/release-${version0}.${version1}.${version2}/SDL2_image-${version0}.${version1}.${version2}.tar.gz"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
{
|
||||
"builddir": true,
|
||||
"buildsystem": "cmake-ninja",
|
||||
"cleanup": [
|
||||
"/include",
|
||||
"/lib/*.la",
|
||||
"/lib/*.a",
|
||||
"/lib/cmake",
|
||||
"/share/aclocal",
|
||||
"/lib/pkgconfig"
|
||||
],
|
||||
"config-opts": [
|
||||
"-DCMAKE_VERBOSE_MAKEFILE=ON",
|
||||
"-DCMAKE_BUILD_TYPE:STRING=Release",
|
||||
"-DCMAKE_INSTALL_LIBDIR:PATH=lib"
|
||||
],
|
||||
"name": "SDL2_ttf",
|
||||
"sources": [
|
||||
{
|
||||
"sha256": "0b2bf1e7b6568adbdbc9bb924643f79d9dedafe061fa1ed687d1d9ac4e453bfd",
|
||||
"type": "archive",
|
||||
"url":
|
||||
"https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.24.0/SDL2_ttf-2.24.0.tar.gz",
|
||||
"x-checker-data": {
|
||||
"project-id": 4784,
|
||||
"stable-only": true,
|
||||
"type": "anitya",
|
||||
"url-template":
|
||||
"https://github.com/libsdl-org/SDL_ttf/releases/download/release-${version0}.${version1}.${version2}/SDL2_ttf-${version0}.${version1}.${version2}.tar.gz"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -17,16 +17,16 @@
|
||||
"name": "SDL3",
|
||||
"sources": [
|
||||
{
|
||||
"sha256": "2938328317301dfbe30176d79c251733aa5e7ec5c436c800b99ed4da7adcb0f0",
|
||||
"sha256": "b7e7dc05011b88c69170fe18935487b2559276955e49113f8c1b6b72c9b79c1f",
|
||||
"type": "archive",
|
||||
"url":
|
||||
"https://github.com/libsdl-org/SDL/releases/download/release-3.2.4/SDL3-3.2.4.tar.gz",
|
||||
"https://github.com/libsdl-org/SDL/releases/download/release-3.2.14/SDL3-3.2.14.tar.gz",
|
||||
"x-checker-data": {
|
||||
"project-id": 4781,
|
||||
"stable-only": true,
|
||||
"type": "anitya",
|
||||
"url-template":
|
||||
"https://github.com/libsdl-org/SDL_image/releases/download/release-${version0}.${version1}.${version2}/SDL3-${version0}.${version1}.${version2}.tar.gz"
|
||||
"https://github.com/libsdl-org/SDL/releases/download/release-${version}/SDL3-${version}.tar.gz"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
"name": "SDL3_image",
|
||||
"sources": [
|
||||
{
|
||||
"sha256": "1690baea71b2b4ded9895126cddbc03a1000b027d099a4fb4669c4d23d73b19f",
|
||||
"sha256": "a725bd6d04261fdda0dd8d950659e1dc15a8065d025275ef460d32ae7dcfc182",
|
||||
"type": "archive",
|
||||
"url":
|
||||
"https://github.com/libsdl-org/SDL_image/releases/download/release-3.2.0/SDL3_image-3.2.0.tar.gz",
|
||||
"https://github.com/libsdl-org/SDL_image/releases/download/release-3.2.4/SDL3_image-3.2.4.tar.gz",
|
||||
"x-checker-data": {
|
||||
"project-id": 4781,
|
||||
"stable-only": true,
|
||||
"type": "anitya",
|
||||
"url-template":
|
||||
"https://github.com/libsdl-org/SDL_image/releases/download/release-${version0}.${version1}.${version2}/SDL3_image-${version0}.${version1}.${version2}.tar.gz"
|
||||
"https://github.com/libsdl-org/SDL_image/releases/download/release-${version}/SDL3_image-${version}.tar.gz"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
"name": "SDL3_ttf",
|
||||
"sources": [
|
||||
{
|
||||
"sha256": "0ac7c23d9a037d3e3922ea1027fd8e923f03b0840042a49cca7652d2b49989a6",
|
||||
"sha256": "63547d58d0185c833213885b635a2c0548201cc8f301e6587c0be1a67e1e045d",
|
||||
"type": "archive",
|
||||
"url":
|
||||
"https://github.com/libsdl-org/SDL_ttf/releases/download/prerelease-3.1.2/SDL3_ttf-3.1.2.tar.gz",
|
||||
"https://github.com/libsdl-org/SDL_ttf/releases/download/release-3.2.2/SDL3_ttf-3.2.2.tar.gz",
|
||||
"x-checker-data": {
|
||||
"project-id": 4784,
|
||||
"stable-only": true,
|
||||
"type": "anitya",
|
||||
"url-template":
|
||||
"https://github.com/libsdl-org/SDL_ttf/releases/download/release-${version0}.${version1}.${version2}/SDL3_ttf-${version0}.${version1}.${version2}.tar.gz"
|
||||
"https://github.com/libsdl-org/SDL_ttf/releases/download/release-${version}/SDL3_ttf-${version}.tar.gz"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
"name": "krb5",
|
||||
"sources": [
|
||||
{
|
||||
"sha256": "b7a4cd5ead67fb08b980b21abd150ff7217e85ea320c9ed0c6dadd304840ad35",
|
||||
"sha256": "6a516fd180bdfe11c0c0ad774999e1a66295253390475cbfa88835983cf39559",
|
||||
"type": "archive",
|
||||
"url": "https://kerberos.org/dist/krb5/1.21/krb5-1.21.3.tar.gz",
|
||||
"url": "https://kerberos.org/dist/krb5/1.22/krb5-1.22-beta1.tar.gz",
|
||||
"x-checker-data": {
|
||||
"project-id": 13287,
|
||||
"stable-only": true,
|
||||
|
||||
@@ -13,10 +13,17 @@
|
||||
],
|
||||
"sources": [
|
||||
{
|
||||
"sha256": "ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575",
|
||||
"sha256": "966bb0d231f94a474eaae2e67da5ec844d3527a1f386456394ff432580634b29",
|
||||
"type": "archive",
|
||||
"url":
|
||||
"https://github.com/libusb/libusb/releases/download/v1.0.27/libusb-1.0.27.tar.bz2"
|
||||
"https://github.com/libusb/libusb/releases/download/v1.0.28/libusb-1.0.28.tar.bz2",
|
||||
"x-checker-data": {
|
||||
"project-id": 13287,
|
||||
"stable-only": true,
|
||||
"type": "anitya",
|
||||
"url-template":
|
||||
"https://github.com/libusb/libusb/releases/download/v${version}/libusb-${version}.tar.bz2"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
"stable-only": true,
|
||||
"type": "anitya",
|
||||
"url-template":
|
||||
"https://github.com/OpenSC/OpenSC/tags/${version0}.${version1}.${version2}"
|
||||
"https://github.com/OpenSC/OpenSC/releases/download/${version}/opensc-${version}.tar.gz"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
@@ -9,10 +9,17 @@
|
||||
"name": "openssl",
|
||||
"sources": [
|
||||
{
|
||||
"sha256": "002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3",
|
||||
"sha256": "344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0",
|
||||
"type": "archive",
|
||||
"url":
|
||||
"https://github.com/openssl/openssl/releases/download/openssl-3.4.1/openssl-3.4.1.tar.gz"
|
||||
"https://github.com/openssl/openssl/releases/download/openssl-3.5.0/openssl-3.5.0.tar.gz",
|
||||
"x-checker-data": {
|
||||
"project-id": 13287,
|
||||
"stable-only": true,
|
||||
"type": "anitya",
|
||||
"url-template":
|
||||
"https://github.com/openssl/openssl/releases/download/openssl-${version}/openssl-${version}.tar.gz"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -14,15 +14,15 @@
|
||||
"name": "pcsc",
|
||||
"sources": [
|
||||
{
|
||||
"sha256": "7fcb59f66a323f63cf1ab492579a57d899806835c52ba377af9ac57df68bf39b",
|
||||
"sha256": "00b667aa71504ed1d39a48ad377de048c70dbe47229e8c48a3239ab62979c70f",
|
||||
"type": "archive",
|
||||
"url": "https://github.com/LudovicRousseau/PCSC/archive/refs/tags/2.3.1.tar.gz",
|
||||
"url": "https://github.com/LudovicRousseau/PCSC/archive/refs/tags/2.3.3.tar.gz",
|
||||
"x-checker-data": {
|
||||
"project-id": 2611,
|
||||
"stable-only": true,
|
||||
"type": "anitya",
|
||||
"url-template":
|
||||
"https://github.com/LudovicRousseau/PCSC/tags/${version0}.${version1}.${version2}"
|
||||
"https://github.com/LudovicRousseau/PCSC/archive/refs/tags/${version0}.${version1}.${version2}"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user