Skip to contentSkip to conversation

libvncserver: upgrade to 0.9.11

PATCH New Kyle Russell 1 participant 1 message Jun 17, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libvncserver: upgrade to 0.9.11

- Updates the SRC_URI to pull from the github project instead of debian
- Removes the need for the configure.ac patch since the github archive still contains the webclient directory, no impact to built packages
- sha1.c patch now included on 0.9.11
- adds systemd dependency for distros building with systemd
- removes conf flag for libva since that support has been removed in 0.9.11

---
 .../0001-remove-webclients-build.patch             |  28 --
 .../libvncserver/0002-common-add-sha1.patch        | 524 ---------------------
 ...bvncserver_0.9.10.bb => libvncserver_0.9.11.bb} |  18 +-
 3 files changed, 7 insertions(+), 563 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver/0001-remove-webclients-build.patch
 delete mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver/0002-common-add-sha1.patch
 rename meta-oe/recipes-graphics/libvncserver/{libvncserver_0.9.10.bb => libvncserver_0.9.11.bb} (53%)
meta-oe/recipes-graphics/libvncserver/libvncserver/0001-remove-webclients-build.patch deleted +0 -28
deleted file mode 100644
index 8f4365c..0000000
@@ -1,28 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 5c2a94d..f98038a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I m4
- 
--SUBDIRS=libvncserver examples libvncclient webclients client_examples test
--DIST_SUBDIRS=libvncserver examples libvncclient webclients client_examples test
-+SUBDIRS=libvncserver examples libvncclient client_examples test
-+DIST_SUBDIRS=libvncserver examples libvncclient client_examples test
- EXTRA_DIST = CMakeLists.txt rfb/rfbint.h.cmake rfb/rfbconfig.h.cmake
- 
- bin_SCRIPTS = libvncserver-config
-diff --git a/configure.ac b/configure.ac
-index ca9f3b3..9b464cf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -600,9 +600,6 @@ AC_CONFIG_FILES([Makefile
- 	libvncserver/Makefile
- 	examples/Makefile
- 	examples/android/Makefile
--	webclients/Makefile
--	webclients/java-applet/Makefile
--	webclients/java-applet/ssl/Makefile
- 	libvncclient/Makefile
- 	client_examples/Makefile
- 	test/Makefile
meta-oe/recipes-graphics/libvncserver/libvncserver/0002-common-add-sha1.patch deleted +0 -524

524 lines not on this page · raw message

meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb renamed from meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb +7 -11
similarity index 53%
rename from meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
rename to meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb
index 0eba87c..457d721 100644
@@ -6,22 +6,18 @@ 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 autotools binconfig pkgconfig
 
-SRC_URI  = "\
-    ${DEBIAN_MIRROR}/main/libv/libvncserver/libvncserver_0.9.10+dfsg.orig.tar.xz \
-    file://0001-remove-webclients-build.patch \
-    file://0002-common-add-sha1.patch \
-    file://0002-format_string.patch \
-"
-
-SRC_URI[md5sum] = "e883b6c7bd339a5e1c48645051abe5c4"
-SRC_URI[sha256sum] = "583f28869b82aec57768d7d18cd7ff81bf092ecbbc1209b587c2c2cd68330250"
+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}"
 
-EXTRA_OECONF += "--without-libva"
-
 TARGET_LDFLAGS += "-lgcrypt"
Signature · 1 line
2.7.4