[meta-oe] libvncserver: Update to latest version

Submitted by Eddie James on Oct. 9, 2018, 6:27 p.m. | Patch ID: 155534

Details

Message ID 1539109670-43001-1-git-send-email-eajames@linux.ibm.com
State Changes Requested
Headers show

Commit Message

Eddie James Oct. 9, 2018, 6:27 p.m.
The latest release of libvncserver is almost two years old. A number of
security fixes and enhancements have recently been committed. Since the repo
is stable, point the recipe to the latest commit.

libvncserver switched from autotools to cmake, so update the recipe as
necessary, and add PACKAGECONFIG options to allow a more minimal build and
install.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
 .../libvncserver/libvncserver_0.9.11.bb            | 25 ----------------------
 .../libvncserver/libvncserver_git.bb               | 23 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 25 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb
 create mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb
deleted file mode 100644
index 38dac06..0000000
--- a/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-oe/recipes-graphics/libvncserver/libvncserver_git.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
new file mode 100644
index 0000000..9fb2c09
--- /dev/null
+++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
@@ -0,0 +1,23 @@ 
+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 png ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} sdl zlib"
+PACKAGECONFIG[gcrypt] = ",,libgcrypt,libgcrypt"
+PACKAGECONFIG[gnutls] = ",,gnutls"
+PACKAGECONFIG[jpeg] = ",-DWITH_JPEG=OFF,jpeg"
+PACKAGECONFIG[openssl] = ",,openssl"
+PACKAGECONFIG[png] = ",-DWITH_PNG=OFF,libpng,libpng"
+PACKAGECONFIG[systemd] = ",,systemd"
+PACKAGECONFIG[sdl] = ",,libsdl2"
+PACKAGECONFIG[zlib] = ",,zlib"
+
+inherit cmake
+
+SRC_URI = "git://github.com/LibVNC/libvncserver"
+SRCREV = "7b1ef0ffc4815cab9a96c7278394152bdc89dc4d"
+
+S = "${WORKDIR}/git"

Comments

Armin Kuster Oct. 10, 2018, 12:30 a.m.
On 10/09/2018 11:27 AM, Eddie James wrote:
> The latest release of libvncserver is almost two years old. A number of
> security fixes and enhancements have recently been committed. Since the repo
> is stable, point the recipe to the latest commit.
>
> libvncserver switched from autotools to cmake, so update the recipe as
> necessary, and add PACKAGECONFIG options to allow a more minimal build and
> install.
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
> ---
>  .../libvncserver/libvncserver_0.9.11.bb            | 25 ----------------------
>  .../libvncserver/libvncserver_git.bb               | 23 ++++++++++++++++++++
>  2 files changed, 23 insertions(+), 25 deletions(-)
>  delete mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb
>  create mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
>
> diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb
> deleted file mode 100644
> index 38dac06..0000000
> --- a/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-oe/recipes-graphics/libvncserver/libvncserver_git.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
> new file mode 100644
> index 0000000..9fb2c09

This removes any notion of a version. I think that is not ideal.

Does the git hash equate to version ?
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
> @@ -0,0 +1,23 @@
> +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 png ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} sdl zlib"
> +PACKAGECONFIG[gcrypt] = ",,libgcrypt,libgcrypt"
> +PACKAGECONFIG[gnutls] = ",,gnutls"
> +PACKAGECONFIG[jpeg] = ",-DWITH_JPEG=OFF,jpeg"
> +PACKAGECONFIG[openssl] = ",,openssl"
> +PACKAGECONFIG[png] = ",-DWITH_PNG=OFF,libpng,libpng"
> +PACKAGECONFIG[systemd] = ",,systemd"
> +PACKAGECONFIG[sdl] = ",,libsdl2"
> +PACKAGECONFIG[zlib] = ",,zlib"
> +
> +inherit cmake
> +


Have you run " yocto-check-layer"  with this?

I had to add 'REQUIRED_DISTRO_FEATURES = "x11" ' to make it pass on the
previous version.


> +SRC_URI = "git://github.com/LibVNC/libvncserver"
> +SRCREV = "7b1ef0ffc4815cab9a96c7278394152bdc89dc4d"
> +
> +S = "${WORKDIR}/git"
- Armin
Khem Raj Oct. 10, 2018, 2:05 a.m.
On Tue, Oct 9, 2018 at 5:31 PM akuster808 <akuster808@gmail.com> wrote:
>
>
>
> On 10/09/2018 11:27 AM, Eddie James wrote:
> > The latest release of libvncserver is almost two years old. A number of
> > security fixes and enhancements have recently been committed. Since the repo
> > is stable, point the recipe to the latest commit.
> >
> > libvncserver switched from autotools to cmake, so update the recipe as
> > necessary, and add PACKAGECONFIG options to allow a more minimal build and
> > install.
> >
> > Signed-off-by: Eddie James <eajames@linux.ibm.com>
> > ---
> >  .../libvncserver/libvncserver_0.9.11.bb            | 25 ----------------------
> >  .../libvncserver/libvncserver_git.bb               | 23 ++++++++++++++++++++
> >  2 files changed, 23 insertions(+), 25 deletions(-)
> >  delete mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb
> >  create mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
> >
> > diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb
> > deleted file mode 100644
> > index 38dac06..0000000
> > --- a/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-oe/recipes-graphics/libvncserver/libvncserver_git.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
> > new file mode 100644
> > index 0000000..9fb2c09
>
> This removes any notion of a version. I think that is not ideal.
>
> Does the git hash equate to version ?
> > --- /dev/null
> > +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
> > @@ -0,0 +1,23 @@
> > +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 png ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} sdl zlib"
> > +PACKAGECONFIG[gcrypt] = ",,libgcrypt,libgcrypt"
> > +PACKAGECONFIG[gnutls] = ",,gnutls"
> > +PACKAGECONFIG[jpeg] = ",-DWITH_JPEG=OFF,jpeg"
> > +PACKAGECONFIG[openssl] = ",,openssl"
> > +PACKAGECONFIG[png] = ",-DWITH_PNG=OFF,libpng,libpng"
> > +PACKAGECONFIG[systemd] = ",,systemd"
> > +PACKAGECONFIG[sdl] = ",,libsdl2"
> > +PACKAGECONFIG[zlib] = ",,zlib"
> > +
> > +inherit cmake
> > +
>
>
> Have you run " yocto-check-layer"  with this?
>
> I had to add 'REQUIRED_DISTRO_FEATURES = "x11" ' to make it pass on the
> previous version.

seemingly its still needed.

>
>
> > +SRC_URI = "git://github.com/LibVNC/libvncserver"
> > +SRCREV = "7b1ef0ffc4815cab9a96c7278394152bdc89dc4d"
> > +
> > +S = "${WORKDIR}/git"
> - Armin
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Andreas Hartmetz Oct. 12, 2018, 9:14 a.m.
By the way, this new version of the recipe also drops the spurious GTK+ 
dependency of the old recipe. I was close to sending a patch to remove 
that dependency... Maybe worth a look to check if GTK+ pulled in 
anything libvnc might need or can put to good use. I didn't find 
anything, but I also didn't runtime-test VNC.

Am Dienstag, 9. Oktober 2018, 20:27:50 CEST schrieb Eddie James:
> The latest release of libvncserver is almost two years old. A number
> of security fixes and enhancements have recently been committed.
> Since the repo is stable, point the recipe to the latest commit.
> 
> libvncserver switched from autotools to cmake, so update the recipe as
> necessary, and add PACKAGECONFIG options to allow a more minimal
> build and install.
> 
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
> ---
>  .../libvncserver/libvncserver_0.9.11.bb            | 25
> ---------------------- .../libvncserver/libvncserver_git.bb          
>     | 23 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 25
> deletions(-)
>  delete mode 100644
> meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb create
> mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
> 
> diff --git
> a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb
> b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb
> deleted file mode 100644
> index 38dac06..0000000
> --- a/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}.ta
> r.gz" -SRC_URI[md5sum] = "7f06104d5c009813e95142932c4ddb06"
> -SRC_URI[sha256sum] =
> "193d630372722a532136fd25c5326b2ca1a636cbb8bf9bb115ef869c804d2894" -
> -S = "${WORKDIR}/${BPN}-LibVNCServer-${PV}"
> -
> -TARGET_LDFLAGS += "-lgcrypt"
> diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
> b/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb new file
> mode 100644
> index 0000000..9fb2c09
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb
> @@ -0,0 +1,23 @@
> +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 png
> ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} sdl
> zlib" +PACKAGECONFIG[gcrypt] = ",,libgcrypt,libgcrypt"
> +PACKAGECONFIG[gnutls] = ",,gnutls"
> +PACKAGECONFIG[jpeg] = ",-DWITH_JPEG=OFF,jpeg"
> +PACKAGECONFIG[openssl] = ",,openssl"
> +PACKAGECONFIG[png] = ",-DWITH_PNG=OFF,libpng,libpng"
> +PACKAGECONFIG[systemd] = ",,systemd"
> +PACKAGECONFIG[sdl] = ",,libsdl2"
> +PACKAGECONFIG[zlib] = ",,zlib"
> +
> +inherit cmake
> +
> +SRC_URI = "git://github.com/LibVNC/libvncserver"
> +SRCREV = "7b1ef0ffc4815cab9a96c7278394152bdc89dc4d"
> +
> +S = "${WORKDIR}/git"