summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2008-12-10 19:41:34 +0100
committerStefan Schmidt <stefan@datenfreihafen.org>2008-12-10 19:41:34 +0100
commit9d2716ba785a6f71a6f743be474d801add27d55b (patch)
tree90a9e903f7cf39ee0f28c634320efdf450bfe242 /conf
parent7a8c4918691f8ba6918d88b42a3c6e26bd4f4b33 (diff)
parent9cd6ac1c5cf557978ca796a1830cfc6e66dcfddb (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
-rw-r--r--conf/checksums.ini12
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc1
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc4
3 files changed, 16 insertions, 1 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 31e2a662c5..df8149df52 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -9262,6 +9262,10 @@ sha256=63278ef492d6babb9e3efaef84a67a982e5362c51623714c9428f0384007dfe5
md5=3faf4bc1e2bb9353590d7b1fe50ec306
sha256=5360e221354bbdfd67bf9834c2c1d7a0d83f22c17e057f92194411911fbb81f5
+[http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.5.0.tar.bz2]
+md5=dcc36554aea1338b3813943daf1e9988
+sha256=ef90f7e4c151095cc75a573acd86355aa65c5bc7fd1dcce4a1483b64788e1461
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/inputproto-X11R7.0-1.3.2.tar.bz2]
md5=0da271f396bede5b8d09a61f6d1c4484
sha256=3b48f495f9af74fc7cca2fe913e10ce3d947d1aa5e677722e87620b32f1068d0
@@ -10326,6 +10330,10 @@ sha256=4deda13613f03e4524d3cf0ac14b9e20be5044d415cb8478713ecbe47f4de862
md5=7c510abb0cad8dc20493fb27ff7859d8
sha256=c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f
+[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.2.0.tar.bz2]
+md5=4b88e07d7dd77ca1e786f09066b58c02
+sha256=7c0125ffb864e121ebfb5a20b1cfdff60562c2f2dfbb4e77c5eac81f36e15f3a
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXi-X11R7.0-1.0.0.tar.bz2]
md5=99503799b4d52ec0cac8e203341bb7b3
sha256=64e8ece13fc778b9dd86ef93c4b782de9a1176a005ed7d895552a73acb103d9b
@@ -21194,6 +21202,10 @@ sha256=71e896168819bcf50044c175482d03873c31bc6eb355305a87e94772580789dd
md5=ac97e155ea4db87a8393297493f9c406
sha256=825adcadaf4c90d4cb1d0bd21dcf67bf3b895f12f8e7bf186ed936445dc015ca
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.1.0.tar.bz2]
+md5=a6070ead29b2d81b5b386a96df2661b8
+sha256=45c4b6df8d1dbc4db8aa580be4f3c693ebba4eba4908d82489948827d3bed0e5
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2]
md5=d982c6f185f4c75a4b65703ceed7be06
sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 8744cfc20a..f6afab61e9 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -11,7 +11,6 @@ PREFERRED_VERSION_glproto = "1.4.9"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_gtk+ = "2.14.2"
PREFERRED_VERSION_gtkmm = "2.14.1"
-PREFERRED_VERSION_inputproto = "1.4.4"
PREFERRED_VERSION_libgemwidget = "1.0"
PREFERRED_VERSION_libgpephone = "0.4"
PREFERRED_VERSION_libosip2 = "2.2.2"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
index cf999a2a4d..a81d5eca71 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
@@ -1,3 +1,7 @@
# This file is for updates after X11R7.4 was released
PREFERRED_VERSION_xserver-xorg ?= "1.5.3"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.1.0"
+PREFERRED_VERSION_libxi ?= "1.2.0"
+PREFERRED_VERSION_inputproto ?= "1.5.0"
+