diff options
| author |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-02-19 00:40:23 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-02-19 00:40:23 +0000 |
| commit | db609dad15bffd0c11445fbb4c5d5413f7c01620 (patch) | |
| tree | 6de89f520fe1acbbea94a9451c9a8f4fea51dd08 | |
| parent | b5a19ef64dc7a61915bf05510a975dd9d1dce2ee (diff) | |
| parent | 55269916959bddb4a07f06825e1ab0a47feba221 (diff) | |
| download | openembedded-db609dad15bffd0c11445fbb4c5d5413f7c01620.tar.gz | |
merge of 'bd3711fbb9c0d355dbbef7978d07125ff2b635f5'
and 'c2ee59d447a958de79c86638383bdd570aea81c7'
| -rw-r--r-- | conf/machine/nokia770.conf | 2 | ||||
| -rw-r--r-- | packages/xorg-proto/renderproto_0.9.3.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-xserver/files/fix-picturestr-include-order.patch (renamed from packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch) | 0 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 4e36c6d38a..15126d56a9 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap" PREFERRED_PROVIDER_virtual/bootloader = "" PREFERRED_PROVIDER_tslib = "tslib-maemo" diff --git a/packages/xorg-proto/renderproto_0.9.3.bb b/packages/xorg-proto/renderproto_0.9.3.bb index f1d19df46e..3d20b24afd 100644 --- a/packages/xorg-proto/renderproto_0.9.3.bb +++ b/packages/xorg-proto/renderproto_0.9.3.bb @@ -2,5 +2,3 @@ require xorg-proto-common.inc CONFLICTS = "renderext" PE = "1" - -DEFAULT_PREFERENCE = "-1" diff --git a/packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch b/packages/xorg-xserver/files/fix-picturestr-include-order.patch index 3da235e1e1..3da235e1e1 100644 --- a/packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch +++ b/packages/xorg-xserver/files/fix-picturestr-include-order.patch diff --git a/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb b/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb index 372971e2ed..9a8db266b6 100644 --- a/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb +++ b/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb @@ -7,6 +7,7 @@ SECTION = "x11/base" DESCRIPTION = "X server from freedesktop.org" DESCRIPTION_xserver-kdrive-xomap = "X server for the OMAP in the Nokia 800" +PR = "r1" PE = "1" COMPATIBLE_MACHINE = "nokia(800|770)" @@ -23,6 +24,7 @@ SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/xorg-server_1.1 file://fixups.patch;patch=1 \ file://button_only.patch;patch=1 \ file://calibrateext.patch;patch=1 \ + file://fix-picturestr-include-order.patch;patch=1 \ file://xcalibrate_coords.patch;patch=1" # file://kdrive-evdev.patch;patch=1 \ # file://kdrive-use-evdev.patch;patch=1 \ |