On 08/23/2008 07:45 AM, Bernhard Guillon wrote:
Hi all,
as suggested on #oe I remind the list to please acknowledge the request
or tell me if there is something wrong with it.
I further unified the recipes and made the _cvs sane. Please review the
attached patch.
Regards
Gordon
#
# old_revision [1158bcc7fbd021ba939dc1e2ef7be69cf90f2806]
#
# rename "packages/rdesktop/rdesktop_1.5.0.bb"
# to "packages/rdesktop/rdesktop_1.6.0.bb"
#
# add_file "packages/rdesktop/rdesktop.inc"
# content [270114a04f475fd26c303399d9a07b868287170f]
#
# add_file "packages/rdesktop/rdesktop_1.5.0.bb"
# content [9e4ba7c6bb11cf1c69cc758bdc43b1dd521ba1fd]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [d80fa9ce31ae234037ed74a2b44b8a595e6e0909]
# to [d8911cccd4a7a0baa80736bac78a03a6c365afba]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [487bc63721ec9678cd27874fc80eb7680c022c4e]
# to [7bb766b0b9626202cc5cd2b656472c8996b2e5a2]
#
# patch "packages/rdesktop/rdesktop_1.3.1.bb"
# from [123c0963c930eec872198d019f1cf1e48eecccf0]
# to [153c8faf20a6c5bef6bb921df0edd8c4854b7d1f]
#
# patch "packages/rdesktop/rdesktop_1.4.1.bb"
# from [a9ab28ff03d914badd10a000f082d6b5351d7abc]
# to [0b8ab4f7d19c7d2c5b29b4274c9b902db2bfcdb7]
#
# patch "packages/rdesktop/rdesktop_1.6.0.bb"
# from [8168a10aad2470f1e81cde1b8e148b7691e31cb3]
# to [be330853be02954b483e648f8524753193380211]
#
# patch "packages/rdesktop/rdesktop_cvs.bb"
# from [b5fb0c3b41fbd6d3deb72f02be87db2bd4a50f2f]
# to [ae66a866024dfdbde91274747492253211ae27a5]
#
============================================================
--- packages/rdesktop/rdesktop.inc 270114a04f475fd26c303399d9a07b868287170f
+++ packages/rdesktop/rdesktop.inc 270114a04f475fd26c303399d9a07b868287170f
@@ -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"
============================================================
--- packages/rdesktop/rdesktop_1.5.0.bb 9e4ba7c6bb11cf1c69cc758bdc43b1dd521ba1fd
+++ packages/rdesktop/rdesktop_1.5.0.bb 9e4ba7c6bb11cf1c69cc758bdc43b1dd521ba1fd
@@ -0,0 +1,13 @@
+DESCRIPTION = "Rdesktop rdp client for X"
+DEPENDS = "virtual/libx11 openssl"
+HOMEPAGE = "http://www.rdesktop.org";
+SECTION = "x11/network"
+LICENSE = "GPL"
+PV = "1.5.0"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc d80fa9ce31ae234037ed74a2b44b8a595e6e0909
+++ conf/distro/include/angstrom-2007-preferred-versions.inc d8911cccd4a7a0baa80736bac78a03a6c365afba
@@ -1624,7 +1624,7 @@ PREFERRED_VERSION_randrproto ?= "1.2.1"
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"
============================================================
--- conf/distro/include/sane-srcdates.inc 487bc63721ec9678cd27874fc80eb7680c022c4e
+++ conf/distro/include/sane-srcdates.inc 7bb766b0b9626202cc5cd2b656472c8996b2e5a2
@@ -141,6 +141,7 @@ SRCDATE_qemu-native ?= "20070613"
SRCDATE_putty ?= "20060814"
SRCDATE_python-cairo ?= "20060814"
SRCDATE_qemu-native ?= "20070613"
+SRCDATE_rdesktop ?= "20080917"
SRCDATE_roadster ?= "20060814"
SRCDATE_sctzap ?= "20060814"
SRCDATE_tslib ?= "20051101"
============================================================
--- packages/rdesktop/rdesktop_1.3.1.bb 123c0963c930eec872198d019f1cf1e48eecccf0
+++ packages/rdesktop/rdesktop_1.3.1.bb 153c8faf20a6c5bef6bb921df0edd8c4854b7d1f
@@ -1,17 +1,7 @@
-# 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 +="file://configure.patch;patch=1"
-SRC_URI="${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz \
- 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
}
============================================================
--- packages/rdesktop/rdesktop_1.4.1.bb a9ab28ff03d914badd10a000f082d6b5351d7abc
+++ packages/rdesktop/rdesktop_1.4.1.bb 0b8ab4f7d19c7d2c5b29b4274c9b902db2bfcdb7
@@ -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} "
============================================================
--- packages/rdesktop/rdesktop_1.5.0.bb 8168a10aad2470f1e81cde1b8e148b7691e31cb3
+++ packages/rdesktop/rdesktop_1.6.0.bb be330853be02954b483e648f8524753193380211
@@ -1,13 +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"
+require rdesktop.inc
+
PR = "r0"
-SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz"
-
inherit autotools
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
============================================================
--- packages/rdesktop/rdesktop_cvs.bb b5fb0c3b41fbd6d3deb72f02be87db2bd4a50f2f
+++ packages/rdesktop/rdesktop_cvs.bb ae66a866024dfdbde91274747492253211ae27a5
@@ -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://[EMAIL PROTECTED]/cvsroot/rdesktop;module=rdesktop"
S = "${WORKDIR}/rdesktop"
_______________________________________________
Openembedded-stablebranch mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-stablebranch
