diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-21 19:54:05 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-21 19:54:05 +0100 |
| commit | 33762d41c0e68ea1c130e9fd2e283f70e2338592 (patch) | |
| tree | 04255a24a3c63d6c8a624ebca25db93b5e96f78d /recipes/xorg-driver | |
| parent | 6cd92d1545ccf5d4f1459f70faa81be68adb0794 (diff) | |
| parent | 21b699c06496cb374dbf05def5c57ff10720392e (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/xorg-driver')
5 files changed, 35 insertions, 1 deletions
diff --git a/recipes/xorg-driver/xf86-input-tslib/double-free-crash.patch b/recipes/xorg-driver/xf86-input-tslib/double-free-crash.patch new file mode 100644 index 0000000000..07754731dd --- /dev/null +++ b/recipes/xorg-driver/xf86-input-tslib/double-free-crash.patch @@ -0,0 +1,20 @@ +xorg-server-1.7.3/hw/xfree86/common/xf86Helper.c contains this code +causing a double free crash on chvt or exit: + + /* This should *really* be handled in drv->UnInit(dev) call instead, but + * if the driver forgets about it make sure we free it or at least crash + * with flying colors */ + if (pInp->private) + xfree(pInp->private); +Index: xf86-input-tslib-0.0.6/src/tslib.c +=================================================================== +--- xf86-input-tslib-0.0.6.orig/src/tslib.c ++++ xf86-input-tslib-0.0.6/src/tslib.c +@@ -435,6 +435,7 @@ xf86TslibUninit(InputDriverPtr drv, Inpu + xf86TslibControlProc(pInfo->dev, DEVICE_OFF); + ts_close(priv->ts); + xfree(pInfo->private); ++ pInfo->private = NULL; + xf86DeleteInput(pInfo, 0); + } + diff --git a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb index 84d2da0ffd..cce5e9bdd1 100644 --- a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb +++ b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb @@ -4,9 +4,10 @@ DESCRIPTION = "X.Org X server -- tslib input driver" RRECOMMENDS += "hal tslib-calibrate" DEPENDS += "tslib" -PR = "r8" +PR = "r9" SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2 \ + file://double-free-crash.patch;patch=1 \ file://10-x11-input-tslib.fdi" do_configure_prepend() { diff --git a/recipes/xorg-driver/xf86-video-intel_2.10.0.bb b/recipes/xorg-driver/xf86-video-intel_2.10.0.bb new file mode 100644 index 0000000000..eed1fcb600 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-intel_2.10.0.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb b/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb new file mode 100644 index 0000000000..c2b6b7608a --- /dev/null +++ b/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb @@ -0,0 +1,2 @@ +require xorg-driver-video.inc +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb b/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb new file mode 100644 index 0000000000..994b8b6a3c --- /dev/null +++ b/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" |