github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build,nightly] add cjson to build dependencies

Browse Source
This commit is contained in:
Armin Novak 2023-03-11 11:56:37 +01:00 committed by Martin Fleisz
parent 2ddd82338a
commit 6bf42366a9
3 changed files with 173 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packaging/deb/freerdp-nightly/control
View File

@ -43,6 +43,7 @@ Build-Depends:
libpam0g-dev, libpam0g-dev,
uuid-dev, uuid-dev,
libxml2-dev, libxml2-dev,
libcjson-dev,
libsdl2-2.0-0, libsdl2-2.0-0,
libsdl2-dev, libsdl2-dev,
Standards-Version: 3.9.5 Standards-Version: 3.9.5

323
packaging/flatpak/com.freerdp.FreeRDP.json
View File

@ -1,167 +1,186 @@
{ {
"app-id": "com.freerdp.FreeRDP", "app-id": "com.freerdp.FreeRDP",
"runtime": "org.freedesktop.Platform", "runtime": "org.freedesktop.Platform",
"runtime-version": "22.08", "runtime-version": "22.08",
"sdk": "org.freedesktop.Sdk", "sdk": "org.freedesktop.Sdk",
"build-options" : { "build-options" : {
"cflags": "-O3", "cflags": "-O3",
"cxxflags": "-O3" "cxxflags": "-O3"
},
"command": "freerdp.sh",
"cleanup": [
"*.la",
"/include",
"/lib/cmake",
"/lib/pkgconfig"
],
"finish-args": [
/* X11 + XShm access */
"--share=ipc",
"--socket=x11",
/* Needs to talk to the network */
"--share=network",
/* Play sounds redirected from guests */
"--socket=pulseaudio",
"--socket=cups",
/* Wayland access */
"--socket=wayland",
/* Allow rw access to download folder */
"--filesystem=xdg-download"
],
"add-build-extensions": {
"org.freedesktop.Platform.ffmpeg-full": {
"directory": "lib/ffmpeg",
"version": "22.08",
"add-ld-path": "."
}, },
"command": "freerdp.sh", "org.freedesktop.Platform.openh264": {
"cleanup": [ "directory": "lib/openh264",
"*.la", "version": "2.3.0",
"/include", "add-ld-path": "."
"/lib/cmake", }
"/lib/pkgconfig" },
], "modules": [
"finish-args": [
/* X11 + XShm access */
"--share=ipc",
"--socket=x11",
/* Needs to talk to the network */
"--share=network",
/* Play sounds redirected from guests */
"--socket=pulseaudio",
"--socket=cups",
/* Wayland access */
"--socket=wayland",
/* Allow rw access to download folder */
"--filesystem=xdg-download"
],
"add-build-extensions": {
"org.freedesktop.Platform.ffmpeg-full": {
"directory": "lib/ffmpeg",
"version": "22.08",
"add-ld-path": "."
},
"org.freedesktop.Platform.openh264": {
"directory": "lib/openh264",
"version": "2.3.0",
"add-ld-path": "."
}
},
"modules": [
{ {
/** /**
* libfreerdp use xprop to try to detect keyboard layout * libfreerdp use xprop to try to detect keyboard layout
*/ */
"name": "xprop", "name": "xprop",
"sources": [ "sources": [
{ {
"type": "archive", "type": "archive",
"url": "https://xorg.freedesktop.org/releases/individual/app/xprop-1.2.5.tar.bz2", "url": "https://xorg.freedesktop.org/releases/individual/app/xprop-1.2.5.tar.bz2",
"sha256": "9b92ed0316bf2486121d8bac88bd1878f16b43bd335f18009b1f941f1eca93a1" "sha256": "9b92ed0316bf2486121d8bac88bd1878f16b43bd335f18009b1f941f1eca93a1"
} }
], ],
"cleanup": [ "cleanup": [
"/share/doc", "/share/doc",
"/share/man" "/share/man"
] ]
}, },
{ {
"name": "libusb", "name": "libusb",
"config-opts": ["--disable-static"], "config-opts": ["--disable-static"],
"sources": [ "sources": [
{ {
"type": "git", "type": "git",
"url": "https://github.com/libusb/libusb.git", "url": "https://github.com/libusb/libusb.git",
"tag": "v1.0.26" "tag": "v1.0.26"
} }
], ],
"cleanup": [ "cleanup": [
"/share/doc", "/share/doc",
"/share/man" "/share/man"
] ]
}, },
{ {
"name": "pcsc", "name": "pcsc",
"config-opts": [ "config-opts": [
"--disable-libsystemd", "--disable-libsystemd",
"--enable-pic", "--enable-pic",
"--disable-libusb", "--disable-libusb",
"--enable-shared", "--enable-shared",
"--with-systemdsystemunitdir=/app/lib/systemd/" "--with-systemdsystemunitdir=/app/lib/systemd/"
], ],
"sources": [ "sources": [
{ {
"type": "git", "type": "git",
"url": "https://github.com/LudovicRousseau/PCSC.git", "url": "https://github.com/LudovicRousseau/PCSC.git",
"tag": "1.9.9" "tag": "1.9.9"
} }
], ],
"cleanup": [ "cleanup": [
"/share/doc", "/share/doc",
"/share/man" "/share/man"
] ]
}, },
{
"name": "openssl111",
"buildsystem": "simple",
"build-commands": [
"./config --prefix=/app",
"make -j $FLATPAK_BUILDER_N_JOBS",
"make install"
],
"cleanup": [
"/share/doc",
"/share/man",
"/bin"
],
"sources": [
{
"type": "archive",
"url": "https://www.openssl.org/source/openssl-1.1.1q.tar.gz",
"sha256": "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca"
}
]
},
{ {
"name": "freerdp", "name": "openssl111",
"buildsystem": "cmake-ninja", "buildsystem": "simple",
"cleanup": [ "build-commands": [
], "./config --prefix=/app",
"config-opts": [ "make -j $FLATPAK_BUILDER_N_JOBS",
"-DCMAKE_VERBOSE_MAKEFILE=ON", "make install_sw"
"-DCMAKE_BUILD_TYPE:STRING=Release", ],
"-DCMAKE_INSTALL_LIBDIR:PATH=lib", "cleanup": [
"-DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON", "/share/doc",
"-DCHANNEL_TSMF:BOOL=OFF", "/share/man",
"-DCHANNEL_URBDRC:BOOL=ON", "/bin"
"-DBUILD_TESTING:BOOL=OFF", ],
"-DWITH_MANPAGES:BOOL=OFF", "sources": [
"-DWITH_KRB5:BOOL=OFF",
"-DWITH_PCSC:BOOL=ON",
"-DWITH_PKCS11:BOOL=ON",
"-DWITH_SWSCALE:BOOL=ON",
"-DWITH_SERVER:BOOL=ON",
"-DWITH_SAMPLE:BOOL=ON",
"-DWITH_CUPS:BOOL=ON",
"-DWITH_FFMPEG:BOOL=ON",
"-DWITH_DSP_FFMPEG:BOOL=ON",
"-DWITH_OSS:BOOL=OFF",
"-DWITH_PULSE:BOOL=ON"
],
"sources": [
{ {
"type": "dir", "type": "archive",
"path": "../.." "url": "https://www.openssl.org/source/openssl-1.1.1t.tar.gz",
"sha256": "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b"
} }
] ]
}, },
{ {
"name": "wrapper", "name": "cjson",
"buildsystem": "simple", "buildsystem": "cmake-ninja",
"build-commands": [ "cleanup": [
"install -D freerdp.sh /app/bin/freerdp.sh", ],
"mkdir -p /app/lib/ffmpeg", "config-opts": [
"mkdir -p /app/lib/openh264" "-DCMAKE_VERBOSE_MAKEFILE=ON",
], "-DCMAKE_BUILD_TYPE:STRING=Release",
"sources": [ "-DCMAKE_INSTALL_LIBDIR:PATH=lib",
{ "-DWITH_PULSE:BOOL=ON"
"type": "file", ],
"path": "freerdp.sh" "sources": [
} {
] "type": "git",
} "url": "https://github.com/DaveGamble/cJSON.git",
] "tag": "v1.7.15"
}
]
},
{
"name": "freerdp",
"buildsystem": "cmake-ninja",
"cleanup": [
],
"config-opts": [
"-DCMAKE_VERBOSE_MAKEFILE=ON",
"-DCMAKE_BUILD_TYPE:STRING=Release",
"-DCMAKE_INSTALL_LIBDIR:PATH=lib",
"-DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON",
"-DCHANNEL_TSMF:BOOL=OFF",
"-DCHANNEL_URBDRC:BOOL=ON",
"-DBUILD_TESTING:BOOL=OFF",
"-DWITH_MANPAGES:BOOL=OFF",
"-DWITH_KRB5:BOOL=OFF",
"-DWITH_PCSC:BOOL=ON",
"-DWITH_PKCS11:BOOL=ON",
"-DWITH_SWSCALE:BOOL=ON",
"-DWITH_SERVER:BOOL=ON",
"-DWITH_SAMPLE:BOOL=ON",
"-DWITH_CUPS:BOOL=ON",
"-DWITH_FFMPEG:BOOL=ON",
"-DWITH_DSP_FFMPEG:BOOL=ON",
"-DWITH_OSS:BOOL=OFF",
"-DWITH_PULSE:BOOL=ON"
],
"sources": [
{
"type": "dir",
"path": "../.."
}
]
},
{
"name": "wrapper",
"buildsystem": "simple",
"build-commands": [
"install -D freerdp.sh /app/bin/freerdp.sh",
"mkdir -p /app/lib/ffmpeg",
"mkdir -p /app/lib/openh264"
],
"sources": [
{
"type": "file",
"path": "freerdp.sh"
}
]
}
]
} }

1
packaging/rpm/freerdp-nightly.spec
View File

@ -46,6 +46,7 @@ BuildRequires: uuid-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: cjson-devel
# (Open)Suse # (Open)Suse
%if %{defined suse_version} %if %{defined suse_version}