mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 00:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes for the xorg.conf for xserver-xf86-dri-lite

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5219 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Robert Bragg
2008-09-22 17:19:02 +00:00
parent 500a9242c9
commit 4353685020
7 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
View File

@@ -9,7 +9,7 @@ DEPENDS += "libxkbfile libxcalibrate"
RDEPENDS_${PN} = "xserver-kdrive" RDEPENDS_${PN} = "xserver-kdrive"
PROVIDES = "virtual/xserver" PROVIDES = "virtual/xserver"
PE = "1" PE = "1"
PR = "r6" PR = "r7"
PV = "1.3.0.0+git${SRCREV}" PV = "1.3.0.0+git${SRCREV}"
SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git \ SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git \

2
meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
View File

@@ -3,7 +3,7 @@ require xserver-kdrive.inc
DEPENDS += "libxkbfile libxcalibrate" DEPENDS += "libxkbfile libxcalibrate"
PE = "1" PE = "1"
PR = "r18" PR = "r19"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
file://extra-kmodes.patch;patch=1 \ file://extra-kmodes.patch;patch=1 \

2
meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
View File

@@ -5,7 +5,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
DEFAULT_PREFERENCE = "-99" DEFAULT_PREFERENCE = "-99"
PE = "1" PE = "1"
PR = "r3" PR = "r4"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
file://extra-kmodes.patch;patch=1 \ file://extra-kmodes.patch;patch=1 \

5
meta/packages/xorg-xserver/xserver-xf86-common.inc
View File

@@ -21,7 +21,7 @@ inherit autotools pkgconfig
PACKAGES =+ "${PN}-utils" PACKAGES =+ "${PN}-utils"
FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
FILES_${PN} = "${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so /etc/X11 " FILES_${PN} = "${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so ${libdir}/xorg/modules/*/*/*.so /etc/X11 "
FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled"
FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
@@ -46,8 +46,7 @@ do_stage() {
do_install_append () { do_install_append () {
install -d ${D}/${sysconfdir}/X11 install -d ${D}/${sysconfdir}/X11
# install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts
} }

103
meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf
View File

@@ -3,71 +3,88 @@ Section "Files"
EndSection EndSection
Section "InputDevice" Section "InputDevice"
Identifier "Synaptics Touchpad" Identifier "Generic Keyboard"
Driver "synaptics" Driver "kbd"
Option "SendCoreEvents" "true" Option "CoreKeyboard"
Option "Device" "/dev/psaux" Option "XkbRules" "xorg"
Option "Protocol" "auto-dev" Option "XkbModel" "pc105"
Option "HorizEdgeScroll" "0" Option "XkbLayout" "us"
EndSection EndSection
Section "InputDevice" Section "InputDevice"
Driver "wacom" Identifier "Configured Mouse"
Identifier "stylus" Driver "mouse"
Option "Device" "/dev/input/wacom" Option "CorePointer"
Option "Type" "stylus" Option "Device" "/dev/input/mice"
Option "ForceDevice" "ISDV4" # Tablet PC ONLY Option "Protocol" "ImPS/2"
Option "ZAxisMapping" "4 5"
Option "Emulate3Buttons" "true"
EndSection EndSection
Section "InputDevice" Section "InputDevice"
Driver "wacom" Identifier "Synaptics Touchpad"
Identifier "eraser" Driver "synaptics"
Option "Device" "/dev/input/wacom" Option "SendCoreEvents" "true"
Option "Type" "eraser" Option "Device" "/dev/psaux"
Option "ForceDevice" "ISDV4" # Tablet PC ONLY Option "Protocol" "auto-dev"
Option "HorizEdgeScroll" "0"
EndSection EndSection
Section "InputDevice" Section "InputDevice"
Driver "wacom" Driver "wacom"
Identifier "cursor" Identifier "stylus"
Option "Device" "/dev/input/wacom" Option "Device" "/dev/input/wacom"
Option "Type" "cursor" Option "Type" "stylus"
Option "ForceDevice" "ISDV4" # Tablet PC ONLY Option "ForceDevice" "ISDV4" # Tablet PC ONLY
EndSection
Section "InputDevice"
Driver "wacom"
Identifier "eraser"
Option "Device" "/dev/input/wacom"
Option "Type" "eraser"
Option "ForceDevice" "ISDV4" # Tablet PC ONLY
EndSection
Section "InputDevice"
Driver "wacom"
Identifier "cursor"
Option "Device" "/dev/input/wacom"
Option "Type" "cursor"
Option "ForceDevice" "ISDV4" # Tablet PC ONLY
EndSection EndSection
Section "Device" Section "Device"
Identifier "Intel Corporation Mobile GM965/GL960 Integrated Graphics Controller" Identifier "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller"
Driver "intel" Driver "intel"
BusID "PCI:0:2:0" BusID "PCI:0:2:0"
Option "AccelMethod" "EXA"
EndSection EndSection
Section "Monitor" Section "Monitor"
Identifier "Generic Monitor" Identifier "Generic Monitor"
Option "DPMS" Option "DPMS"
EndSection EndSection
Section "Screen" Section "Screen"
Identifier "Default Screen" Identifier "Default Screen"
Device "Intel Corporation Mobile GM965/GL960 Integrated Graphics Controller" Device "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller"
Monitor "Generic Monitor" Monitor "Generic Monitor"
DefaultDepth 24 DefaultDepth 24
SubSectionSub "Display" SubSectionSub "Display"
Modes "1024x768" "720x400" "640x480" Modes "800x480"
Virtual 3000 2048 EndSubSection
EndSubSection
EndSection EndSection
Section "ServerLayout" Section "ServerLayout"
Identifier "Default Layout" Identifier "Default Layout"
Screen "Default Screen" Screen "Default Screen"
InputDevice "Generic Keyboard" InputDevice "Generic Keyboard"
InputDevice "Configured Mouse" InputDevice "Configured Mouse"
# Uncomment if you have a wacom tablet # Uncomment if you have a wacom tablet
# InputDevice "stylus" "SendCoreEvents" # InputDevice "stylus" "SendCoreEvents"
# InputDevice "cursor" "SendCoreEvents" # InputDevice "cursor" "SendCoreEvents"
# InputDevice "eraser" "SendCoreEvents" # InputDevice "eraser" "SendCoreEvents"
InputDevice "Synaptics Touchpad" InputDevice "Synaptics Touchpad"
EndSection EndSection

2
meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
View File

@@ -1,7 +1,7 @@
require xserver-xf86-dri-lite.inc require xserver-xf86-dri-lite.inc
PE = "1" PE = "1"
PR = "r1" PR = "r3"
SRC_URI += "file://drmfix.patch;patch=1" SRC_URI += "file://drmfix.patch;patch=1"

2
meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
View File

@@ -1,7 +1,7 @@
require xserver-xf86-dri-lite.inc require xserver-xf86-dri-lite.inc
PE = "1" PE = "1"
PR = "r1" PR = "r2"
PV = "1.5.0+git${SRCREV}" PV = "1.5.0+git${SRCREV}"
DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE = "-1"