diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-16 09:31:26 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-16 09:31:26 +0100 |
| commit | 74c7d672949580abed60647d9abbe70c39c516e1 (patch) | |
| tree | f270d1fd8bc0ca750547061a5502a5025bc3afa4 /conf | |
| parent | 2598548bd9e250da9c2eb1c1b83f8bd97a937151 (diff) | |
| parent | fd265c020e524366c8db69fbedd2cf0bad471324 (diff) | |
| download | openembedded-74c7d672949580abed60647d9abbe70c39c516e1.tar.gz | |
Merge commit 'origin/martin_jansa/xorg-7.5' into shr/merge
Conflicts:
conf/distro/include/angstrom-2008-preferred-versions.inc
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 4 | ||||
| -rw-r--r-- | conf/machine/om-gta01.conf | 2 | ||||
| -rw-r--r-- | conf/machine/om-gta02.conf | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index a001d5cfa5..03ba67f2f2 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -20,10 +20,6 @@ PREFERRED_VERSION_libtool = "2.2.6a" PREFERRED_VERSION_libtool-native = "2.2.6a" PREFERRED_VERSION_libtool-cross = "2.2.6a" PREFERRED_VERSION_libtool-sdk = "2.2.6a" -PREFERRED_VERSION_libx11 = "1.2" -PREFERRED_VERSION_mesa = "7.4" -PREFERRED_VERSION_mesa-dri = "7.4" -PREFERRED_VERSION_mesa-xlib = "7.4" PREFERRED_VERSION_pango = "1.24.4" #PREFERRED_VERSION_pixman = "0.13.2" PREFERRED_VERSION_pkgconfig = "0.23" diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index 1e1c8612f8..e1c5127072 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24" PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel" PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg" PREFERRED_PROVIDER_xf86-video-fbdev_shr = "xf86-video-fbdev" -PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri" +PREFERRED_PROVIDER_virtual/libgl = "mesa" XSERVER_shr = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard" UBOOT_ENTRYPOINT = "30008000" diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 5fc96ec4ed..8e8355ba6f 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -15,8 +15,8 @@ PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel" #PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31" PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg" -PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri" -MACHINE_DRI_MODULES_shr = "glamo" +PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" +MACHINE_DRI_MODULES = "glamo" XSERVER_shr = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse" |