diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-graphics/libvncserver | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics/libvncserver')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb | 25 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb | 34 |
2 files changed, 34 insertions, 25 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb b/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb deleted file mode 100644 index 38dac06e6..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "library for easy implementation of a RDP/VNC server" -HOMEPAGE = "https://libvnc.github.io" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f" - -DEPENDS += "zlib libsdl jpeg libpng gtk+ libgcrypt nettle gnutls gmp" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" -PACKAGECONFIG[systemd] = ",,systemd" - -RDEPENDS_${PN} += "libpng gtk+ libgcrypt" - -inherit distro_features_check autotools binconfig pkgconfig - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${PV}.tar.gz" -SRC_URI[md5sum] = "7f06104d5c009813e95142932c4ddb06" -SRC_URI[sha256sum] = "193d630372722a532136fd25c5326b2ca1a636cbb8bf9bb115ef869c804d2894" - -S = "${WORKDIR}/${BPN}-LibVNCServer-${PV}" - -TARGET_LDFLAGS += "-lgcrypt" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb b/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb new file mode 100644 index 000000000..88a859ba2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "library for easy implementation of a RDP/VNC server" +HOMEPAGE = "https://libvnc.github.io" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f" + +PACKAGECONFIG ??= " \ + gcrypt \ + gnutls \ + jpeg \ + lzo \ + png \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} \ + sdl \ + zlib \ +" +PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=ON,-DWITH_GCRYPT=OFF,libgcrypt,libgcrypt" +PACKAGECONFIG[gnutls] = "-DWITH_GNUTLS=ON,-DWITH_GNUTLS=OFF,gnutls" +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg" +PACKAGECONFIG[lzo] = "-DWITH_LZO=ON,-DWITH_LZO=OFF,lzo" +PACKAGECONFIG[openssl] = "-DWITH_OPENSSL=ON,-DWITH_OPENSSL=OFF,openssl" +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,libpng" +PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" +PACKAGECONFIG[sdl] = "-DWITH_SDL=ON,-DWITH_SDL=OFF,libsdl2" +PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib" + +inherit cmake + +SRC_URI = "git://github.com/LibVNC/libvncserver" +SRCREV = "c0a23857a5c42b45b6d22ccf7218becd1fa69402" + + +S = "${WORKDIR}/git" |