[oe-commits] org.oe.dev xserver-xorg: change xorg.conf to use the framebuffer instead of s3 (sane defaults and all)

[koen commit]

xserver-xorg: change xorg.conf to use the framebuffer instead of s3 (sane defaults and all)
* also add rdepends on minimal font package

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 9a9611fcde46bb26f5b5b767c9f6156fbbbbc984
ViewMTN: http://monotone.openembedded.org/revision/info/9a9611fcde46bb26f5b5b767c9f6156fbbbbc984
Files:
1
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg/xorg.conf
packages/xorg-xserver/xserver-xorg_1.4.2.bb
packages/xorg-xserver/xserver-xorg_1.4.bb
Diffs:

#
# mt diff -r85cdcc12545e1aa1b9290e4456cf4f2f78762f4e -r9a9611fcde46bb26f5b5b767c9f6156fbbbbc984
#
#
#
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
#  from [1cc605fc952cb675700394a0e68ce0f8c83f5d6f]
#    to [dc8d79997ec36fdb922741dc4c5ae140970f9e12]
# 
# patch "packages/xorg-xserver/xserver-xorg/xorg.conf"
#  from [067fe1120fc0e93fa9c0e580a748ab38ad9a52c7]
#    to [bfcc63810ece1d786706fcb229fa67ac029b54d2]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.4.2.bb"
#  from [82f378de1913460628054471e7fd0daca8a411a1]
#    to [aa88c8fb589cdbefddf67d5801f17ec2980d02e9]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.4.bb"
#  from [aa88c8fb589cdbefddf67d5801f17ec2980d02e9]
#    to [4390a6545e73aa1015da701f862ee96c21cca2b6]
#
============================================================
--- packages/xorg-xserver/xorg-xserver-common.inc	1cc605fc952cb675700394a0e68ce0f8c83f5d6f
+++ packages/xorg-xserver/xorg-xserver-common.inc	dc8d79997ec36fdb922741dc4c5ae140970f9e12
@@ -13,7 +13,7 @@ libxkbui libxxf86misc libxi libdmx libxt
 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_install_append () {
 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
 }
============================================================
--- packages/xorg-xserver/xserver-xorg/xorg.conf	067fe1120fc0e93fa9c0e580a748ab38ad9a52c7
+++ packages/xorg-xserver/xserver-xorg/xorg.conf	bfcc63810ece1d786706fcb229fa67ac029b54d2
@@ -67,10 +67,8 @@ Section "InputDevice"
 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 @@ Section "Device"
 
 
 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
============================================================
--- packages/xorg-xserver/xserver-xorg_1.4.2.bb	82f378de1913460628054471e7fd0daca8a411a1
+++ packages/xorg-xserver/xserver-xorg_1.4.2.bb	aa88c8fb589cdbefddf67d5801f17ec2980d02e9
@@ -3,6 +3,7 @@ PE = "1"
 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 \
============================================================
--- packages/xorg-xserver/xserver-xorg_1.4.bb	aa88c8fb589cdbefddf67d5801f17ec2980d02e9
+++ packages/xorg-xserver/xserver-xorg_1.4.bb	4390a6545e73aa1015da701f862ee96c21cca2b6
@@ -3,7 +3,7 @@ PE = "1"
 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 \