[meta-oe,1/3] libvncserver: Update to latest version

Submitted by Khem Raj on Dec. 2, 2018, 7:13 p.m. | Patch ID: 156812

Details

Message ID 20181202191346.15104-1-raj.khem@gmail.com
State Accepted
Commit 5add8e838f321eb4bb75cfe10b312642bb490eb9
Headers show

Commit Message

Khem Raj Dec. 2, 2018, 7:13 p.m.
From: Eddie James <eajames@linux.ibm.com>

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>
Signed-off-by: Khem Raj <raj.khem@gmail.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 38dac06e64..0000000000
--- 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 0000000000..25917756fc
--- /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 = "f997b5a75fa171d79c5e568b7157fba83c8d8355"
+
+S = "${WORKDIR}/git"

Comments

Armin Kuster Dec. 2, 2018, 8:40 p.m.
On 12/2/18 11:13 AM, Khem Raj wrote:
> From: Eddie James <eajames@linux.ibm.com>
>
> 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>
> Signed-off-by: Khem Raj <raj.khem@gmail.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 38dac06e64..0000000000
> --- 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"

X11 was dropped. is it handled in some on the fashion?

- armin


> -
> -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 0000000000..25917756fc
> --- /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 = "f997b5a75fa171d79c5e568b7157fba83c8d8355"
> +
> +S = "${WORKDIR}/git"
Khem Raj Dec. 3, 2018, 4:46 a.m.
On Sun, Dec 2, 2018 at 12:40 PM akuster808 <akuster808@gmail.com> wrote:
>
>
>
> On 12/2/18 11:13 AM, Khem Raj wrote:
> > From: Eddie James <eajames@linux.ibm.com>
> >
> > 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>
> > Signed-off-by: Khem Raj <raj.khem@gmail.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 38dac06e64..0000000000
> > --- 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"
>
> X11 was dropped. is it handled in some on the fashion?

what caused the x11 dep in first place ? if it was gtk+ then this has been
dropped.
Eddie James Dec. 3, 2018, 3:55 p.m.
On 12/03/2018 09:43 AM, Eddie James wrote:
>
>
> On 12/02/2018 10:46 PM, Khem Raj wrote:
>> On Sun, Dec 2, 2018 at 12:40 PM akuster808 <akuster808@gmail.com> wrote:
>>>
>>>
>>> On 12/2/18 11:13 AM, Khem Raj wrote:
>>>> From: Eddie James <eajames@linux.ibm.com>
>>>>
>>>> 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>
>>>> Signed-off-by: Khem Raj <raj.khem@gmail.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 38dac06e64..0000000000
>>>> --- 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"
>>> X11 was dropped. is it handled in some on the fashion?
>> what caused the x11 dep in first place ? if it was gtk+ then this has 
>> been
>> dropped. 

Yes, as far as I can tell there is no dependency on X11 in the latest 
libvncserver. Some of the optional dependencies may require X11 
(libsdl2?) but that's handled by packageconfig and by the libsdl recipe 
I would assume.

Thanks for sending this to the list btw, had real trouble with my first 
attempt :)

Eddie