From 27ea5e705990f4e4a45f61109a81c597c10bf152 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 9 Jul 2019 23:28:00 -0400 Subject: libvncserver: update to latest commit 1354f7f Update libvncserver to latest git commit 1354f7f which could help to fix do_package error when multilib is enabled: | Files/directories were installed but not shipped in any package: | /usr/lib/libvncclient.so.0.9.12 | /usr/lib/libvncclient.so.1 | /usr/lib/libvncclient.so | /usr/lib/libvncserver.so.0.9.12 | /usr/lib/libvncserver.so.1 | /usr/lib/libvncserver.so | /usr/lib/pkgconfig | /usr/lib/pkgconfig/libvncserver.pc | /usr/lib/pkgconfig/libvncclient.pc Rename recipe name from _git.bb to _${version}.bb as well. Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- .../libvncserver/libvncserver_0.9.12.bb | 39 ++++++++++++++++++++++ .../libvncserver/libvncserver_git.bb | 37 -------------------- 2 files changed, 39 insertions(+), 37 deletions(-) create mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb delete mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb new file mode 100644 index 0000000000..4e4acb835c --- /dev/null +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb @@ -0,0 +1,39 @@ +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" + +PACKAGE_BEFORE_PN = "libvncclient" +FILES_libvncclient = "${libdir}/libvncclient.*" + +inherit cmake + +SRC_URI = "git://github.com/LibVNC/libvncserver" +SRCREV = "1354f7f1bb6962dab209eddb9d6aac1f03408110" +PV .= "+git${SRCPV}" + +S = "${WORKDIR}/git" + +EXTRA_OECMAKE = "-DMAKE_INSTALL_LIBDIR=${libdir}" diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb deleted file mode 100644 index bc47a3f156..0000000000 --- a/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb +++ /dev/null @@ -1,37 +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" - -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" - -PACKAGE_BEFORE_PN = "libvncclient" -FILES_libvncclient = "${libdir}/libvncclient.*" - -inherit cmake - -SRC_URI = "git://github.com/LibVNC/libvncserver" -SRCREV = "c0a23857a5c42b45b6d22ccf7218becd1fa69402" -PV = "0.9.12+git${SRCPV}" - -S = "${WORKDIR}/git" -- cgit 1.2.3-korg