xserver xorg: have beagleboard use xf86-video-omapfb to gain XV support

2 files changed, 136 insertions, 1 deletions

diff --git a/packages/xorg-xserver/xserver-xorg/beagleboard/xorg.conf b/packages/xorg-xserver/xserver-xorg/beagleboard/xorg.conf
new file mode 100644
index 0000000000..1778960638
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg/beagleboard/xorg.conf
@@ -0,0 +1,135 @@
+
+# xorg configuration
+
+Section "ServerLayout"
+	Identifier     "Default Layout"
+	Screen      0  "Screen0" 0 0
+	InputDevice    "Mouse0" "CorePointer"
+	InputDevice    "Keyboard0" "CoreKeyboard"
+EndSection
+
+Section "Files"
+
+# RgbPath is the location of the RGB database.  Note, this is the name of the 
+# file minus the extension (like ".txt" or ".db").  There is normally
+# no need to change the default.
+# Multiple FontPath entries are allowed (they are concatenated together)
+# By default, Red Hat 6.0 and later now use a font server independent of
+# the X server to render fonts.
+#       FontPath     "unix/:7100"
+	FontPath     "/usr/lib/X11/fonts/misc"
+EndSection
+
+Section "Module"
+	Load  "dbe"
+	Load  "extmod"
+	Load  "fbdevhw"
+#	Load  "glx"
+	Load  "record"
+	Load  "freetype"
+	Load  "type1"
+# to enable Xv, link /dev/videox to video device, eg. ln -s video0 /dev/videox
+#	Load  "z4l"
+EndSection
+
+Section "InputDevice"
+
+# Specify which keyboard LEDs can be user-controlled (eg, with xset(1))
+#	Option	"Xleds"		"1 2 3"
+# To disable the XKEYBOARD extension, uncomment XkbDisable.
+#	Option	"XkbDisable"
+# To customise the XKB settings to suit your keyboard, modify the
+# lines below (which are the defaults).  For example, for a non-U.S.
+# keyboard, you will probably want to use:
+#	Option	"XkbModel"	"pc102"
+# If you have a US Microsoft Natural keyboard, you can use:
+#	Option	"XkbModel"	"microsoft"
+#
+# Then to change the language, change the Layout setting.
+# For example, a german layout can be obtained with:
+#	Option	"XkbLayout"	"de"
+# or:
+#	Option	"XkbLayout"	"de"
+#	Option	"XkbVariant"	"nodeadkeys"
+#
+# If you'd like to switch the positions of your capslock and
+# control keys, use:
+#	Option	"XkbOptions"	"ctrl:swapcaps"
+# Or if you just want both to be control, use:
+#	Option	"XkbOptions"	"ctrl:nocaps"
+#
+	Identifier  "Keyboard0"
+	Driver      "keyboard"
+	Option	    "XkbModel" "pc105"
+	Option	    "XkbLayout" "us"
+EndSection
+
+Section "InputDevice"
+	Identifier  "Mouse0"
+	Driver      "mouse"
+	Option	    "Protocol" "IMPS/2"
+	Option	    "Device" "/dev/input/mice"
+	Option	    "ZAxisMapping" "4 5"
+	Option	    "Emulate3Buttons" "yes"
+EndSection
+
+Section "Monitor"
+	Identifier   "Monitor0"
+	VendorName   "Monitor Vendor"
+	ModelName    "NEC FP2141SB"
+#	DisplaySize  400 300
+# Note: setting HorizSync/VertRefresh will override DDC probe
+#	HorizSync    30.0 - 140.0
+#	VertRefresh  25.0 - 160.0
+	Option	     "dpms"
+EndSection
+
+Section "Monitor"
+	Identifier   "Monitor1"
+	VendorName   "Generic Vendor"
+	ModelName    "Generic Monitor"
+	HorizSync    28-50
+	VertRefresh  43-73
+	Modeline     "800x600-60"  40.0000  800  840  976 1056   600  601  605  628
+	Modeline     "800x600-72"  50.0000  800  856  976 1040   600  637  643  666
+	Modeline     "640x480-60"  25.1749  640  656  744  800   480  490  492  525 -HSync -VSync
+	Modeline     "640x480-72"  31.5000  640  664  704  832   480  489  492  520 -HSync -VSync
+	Option	     "dpms"
+EndSection
+
+
+Section "Device"
+        Identifier  "FBDev"
+        Driver      "omapfb"
+	#Option     "shadowfb" "off"
+EndSection
+
+Section "Screen"
+    Identifier	"Screen0"
+    Device	"FBDev"
+    Monitor	"Monitor0"
+    DefaultDepth 16
+
+    SubSection "Display"
+        Depth		8
+        Modes		"1024x768" "800x600" "640x480"
+    EndSubsection
+
+    SubSection "Display"
+        Depth		16
+        Modes		"1024x768" "800x600" "640x480"
+    EndSubsection
+
+    SubSection "Display"
+        Depth		24
+	FbBpp		32
+        Modes		"1024x768" "800x600" "640x480"
+    EndSubsection
+
+EndSection
+
+Section "DRI"
+	Group        0
+	Mode         0666
+EndSection
+
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
index 1abac8443f..562266ff39 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
-PR = "r8"
+PR = "r9"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \