rdesktop: backport update to 1.6.0

acked by Koen and xjqian

8 files changed, 29 insertions, 32 deletions

diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 4e2fead330..dcc1e3fbd6 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1624,7 +1624,7 @@ PREFERRED_VERSION_radvd ?= "1.0"
 PREFERRED_VERSION_rage ?= "0.2.0.003"
 PREFERRED_VERSION_randrext ?= "1.0"
 PREFERRED_VERSION_randrproto ?= "1.2.1"
-PREFERRED_VERSION_rdesktop ?= "1.5.0"
+PREFERRED_VERSION_rdesktop ?= "1.6.0"
 PREFERRED_VERSION_rdiff-backup ?= "1.1.5"
 PREFERRED_VERSION_readline ?= "4.3"
 PREFERRED_VERSION_readline-native ?= "4.3"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 2692dfb3af..af94e53430 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -141,6 +141,7 @@ SRCDATE_portaudio ?= "20060814"
 SRCDATE_putty ?= "20060814"
 SRCDATE_python-cairo ?= "20060814"
 SRCDATE_qemu-native ?= "20070613"
+SRCDATE_rdesktop ?= "20080917"
 SRCDATE_roadster ?= "20060814"
 SRCDATE_sctzap ?= "20060814"
 SRCDATE_tslib ?= "20051101"
diff --git a/packages/rdesktop/rdesktop.inc b/packages/rdesktop/rdesktop.inc
new file mode 100644
index 0000000000..4c832cae3f
--- /dev/null
+++ b/packages/rdesktop/rdesktop.inc
@@ -0,0 +1,7 @@
+DESCRIPTION = "Rdesktop rdp client for X"
+HOMEPAGE = "http://www.rdesktop.org"
+DEPENDS = "virtual/libx11 openssl"
+SECTION = "x11/network"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz"
diff --git a/packages/rdesktop/rdesktop_1.3.1.bb b/packages/rdesktop/rdesktop_1.3.1.bb
index 12ff1c5bcd..d50a0c1e8c 100644
--- a/packages/rdesktop/rdesktop_1.3.1.bb
+++ b/packages/rdesktop/rdesktop_1.3.1.bb
@@ -1,16 +1,6 @@
-# rdesktop OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+require rdesktop.inc
 
-DESCRIPTION = "RDesktop is a X11 based RDP client"
-HOMEPAGE = "http://www.rdesktop.org/"
-LICENSE = "GPL"
-DEPENDS = "virtual/libx11 openssl"
-RDEPENDS= "openssl"
-SECTION = "x11/network"
-
-SRC_URI="${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz \
-	file://configure.patch;patch=1"
+SRC_URI +="file://configure.patch;patch=1"
 
 # Note - rdesktop 1.3.1 doesn't use autotools - don't make the same
 # mistakes I did.. :)
@@ -22,8 +12,8 @@ do_configure() {
 	--bindir=${bindir} \
 	--mandir=${mandir} \
 	--sharedir=${datadir} \
-	--with-x=${STAGING_DIR}/${HOST_SYS} \
-	--with-openssl=${STAGING_DIR}/${HOST_SYS} \
+	--with-x=${STAGING_EXECPREFIXDIR} \
+	--with-openssl=${STAGING_EXECPREFIXDIR} \
 	--with-oss \
 	--without-debug
 }
diff --git a/packages/rdesktop/rdesktop_1.4.1.bb b/packages/rdesktop/rdesktop_1.4.1.bb
index 7581647a57..8682c8ee98 100644
--- a/packages/rdesktop/rdesktop_1.4.1.bb
+++ b/packages/rdesktop/rdesktop_1.4.1.bb
@@ -1,14 +1,9 @@
-DESCRIPTION = "Rdesktop rdp client for X"
-DEPENDS = "virtual/libx11 openssl"
-HOMEPAGE = "http://www.rdesktop.org"
-SECTION = "x11/network"
-LICENSE = "GPL"
-PV = "1.4.1"
+require rdesktop.inc
+
 PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz \
-	file://strip.patch;patch=1"
+SRC_URI += "file://strip.patch;patch=1"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
diff --git a/packages/rdesktop/rdesktop_1.5.0.bb b/packages/rdesktop/rdesktop_1.5.0.bb
index de270e1025..12385c127f 100644
--- a/packages/rdesktop/rdesktop_1.5.0.bb
+++ b/packages/rdesktop/rdesktop_1.5.0.bb
@@ -10,4 +10,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
diff --git a/packages/rdesktop/rdesktop_1.6.0.bb b/packages/rdesktop/rdesktop_1.6.0.bb
new file mode 100644
index 0000000000..d652dfe633
--- /dev/null
+++ b/packages/rdesktop/rdesktop_1.6.0.bb
@@ -0,0 +1,7 @@
+require rdesktop.inc
+
+PR = "r0"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
diff --git a/packages/rdesktop/rdesktop_cvs.bb b/packages/rdesktop/rdesktop_cvs.bb
index 63d082be0c..0b76ee7535 100644
--- a/packages/rdesktop/rdesktop_cvs.bb
+++ b/packages/rdesktop/rdesktop_cvs.bb
@@ -1,10 +1,7 @@
-DESCRIPTION = "Rdesktop rdp client for X"
-DEPENDS = "virtual/libx11 openssl"
-HOMEPAGE = "http://www.rdesktop.org"
-SECTION = "x11/network"
-LICENSE = "GPL"
-PV = "1.5.0+cvs${SRCDATE}"
-PR = "r3"
+require rdesktop.inc
+
+PV = "1.6.0+cvs${SRCDATE}"
+PR = "r0"
 DEFAULT_PREFERENCE = "-1"
 SRC_URI = "cvs://anonymous@rdesktop.cvs.sourceforge.net/cvsroot/rdesktop;module=rdesktop"
 S = "${WORKDIR}/rdesktop"