Skip to contentSkip to conversation

remmina: Check for x11 in distro features

PATCH New Khem Raj 1 participant 2 messages Apr 13, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 remmina: Check for x11 in distro features

Add missing dependency on libxkbfile
It cant be built without it since plugins CMake is asking for it unconditionally

Fixes
| -- Checking for module 'xkbfile'
| -- No package 'xkbfile' found

Cc Martin Jansa <[email protected]>
---
 meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
meta-oe/recipes-support/remmina/remmina_1.3.6.bb +2 -4
index f9860a11fb..5b663489f8 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "https://remmina.org"
 SECTION = "Support"
 LICENSE = "GPLv2 & openssl"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769"
-DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret"
+DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret libxkbfile"
 
 
 DEPENDS_append_libc-musl = " libexecinfo"
@@ -17,9 +17,7 @@ SRC_URI[sha256sum] = "fbed745438bb0c21467b60cbd67c8148a9289b5ebc7482d06db443bea5
 S = "${WORKDIR}/Remmina-v${PV}"
 
 inherit cmake features_check mime-xdg
-
-# depends on avahi-ui with this restriction
-ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+REQUIRED_DISTRO_FEATURES = "x11"
 
 EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF"
 
Signature · 1 line
2.26.0
author
#1 lore raw

PATCH 2/2 vlc: Upgrade to 3.0.9.2

Add packageconfig for enabling wayland support

---
 .../recipes-multimedia/vlc/{vlc_3.0.8.bb => vlc_3.0.9.2.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-multimedia/recipes-multimedia/vlc/{vlc_3.0.8.bb => vlc_3.0.9.2.bb} (96%)
meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb renamed from meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb +2 -2
similarity index 96%
rename from meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb
rename to meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
index c15ff9a431..9e41512c3e 100644
@@ -23,8 +23,7 @@ SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \
            file://0007-use-vorbisidec.patch \
            file://0008-fix-luaL-checkint.patch \
 "
-SRC_URI[md5sum] = "744442ec0c145453ea1d257914c8072e"
-SRC_URI[sha256sum] = "e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6"
+SRC_URI[sha256sum] = "a9bdad293d81cd48516abad8d490d8ab4012964ae541ff19e00021e071e47601"
 
 inherit autotools gettext pkgconfig features_check mime-xdg
 
@@ -88,6 +87,7 @@ PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver"
 PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb,  xcb-util-keysyms libxpm libxinerama"
 PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
 PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
+PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native"
 
 do_configure_append() {
     sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool
Signature · 1 line
2.26.0