diff options
| -rw-r--r-- | packages/xorg-xserver/xorg-xserver-common.inc | 3 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg/xorg.conf | 20 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg_1.4.2.bb | 1 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg_1.4.bb | 2 |
4 files changed, 7 insertions, 19 deletions
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 819be742d4..0189a5d3b0 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -13,7 +13,7 @@ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \ libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa" -RDEPENDS_${PN} = "rgb" +RDEPENDS_${PN} = "rgb xorg-minimal-fonts" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \ @@ -43,4 +43,5 @@ do_stage() { do_install_append () { install -d ${D}/etc/X11 install -m 0644 ${WORKDIR}/xorg.conf ${D}/etc/X11/ + ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts } diff --git a/packages/xorg-xserver/xserver-xorg/xorg.conf b/packages/xorg-xserver/xserver-xorg/xorg.conf index 34f4465764..4b327022f6 100644 --- a/packages/xorg-xserver/xserver-xorg/xorg.conf +++ b/packages/xorg-xserver/xserver-xorg/xorg.conf @@ -67,10 +67,8 @@ EndSection Section "InputDevice" Identifier "Mouse0" Driver "mouse" - Option "Protocol" "PS/2" -# Option "Protocol" "IMPS/2" - Option "Device" "/dev/psaux" -# Option "Device" "/dev/input/mice" + Option "Protocol" "IMPS/2" + Option "Device" "/dev/input/mice" Option "ZAxisMapping" "4 5" Option "Emulate3Buttons" "yes" EndSection @@ -101,28 +99,16 @@ EndSection Section "Device" - Identifier "Videocard0" - Driver "s3" -# Driver "nv" - VendorName "Videocard vendor" - BoardName "S3 driver" - #BoardName "NVidia driver" -EndSection - -Section "Device" Identifier "FBDev" Driver "fbdev" #Option "shadowfb" "off" - VideoRam 4096 EndSection Section "Screen" Identifier "Screen0" - Device "Videocard0" + Device "FBDev" Monitor "Monitor0" -# DefaultDepth 8 DefaultDepth 16 -# DefaultDepth 24 SubSection "Display" Depth 8 diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb index 489e01742e..6e643a9138 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb @@ -3,6 +3,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" PE = "1" +PR = "r1" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb index 6e643a9138..0b0f847dff 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.bb @@ -3,7 +3,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" PE = "1" -PR = "r1" +PR = "r2" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ |