From ea26c2105d6fb5c9807efe9e558685fc89c30c3e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 31 May 2009 22:17:58 +0100 Subject: xserver-xf86: Split xorg.conf from main xserver package Signed-off-by: Richard Purdie --- meta/packages/xorg-xserver/xserver-xf86-common.inc | 9 +-- .../xserver-xf86-config/qemux86/xorg.conf | 78 +++++++++++++++++++ .../xorg-xserver/xserver-xf86-config/xorg.conf | 87 ++++++++++++++++++++++ .../xorg-xserver/xserver-xf86-config_0.1.bb | 16 ++++ .../xorg-xserver/xserver-xf86-dri-lite/xorg.conf | 87 ---------------------- .../xorg-xserver/xserver-xf86-dri-lite_1.6.0.bb | 2 +- .../xorg-xserver/xserver-xf86-dri-lite_git.bb | 2 +- .../xorg-xserver/xserver-xf86-lite/xorg.conf | 87 ---------------------- 8 files changed, 186 insertions(+), 182 deletions(-) create mode 100644 meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf create mode 100644 meta/packages/xorg-xserver/xserver-xf86-config/xorg.conf create mode 100644 meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb delete mode 100644 meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf delete mode 100644 meta/packages/xorg-xserver/xserver-xf86-lite/xorg.conf (limited to 'meta') diff --git a/meta/packages/xorg-xserver/xserver-xf86-common.inc b/meta/packages/xorg-xserver/xserver-xf86-common.inc index 5a10ecf99..f69efc8d6 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-common.inc +++ b/meta/packages/xorg-xserver/xserver-xf86-common.inc @@ -11,8 +11,7 @@ PROVIDES = "virtual/xserver-xf86" PROVIDES += "virtual/xserver" XORG_PN = "xorg-server" -SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \ - file://xorg.conf" +SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" @@ -20,6 +19,8 @@ inherit autotools_stage pkgconfig PACKAGES =+ "${PN}-utils" +RDEPENDS_${PN} += "xserver-xf86-config" + 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 ${libdir}/xorg/modules/*/*.so ${libdir}/xorg/modules/*/*/*.so /etc/X11 " FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" @@ -29,13 +30,9 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ ${libdir}/xorg/modules/*/*/.debug \ " -CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf" - SRC_URI += "file://macro_tweak.patch;patch=1" do_install_append () { - install -d ${D}/${sysconfdir}/X11 - install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts } diff --git a/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf new file mode 100644 index 000000000..da7f37ceb --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf @@ -0,0 +1,78 @@ + +Section "Files" +EndSection + +Section "InputDevice" + Identifier "Generic Keyboard" + Driver "kbd" + Option "CoreKeyboard" + Option "XkbRules" "xorg" + Option "XkbModel" "pc105" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Configured Mouse" + Driver "mouse" + Option "CorePointer" + Option "Device" "/dev/input/mice" + Option "Protocol" "ImPS/2" + Option "ZAxisMapping" "4 5" + Option "Emulate3Buttons" "true" +EndSection + +Section "InputDevice" + Identifier "Synaptics Touchpad" + Driver "synaptics" + Option "SendCoreEvents" "true" + Option "Device" "/dev/psaux" + Option "Protocol" "auto-dev" + Option "HorizEdgeScroll" "0" +EndSection + +Section "InputDevice" + Driver "wacom" + Identifier "stylus" + Option "Device" "/dev/input/wacom" + Option "Type" "stylus" +EndSection + + +Section "InputDevice" + Driver "wacom" + Identifier "cursor" + Option "Device" "/dev/input/wacom" + Option "Type" "cursor" + Option "ForceDevice" "ISDV4" # Tablet PC ONLY +EndSection + +Section "Device" + Identifier "Graphics Controller" + Driver "vmware" +EndSection + +Section "Monitor" + Identifier "Generic Monitor" + Option "DPMS" +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Graphics Controller" + Monitor "Generic Monitor" + DefaultDepth 24 +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Generic Keyboard" + InputDevice "Configured Mouse" + +# Uncomment if you have a wacom tablet + InputDevice "stylus" "SendCoreEvents" +# InputDevice "cursor" "SendCoreEvents" +# InputDevice "eraser" "SendCoreEvents" + InputDevice "Synaptics Touchpad" +EndSection + diff --git a/meta/packages/xorg-xserver/xserver-xf86-config/xorg.conf b/meta/packages/xorg-xserver/xserver-xf86-config/xorg.conf new file mode 100644 index 000000000..44a530e0f --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-xf86-config/xorg.conf @@ -0,0 +1,87 @@ + +Section "Files" +EndSection + +Section "InputDevice" + Identifier "Generic Keyboard" + Driver "kbd" + Option "CoreKeyboard" + Option "XkbRules" "xorg" + Option "XkbModel" "pc105" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Configured Mouse" + Driver "mouse" + Option "CorePointer" + Option "Device" "/dev/input/mice" + Option "Protocol" "ImPS/2" + Option "ZAxisMapping" "4 5" + Option "Emulate3Buttons" "true" +EndSection + +Section "InputDevice" + Identifier "Synaptics Touchpad" + Driver "synaptics" + Option "SendCoreEvents" "true" + Option "Device" "/dev/psaux" + Option "Protocol" "auto-dev" + Option "HorizEdgeScroll" "0" +EndSection + +Section "InputDevice" + Driver "wacom" + Identifier "stylus" + Option "Device" "/dev/input/wacom" + Option "Type" "stylus" + 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 + +Section "Device" + Identifier "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller" + Driver "intel" + BusID "PCI:0:2:0" +EndSection + +Section "Monitor" + Identifier "Generic Monitor" + Option "DPMS" +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller" + Monitor "Generic Monitor" + DefaultDepth 24 +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Generic Keyboard" + InputDevice "Configured Mouse" + +# Uncomment if you have a wacom tablet +# InputDevice "stylus" "SendCoreEvents" +# InputDevice "cursor" "SendCoreEvents" +# InputDevice "eraser" "SendCoreEvents" + InputDevice "Synaptics Touchpad" +EndSection + diff --git a/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb new file mode 100644 index 000000000..db2f19912 --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "X.Org X server configuration file" +HOMEPAGE = "http://www.x.org" +SECTION = "x11/base" +LICENSE = "MIT-X" + +SRC_URI = "file://xorg.conf" + +CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_install () { + install -d ${D}/${sysconfdir}/X11 + install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ +} + diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf deleted file mode 100644 index 44a530e0f..000000000 --- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf +++ /dev/null @@ -1,87 +0,0 @@ - -Section "Files" -EndSection - -Section "InputDevice" - Identifier "Generic Keyboard" - Driver "kbd" - Option "CoreKeyboard" - Option "XkbRules" "xorg" - Option "XkbModel" "pc105" - Option "XkbLayout" "us" -EndSection - -Section "InputDevice" - Identifier "Configured Mouse" - Driver "mouse" - Option "CorePointer" - Option "Device" "/dev/input/mice" - Option "Protocol" "ImPS/2" - Option "ZAxisMapping" "4 5" - Option "Emulate3Buttons" "true" -EndSection - -Section "InputDevice" - Identifier "Synaptics Touchpad" - Driver "synaptics" - Option "SendCoreEvents" "true" - Option "Device" "/dev/psaux" - Option "Protocol" "auto-dev" - Option "HorizEdgeScroll" "0" -EndSection - -Section "InputDevice" - Driver "wacom" - Identifier "stylus" - Option "Device" "/dev/input/wacom" - Option "Type" "stylus" - 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 - -Section "Device" - Identifier "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller" - Driver "intel" - BusID "PCI:0:2:0" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 24 -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - InputDevice "Generic Keyboard" - InputDevice "Configured Mouse" - -# Uncomment if you have a wacom tablet -# InputDevice "stylus" "SendCoreEvents" -# InputDevice "cursor" "SendCoreEvents" -# InputDevice "eraser" "SendCoreEvents" - InputDevice "Synaptics Touchpad" -EndSection - diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.6.0.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.6.0.bb index cb2372007..75f990ec4 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.6.0.bb +++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.6.0.bb @@ -1,7 +1,7 @@ require xserver-xf86-dri-lite.inc PE = "1" -PR = "r0" +PR = "r1" PROTO_DEPS += "xf86driproto dri2proto" diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb index 5e08bd5db..73ccdd452 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb +++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb @@ -1,7 +1,7 @@ require xserver-xf86-dri-lite.inc PE = "1" -PR = "r4" +PR = "r5" PV = "1.5.99.1+git${SRCREV}" PROTO_DEPS += "xf86driproto dri2proto" diff --git a/meta/packages/xorg-xserver/xserver-xf86-lite/xorg.conf b/meta/packages/xorg-xserver/xserver-xf86-lite/xorg.conf deleted file mode 100644 index 44a530e0f..000000000 --- a/meta/packages/xorg-xserver/xserver-xf86-lite/xorg.conf +++ /dev/null @@ -1,87 +0,0 @@ - -Section "Files" -EndSection - -Section "InputDevice" - Identifier "Generic Keyboard" - Driver "kbd" - Option "CoreKeyboard" - Option "XkbRules" "xorg" - Option "XkbModel" "pc105" - Option "XkbLayout" "us" -EndSection - -Section "InputDevice" - Identifier "Configured Mouse" - Driver "mouse" - Option "CorePointer" - Option "Device" "/dev/input/mice" - Option "Protocol" "ImPS/2" - Option "ZAxisMapping" "4 5" - Option "Emulate3Buttons" "true" -EndSection - -Section "InputDevice" - Identifier "Synaptics Touchpad" - Driver "synaptics" - Option "SendCoreEvents" "true" - Option "Device" "/dev/psaux" - Option "Protocol" "auto-dev" - Option "HorizEdgeScroll" "0" -EndSection - -Section "InputDevice" - Driver "wacom" - Identifier "stylus" - Option "Device" "/dev/input/wacom" - Option "Type" "stylus" - 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 - -Section "Device" - Identifier "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller" - Driver "intel" - BusID "PCI:0:2:0" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 24 -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - InputDevice "Generic Keyboard" - InputDevice "Configured Mouse" - -# Uncomment if you have a wacom tablet -# InputDevice "stylus" "SendCoreEvents" -# InputDevice "cursor" "SendCoreEvents" -# InputDevice "eraser" "SendCoreEvents" - InputDevice "Synaptics Touchpad" -EndSection - -- cgit v1.2.3