From f36893c64eb7873f5865ecf485a4fadac8f0bbe9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 29 Oct 2008 19:03:15 +0100 Subject: xserver xorg 1.4.2: try harder to get xcalibrate enabled --- packages/xorg-xserver/xserver-xorg_1.4.2.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/xorg-xserver/xserver-xorg_1.4.2.bb') diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb index 3f53002a34..1abac8443f 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb @@ -3,14 +3,14 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" PE = "1" -PR = "r7" +PR = "r8" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ - file://sysroot_fix.patch;patch=1" + file://sysroot_fix.patch;patch=1 \ + file://xcalibrate-xorg.diff \ +" MESA_VER = "7.0.2" -EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no " - export LDFLAGS += " -ldl " -- cgit 1.2.3-korg From 113ebef499d1288fc54df39d9196088c78f08aa5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 31 Oct 2008 16:24:41 +0100 Subject: xserver xorg: have beagleboard use xf86-video-omapfb to gain XV support --- .../xserver-xorg/beagleboard/xorg.conf | 135 +++++++++++++++++++++ packages/xorg-xserver/xserver-xorg_1.4.2.bb | 2 +- 2 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-xserver/xserver-xorg/beagleboard/xorg.conf (limited to 'packages/xorg-xserver/xserver-xorg_1.4.2.bb') 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 \ -- cgit 1.2.3-korg From e2f7722a89a2fa001e3fc04322f3d37ed045a79b Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 12 Nov 2008 10:35:58 +0000 Subject: xserver-xorg_*.bb : bump PR for apm change --- packages/xorg-xserver/xserver-xorg_1.2.0.bb | 2 +- packages/xorg-xserver/xserver-xorg_1.3.0.0.bb | 2 +- packages/xorg-xserver/xserver-xorg_1.4.2.bb | 2 +- packages/xorg-xserver/xserver-xorg_1.4.bb | 2 +- packages/xorg-xserver/xserver-xorg_1.5.1.bb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/xorg-xserver/xserver-xorg_1.4.2.bb') diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb index a57eddfc31..61f73b3454 100644 --- a/packages/xorg-xserver/xserver-xorg_1.2.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb @@ -2,7 +2,7 @@ MESA_VER = "6.5.2" require xorg-xserver-common.inc PE = "1" -PR = "r3" +PR = "r4" export LDFLAGS += " -ldl " diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb index 40f8480375..9d6dca4489 100644 --- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -2,7 +2,7 @@ MESA_VER = "6.5.2" require xorg-xserver-common.inc PE = "1" -PR = "r7" +PR = "r8" SRC_URI += "file://drmfix.patch;patch=1 \ file://glyphstr.patch;patch=1" diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb index 562266ff39..852e847265 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 = "r9" +PR = "r10" 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 fe3703da61..ba64d72d35 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 = "r7" +PR = "r8" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ diff --git a/packages/xorg-xserver/xserver-xorg_1.5.1.bb b/packages/xorg-xserver/xserver-xorg_1.5.1.bb index e0d64017f7..92ef22fd63 100644 --- a/packages/xorg-xserver/xserver-xorg_1.5.1.bb +++ b/packages/xorg-xserver/xserver-xorg_1.5.1.bb @@ -3,7 +3,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl" PE = "1" -PR = "r0" +PR = "r1" SRC_URI += "file://drmfix.patch;patch=1 \ file://sysroot_fix.patch;patch=1" -- cgit 1.2.3-korg