Merge bk://openembedded@openembedded.bkbits.net/packages-devel

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/11/19 00:53:13+01:00 uni-frankfurt.de!mickeyl
oz-3.5.2: final cvsdate bump before the code goes gold. GPE folks: Please adjust the fixed GPE versions as needed _before_ weekend.

2004/11/18 23:26:00+01:00 uni-frankfurt.de!mickeyl
fix section to something more common for rdesktop*

2004/11/18 23:24:27+01:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages-devel
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/11/18 23:24:03+01:00 uni-frankfurt.de!mickeyl
the most recent lirc now works again. disable PREFERRED_PROVIDER in oz.conf

BKrev: 419dbbbelZjDCJE55rmTaYXlroJ28Q

diff --git a/conf/distro/openzaurus-3.5.2.conf b/conf/distro/openzaurus-3.5.2.conf
index e8502ee..2915d04 100644 (file)
--- a/conf/distro/openzaurus-3.5.2.conf
+++ b/conf/distro/openzaurus-3.5.2.conf
@@ -1,13 +1,13 @@
 include conf/distro/openzaurus.conf
 DISTRO = "openzaurus"
 
-FEED_URIS_openzaurus = " \
+FEED_URIS += " \
        upgrades##http://openzaurus.org/official/unstable/3.5.2/upgrades/       \
        base##http://openzaurus.org/official/unstable/3.5.2/feed/base/          \
        libs##http://openzaurus.org/official/unstable/3.5.2/feed/libs/          \
        console##http://openzaurus.org/official/unstable/3.5.2/feed/console"
 
-CVSDATE = 20041117
+CVSDATE = 20041120
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
@@ -31,8 +31,6 @@ PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
 PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
 PREFERRED_VERSION_wlan-ng-modules = "0.2.1pre22"
 PREFERRED_VERSION_bluez-utils-dbus = "2.11"
-PREFERRED_VERSION_lirc = "0.6.6"
-PREFERRED_VERSION_lirc-modules = "0.6.6"
 
 #
 # Opie

diff --git a/rdesktop/rdesktop_1.3.1.oe b/rdesktop/rdesktop_1.3.1.oe
index e69de29..5a0d679 100644 (file)
--- a/rdesktop/rdesktop_1.3.1.oe
+++ b/rdesktop/rdesktop_1.3.1.oe
@@ -0,0 +1,37 @@
+# rdesktop OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION = "RDesktop is a X11 based RDP client"
+HOMEPAGE = "http://www.rdesktop.org/"
+LICENSE = "GPL"
+DEPENDS = "x11 openssl"
+RDEPENDS= "openssl"
+SECTION = "x11/network"
+
+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.. :)
+
+do_configure() {
+       ${S}/configure \
+       --prefix=${prefix} \
+       --exec-prefix=${exec_prefix} \
+       --bindir=${bindir} \
+       --mandir=${mandir} \
+       --sharedir=${datadir} \
+       --with-x=${STAGING_DIR}/${HOST_SYS} \
+       --with-openssl=${STAGING_DIR}/${HOST_SYS} \
+       --with-oss \
+       --without-debug  
+}
+
+do_compile() {
+       oe_runmake 'KEYMAP_PATH=${datadir}/keymaps/' 
+}
+
+do_install() {
+       oe_runmake DESTDIR=${D} install
+}

diff --git a/rdesktop/rdesktop_cvs.oe b/rdesktop/rdesktop_cvs.oe
index e69de29..043f7e7 100644 (file)
--- a/rdesktop/rdesktop_cvs.oe
+++ b/rdesktop/rdesktop_cvs.oe
@@ -0,0 +1,16 @@
+DESCRIPTION = "Rdesktop rdp client for X"
+DEPENDS = "x11 openssl"
+HOMEPAGE = "http://www.rdesktop.org"
+SECTION = "x11/network"
+MAINTAINER = "Adrian Davey <ade@beth2.org>
+LICENSE = "GPL"
+PV = "1.3.1cvs${CVSDATE}"
+PR = "r1"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/rdesktop;module=rdesktop"
+S = "${WORKDIR}/rdesktop"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
+