diff options
author | dl9pf@gmx.de <dl9pf@gmx.de> | 2020-02-19 12:56:54 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-02-19 09:36:13 -0800 |
commit | 876f4ce7639def476664834acafbf87cc227fb05 (patch) | |
tree | e5573a1e57d4ddadf3065736f9e703bb0e8985cf /meta-oe/recipes-support/remmina | |
parent | 696408ce3661b663a7895f75a01613e6cfeb8186 (diff) | |
download | meta-openembedded-876f4ce7639def476664834acafbf87cc227fb05.tar.gz |
meta-oe: master: remmina - use PACKAGECONFIG for spice
remmina depends on spice and spice-protocol but they are in meta-networking.
Use the PACKAGECONFIG flag to avoid hardcoding the dependency.
Signed-off-by: Jan-Simon Moeller <dl9pf@gmx.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/remmina')
-rw-r--r-- | meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb index f9963ff65..f9860a11f 100644 --- a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb +++ b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb | |||
@@ -5,8 +5,6 @@ LICENSE = "GPLv2 & openssl" | |||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" |
6 | DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret" | 6 | DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret" |
7 | 7 | ||
8 | DEPENDS_append_x86 = " spice spice-protocol" | ||
9 | DEPENDS_append_x86-64 = " spice spice-protocol" | ||
10 | 8 | ||
11 | DEPENDS_append_libc-musl = " libexecinfo" | 9 | DEPENDS_append_libc-musl = " libexecinfo" |
12 | LDFLAGS_append_libc-musl = " -lexecinfo" | 10 | LDFLAGS_append_libc-musl = " -lexecinfo" |
@@ -23,11 +21,7 @@ inherit cmake features_check mime-xdg | |||
23 | # depends on avahi-ui with this restriction | 21 | # depends on avahi-ui with this restriction |
24 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 22 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
25 | 23 | ||
26 | EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DWITH_SPICE=OFF" | 24 | EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF" |
27 | |||
28 | EXTRA_OECMAKE_append_x86 = " -DWITH_SPICE=ON" | ||
29 | EXTRA_OECMAKE_append_x86-64 = " -DWITH_SPICE=ON" | ||
30 | |||
31 | 25 | ||
32 | do_install_append(){ | 26 | do_install_append(){ |
33 | # We dont need the extra stuff form other desktop environments | 27 | # We dont need the extra stuff form other desktop environments |
@@ -36,6 +30,8 @@ do_install_append(){ | |||
36 | rm -rf ${D}/${datadir}/gnome-session | 30 | rm -rf ${D}/${datadir}/gnome-session |
37 | } | 31 | } |
38 | 32 | ||
33 | PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" | ||
34 | |||
39 | RDEPENDS_${PN} = "bash" | 35 | RDEPENDS_${PN} = "bash" |
40 | 36 | ||
41 | FILES_${PN}_append = " ${datadir}/icons/hicolor/*" | 37 | FILES_${PN}_append = " ${datadir}/icons/hicolor/*" |