diff options
Diffstat (limited to 'meta-oe/recipes-graphics/xorg-xserver')
49 files changed, 1919 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc b/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc new file mode 100644 index 0000000000..79f13fc135 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc @@ -0,0 +1,112 @@ +HOMEPAGE = "http://www.x.org" +SECTION = "x11/base" +LICENSE = "MIT-X" +LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353" + +INC_PR = "r18" + +PROVIDES = "virtual/xserver" + +# Config manager for xserver, options are: hal, udev, empty (for configuration in xorg.conf) +DISTRO_XORG_CONFIG_MANAGER ?= "hal" +DISTRO_XORG_CONFIG_MANAGER_shr ?= "udev" + +# default none, enabled by DISTRO_XORG_CONFIG_MANAGER setting +CONFIG_MANAGER_OPTION += "${@['--disable-config-hal','--enable-config-hal',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['hal']]}" +CONFIG_MANAGER_OPTION += "${@['--disable-config-udev','--enable-config-udev',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['udev']]}" + +DEPENDS = "fontconfig freetype flex-native liblbxutil kbproto \ +xf86driproto drm glproto randrproto renderproto fixesproto damageproto \ +xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \ +scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \ +xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \ +resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \ +libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \ +libxkbui libxxf86misc libxi libdmx libxtst libxres virtual/libgl libxcalibrate \ +libxv ${DISTRO_XORG_CONFIG_MANAGER}" + +RRECOMMENDS_${PN} = "libpciaccess" + +XORG_PN = "xorg-server" +SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" + +S = "${WORKDIR}/${XORG_PN}-${PV}" + +inherit autotools pkgconfig glx-use-tls + +EXTRA_OECONF += " --enable-xcalibrate \ + --enable-kdrive \ + --enable-xephyr \ + --disable-xfbdev \ + --disable-xnest \ + --disable-kdrive-vesa \ + --with-default-font-path="/usr/share/fonts/X11/misc" \ + ac_cv_file__usr_share_sgml_X11_defs_ent=no" + +# CONFIG_MANAGER_OPTION is used only in recipes which support those options + +EXTRA_OECONF_append_arm = " ac_cv_header_linux_apm_bios_h=no " + +PACKAGES =+ "xserver-security-policy" +FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy" +RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config rgb xserver-xorg-conf" + +PACKAGES =+ "${PN}-sdl ${PN}-fbdev ${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr" + +RDEPENDS_${PN}-xvfb += "xkeyboard-config" + +FILES_${PN}-fbdev = "${bindir}/Xfbdev" +FILES_${PN}-sdl = "${bindir}/Xsdl" +FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print" +FILES_${PN}-xvfb = "${bindir}/Xvfb" +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} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules ${libdir}/xorg/modules /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d" +FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" +FILES_${PN}-xephyr = "${bindir}/Xephyr" + +FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ + ${libdir}/xorg/modules/*/.debug \ + ${libdir}/xorg/modules/*/*/.debug \ + " + +# Split out some modules and extensions from the main package +# These aren't needed for basic operations and only take up space: +# 32.0k libdri.so +# 336.0k libglx.so +# 1360k libint10.so +# 180.0k libwfb.so +# 320.0k libxaa.so +# 124.0k libxf1bpp.so +# 84.0k libxf4bpp.so + +PACKAGES =+ "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-glx \ + ${PN}-module-libint10 \ + ${PN}-module-libafb \ + ${PN}-module-libwfb \ + ${PN}-module-libmfb \ + ${PN}-module-libcfb \ + ${PN}-module-xaa \ + ${PN}-module-libxf1bpp \ + ${PN}-module-libxf4bpp" + +FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" +FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" +FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" +FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" +FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" +FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" +FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so" +FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so" +FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so" +FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" +FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so" + +PACKAGES =+ "${PN}-multimedia-modules" + +FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" + +do_install_append () { + ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts +} diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.901/hack-assume-pixman-supports-overlapped-blt.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.901/hack-assume-pixman-supports-overlapped-blt.patch new file mode 100644 index 0000000000..a947582f15 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.901/hack-assume-pixman-supports-overlapped-blt.patch @@ -0,0 +1,14 @@ +diff --git a/fb/fbcopy.c b/fb/fbcopy.c +index 07eb663..ba394b7 100644 +--- a/fb/fbcopy.c ++++ b/fb/fbcopy.c +@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable, + while (nbox--) + { + #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */ +- if (pm == FB_ALLONES && alu == GXcopy && !reverse && +- !upsidedown) ++ if (pm == FB_ALLONES && alu == GXcopy) + { + if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp, + (pbox->x1 + dx + srcXoff), diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.901/hack-fbdev-ignore-return-mode.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.901/hack-fbdev-ignore-return-mode.patch new file mode 100644 index 0000000000..d3661cbea2 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.901/hack-fbdev-ignore-return-mode.patch @@ -0,0 +1,39 @@ +Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1 +(and probably other) while returning from chvt or resume on some +hardware (e. g. zaurus). + +Correct fix would require debugging of fbdev mode during LeaveVT and +EnterVT. + +This patch may cause staying in incorrect or corrupted display mode +after EnterVT, but on man affected devices it does not cause any visible +problems. + +Hacked code is never called on properly written drivers. + +Devices affected and testers involved for future patch removal: +Sharp Zaurus (spitz/akita): Stanislav Brabec <utx@penguin.cz> + +See also: +https://bugzilla.redhat.com/show_bug.cgi?id=238451 + +The bug (first line indicates that your device is affected): + +(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode + +Fatal server error: +EnterVT failed for screen 0 + +Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c +=================================================================== +--- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c ++++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c +@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa + #if DEBUG + print_fbdev_mode("returned", &set_var); + #endif +- return FALSE; ++ /* return FALSE; UGLY HACK to allow return from chvt */ + } + + if (!check) diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/dolt-fix.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/dolt-fix.patch new file mode 100644 index 0000000000..e332ce0bbe --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/dolt-fix.patch @@ -0,0 +1,22 @@ +Index: xorg-server/m4/dolt.m4 +=================================================================== +--- xorg-server.orig/m4/dolt.m4 2009-04-14 21:14:56.000000000 +0400 ++++ xorg-server/m4/dolt.m4 2009-07-15 12:38:33.796848843 +0400 +@@ -147,7 +147,7 @@ + cat <<__DOLTLIBTOOL__EOF__ > doltlibtool + #!$DOLT_BASH + __DOLTLIBTOOL__EOF__ +- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool ++ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool + top_builddir_slash="${0%%doltlibtool}" + : ${top_builddir_slash:=./} + args=() +@@ -163,7 +163,7 @@ + if $modeok && $tagok ; then + . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" + else +- exec ${top_builddir_slash}libtool "$[]@" ++ exec ${top_builddir_slash}@host_alias@-libtool "$[]@" + fi + __DOLTLIBTOOL__EOF__ + diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-assume-pixman-supports-overlapped-blt.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-assume-pixman-supports-overlapped-blt.patch new file mode 100644 index 0000000000..a947582f15 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-assume-pixman-supports-overlapped-blt.patch @@ -0,0 +1,14 @@ +diff --git a/fb/fbcopy.c b/fb/fbcopy.c +index 07eb663..ba394b7 100644 +--- a/fb/fbcopy.c ++++ b/fb/fbcopy.c +@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable, + while (nbox--) + { + #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */ +- if (pm == FB_ALLONES && alu == GXcopy && !reverse && +- !upsidedown) ++ if (pm == FB_ALLONES && alu == GXcopy) + { + if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp, + (pbox->x1 + dx + srcXoff), diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-fbdev-ignore-return-mode.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-fbdev-ignore-return-mode.patch new file mode 100644 index 0000000000..d3661cbea2 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/hack-fbdev-ignore-return-mode.patch @@ -0,0 +1,39 @@ +Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1 +(and probably other) while returning from chvt or resume on some +hardware (e. g. zaurus). + +Correct fix would require debugging of fbdev mode during LeaveVT and +EnterVT. + +This patch may cause staying in incorrect or corrupted display mode +after EnterVT, but on man affected devices it does not cause any visible +problems. + +Hacked code is never called on properly written drivers. + +Devices affected and testers involved for future patch removal: +Sharp Zaurus (spitz/akita): Stanislav Brabec <utx@penguin.cz> + +See also: +https://bugzilla.redhat.com/show_bug.cgi?id=238451 + +The bug (first line indicates that your device is affected): + +(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode + +Fatal server error: +EnterVT failed for screen 0 + +Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c +=================================================================== +--- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c ++++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c +@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa + #if DEBUG + print_fbdev_mode("returned", &set_var); + #endif +- return FALSE; ++ /* return FALSE; UGLY HACK to allow return from chvt */ + } + + if (!check) diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/randr-support.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/randr-support.patch new file mode 100644 index 0000000000..abc7db41eb --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.9.4/randr-support.patch @@ -0,0 +1,102 @@ +diff -uNr xorg-server-1.9.0.orig//hw/xfree86/common/xf86Xinput.c xorg-server-1.9.0/hw/xfree86/common/xf86Xinput.c +--- xorg-server-1.9.0.orig//hw/xfree86/common/xf86Xinput.c 2010-08-13 07:53:48.000000000 +0200 ++++ xorg-server-1.9.0/hw/xfree86/common/xf86Xinput.c 2010-08-28 21:31:10.000000000 +0200 +@@ -106,6 +106,8 @@ + + #include "os.h" + ++#define RR_Rotate_All (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270) ++ + EventListPtr xf86Events = NULL; + + /** +@@ -1359,4 +1361,73 @@ + EnableDevice(dev, TRUE); + } + ++/* Taken from evdev-properties.h. */ ++#define EVDEV_PROP_SWAP_AXES "Evdev Axes Swap" ++#define EVDEV_PROP_INVERT_AXES "Evdev Axis Inversion" ++ ++/* This is a hack until we get device -> CRTC association. */ ++void ++xf86InputRotationNotify(Rotation rotation) ++{ ++ DeviceIntPtr dev; ++ LocalDevicePtr local; ++ int ret; ++ int swap_axes = 0; ++ CARD8 invert[2] = { 0, 0 }; ++ static Atom prop_swap = 0, prop_invert = 0; ++ static int atom_generation = -1; ++ ++ if (atom_generation != serverGeneration) { ++ prop_swap = 0; ++ prop_invert = 0; ++ } ++ ++ switch (rotation & RR_Rotate_All) { ++ case RR_Rotate_0: ++ swap_axes = 1; ++ invert[0] = 0; ++ invert[1] = 0; ++ break; ++ case RR_Rotate_90: ++ swap_axes = 0; ++ invert[0] = 0; ++ invert[1] = 1; ++ break; ++ case RR_Rotate_180: ++ swap_axes = 1; ++ invert[0] = 0; ++ invert[1] = 0; ++ break; ++ case RR_Rotate_270: ++ swap_axes = 0; ++ invert[0] = 0; ++ invert[1] = 1; ++ break; ++ } ++ ++ if (!prop_swap) ++ prop_swap = MakeAtom(EVDEV_PROP_SWAP_AXES, ++ strlen(EVDEV_PROP_SWAP_AXES), TRUE); ++ if (!prop_invert) ++ prop_invert = MakeAtom(EVDEV_PROP_INVERT_AXES, ++ strlen(EVDEV_PROP_INVERT_AXES), TRUE); ++ ++ for (dev = inputInfo.devices; dev; dev = dev->next) { ++ local = dev->public.devicePrivate; ++ ret = XIChangeDeviceProperty(dev, prop_swap, XA_INTEGER, 8, ++ PropModeReplace, 1, &swap_axes, FALSE); ++ if (ret != Success) { ++ xf86Msg(X_ERROR, "Changing swap_xy property failed!\n"); ++ continue; ++ } ++ ret = XIChangeDeviceProperty(dev, prop_invert, XA_INTEGER, 8, ++ PropModeReplace, 2, invert, FALSE); ++ if (ret != Success) { ++ xf86Msg(X_ERROR, "Changing invert property failed!\n"); ++ continue; ++ } ++ } ++} ++ ++ + /* end of xf86Xinput.c */ +diff -uNr xorg-server-1.9.0.orig//hw/xfree86/modes/xf86Crtc.c xorg-server-1.9.0/hw/xfree86/modes/xf86Crtc.c +--- xorg-server-1.9.0.orig//hw/xfree86/modes/xf86Crtc.c 2010-07-20 05:24:12.000000000 +0200 ++++ xorg-server-1.9.0/hw/xfree86/modes/xf86Crtc.c 2010-08-28 21:28:48.000000000 +0200 +@@ -387,6 +387,12 @@ + if (didLock) + crtc->funcs->unlock (crtc); + ++ /* ++ * Rotate Touchscreen ++ */ ++ xf86InputRotationNotify(crtc->rotation); ++ ++ + return ret; + } + diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am3517-evm/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am3517-evm/xorg.conf new file mode 100644 index 0000000000..983bb0823a --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am3517-evm/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am37x-evm/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am37x-evm/xorg.conf new file mode 100644 index 0000000000..983bb0823a --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/am37x-evm/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5/xorg.conf new file mode 100644 index 0000000000..983bb0823a --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5it/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5it/xorg.conf new file mode 100644 index 0000000000..983bb0823a --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/archos5it/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9263ek/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9263ek/xorg.conf new file mode 100644 index 0000000000..7f3eb7797f --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9263ek/xorg.conf @@ -0,0 +1,11 @@ +Section "ServerLayout" + Identifier "default" + InputDevice "atmel-ts" "CorePointer" +EndSection + +Section "InputDevice" + Identifier "atmel-ts" + Driver "evdev" + Option "SwapAxes" "1" + Option "Device" "/dev/input/touchscreen0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9g45ek/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9g45ek/xorg.conf new file mode 100644 index 0000000000..0502f8737c --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/at91sam9g45ek/xorg.conf @@ -0,0 +1,23 @@ +Section "ServerLayout" + Identifier "default" + InputDevice "atmel-tsadcc" "CorePointer" +EndSection + +Section "InputDevice" + Identifier "atmel-tsadcc" + Driver "evdev" + Option "Device" "/dev/input/touchscreen0" +EndSection + +Section "InputDevice" + Driver "mouse" + Identifier "Mouse[1]" + Option "Buttons" "10" + Option "Device" "/dev/input/mice" +EndSection + +Section "InputDevice" + Driver "kbd" + Identifier "Keyboard[0]" + Option "Protocol" "Standard" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/babbage/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/babbage/xorg.conf new file mode 100644 index 0000000000..d4d41db42d --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/babbage/xorg.conf @@ -0,0 +1,56 @@ +# +# X11 configuration for i.MX51 Babbage EVK +# Based on pm9263 by Koan sas +# + +Section "Monitor" + Identifier "Display" +EndSection + +Section "Device" + Identifier "fbdevice" + Driver "fbdev" + Option "fbdev" "/dev/fb0" + Option "shadowfb" "true" +EndSection + +Section "Screen" + Identifier "fbscreen" + Device "fbdevice" + Monitor "Display" +EndSection + +Section "InputDevice" + Identifier "mxc_ts" + Driver "evdev" + Option "SwapAxes" "0" + Option "Device" "/dev/input/touchscreen0" +EndSection + +Section "InputDevice" + Identifier "Generic Mouse" + Driver "mouse" + Option "CorePointer" +EndSection + +Section "InputDevice" + Identifier "Keypad" + Driver "evdev" + Option "Device" "/dev/input/event0" +# Option "XkbModel" "nokiarx51" +# Option "XkbLayout" "us" +EndSection + +Section "ServerLayout" + Identifier "Layout" + Screen "fbscreen" + InputDevice "mxc_ts" "CorePointer" + InputDevice "Keypad" +# Enable mouse only if necessary, it may interfere with touchscreen behaviour +# InputDevice "Generic Mouse" +EndSection + +#Section "ServerFlags" +# Option "AutoAddDevices" "false" +#EndSection + diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf new file mode 100644 index 0000000000..983bb0823a --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug/xorg.conf new file mode 100644 index 0000000000..cf684ec177 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug/xorg.conf @@ -0,0 +1,75 @@ +# +# Initial version of X11 configuration for BugLabs BUG device. +# +# Up to 2 LCD modules are supported (as DISPLAY=0.0/0.1). +# Touchscreen on both screen works properly (req tslib 0.0.6 driver). +# +# Mouse is not supported yet because the evdev driver need a precise +# dev node and evdev dev nodes are somewhat random +# + +Section "Monitor" + Identifier "Monitor 1" +EndSection + +Section "Monitor" + Identifier "Monitor 2" +EndSection + +Section "Device" + Identifier "fbdev Device 2" + Driver "fbdev" + Option "fbdev" "/dev/fb2" + Option "shadowfb" "true" +EndSection + +Section "Device" + Identifier "fbdev Device 1" + Driver "fbdev" + Option "fbdev" "/dev/fb1" + Option "shadowfb" "true" +EndSection + +Section "Screen" + Identifier "fbdev Screen 2" + Device "fbdev Device 2" + Monitor "Monitor 2" +EndSection + +Section "Screen" + Identifier "fbdev Screen 1" + Device "fbdev Device 1" + Monitor "Monitor 1" +EndSection + +Section "ServerLayout" + Identifier "Layout" + Screen "fbdev Screen 1" + Screen "fbdev Screen 2" Below "fbdev Screen 1" + InputDevice "ts4" + InputDevice "ts5" + InputDevice "Keyboard" +EndSection + +Section "InputDevice" + Identifier "ts5" + Driver "tslib" + Option "Device" "/dev/input/bmi_lcd_ts5" + Option "ScreenNumber" "1" +EndSection + +Section "InputDevice" + Identifier "ts4" + Driver "tslib" + Option "Device" "/dev/input/bmi_lcd_ts4" + Option "ScreenNumber" "0" +EndSection + +Section "InputDevice" + Identifier "Keyboard" + Driver "kbd" +EndSection + +Section "ServerFlags" + Option "AutoAddDevices" "false" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug20/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug20/xorg.conf new file mode 100644 index 0000000000..6301d06900 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/bug20/xorg.conf @@ -0,0 +1,37 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" +# Load "type1" +# Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" + InputDevice "bmi-lcd-ts" "CorePointer" +EndSection + +Section "InputDevice" + Identifier "bmi-lcd-ts" + Driver "tslib" + Option "SwapAxes" "1" + Option "Device" "/dev/input/touchscreen0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/cm-t35/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/cm-t35/xorg.conf new file mode 100644 index 0000000000..07d849d705 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/cm-t35/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/dm37x-evm/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/dm37x-evm/xorg.conf new file mode 100644 index 0000000000..983bb0823a --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/dm37x-evm/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/eee701/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/eee701/xorg.conf new file mode 100644 index 0000000000..4ee293b797 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/eee701/xorg.conf @@ -0,0 +1,97 @@ +Section "ServerLayout" + Identifier "X.org Configured" + Screen 0 "Screen0" 0 0 + InputDevice "Touchpad" + InputDevice "Keyboard" + InputDevice "Mouse" + Option "AllowEmptyInput" "false" +EndSection + +Section "Files" + ModulePath "/usr/lib/xorg/modules" + FontPath "/usr/share/fonts/X11/misc" +EndSection + +Section "Module" + Load "dbe" + Load "extmod" +EndSection + +Section "InputDevice" + Identifier "Keyboard" + Driver "kbd" + Option "CoreKeyboard" +EndSection + +Section "InputDevice" + Identifier "Touchpad" + Driver "synaptics" + Option "TapButton1" "1" + Option "CorePointer" +EndSection + +Section "InputDevice" + Identifier "Mouse" + Driver "mouse" + Option "Protocol" "Auto" +EndSection + + +Section "Monitor" + Identifier "Monitor0" + VendorName "Monitor Vendor" + ModelName "Monitor Model" +EndSection + +Section "Device" + ### Available Driver options are:- + ### Values: <i>: integer, <f>: float, <bool>: "True"/"False", + ### <string>: "String", <freq>: "<f> Hz/kHz/MHz" + ### [arg]: arg optional + #Option "NoAccel" # [<bool>] + #Option "SWcursor" # [<bool>] + #Option "ColorKey" # <i> + #Option "CacheLines" # <i> + #Option "Dac6Bit" # [<bool>] + #Option "DRI" # [<bool>] + #Option "NoDDC" # [<bool>] + #Option "ShowCache" # [<bool>] + #Option "XvMCSurfaces" # <i> + #Option "PageFlip" # [<bool>] + Identifier "Card0" + Driver "intel" + VendorName "Unknown Vendor" + BoardName "Unknown Board" + BusID "PCI:0:2:0" +EndSection + +Section "Screen" + Identifier "Screen0" + Device "Card0" + Monitor "Monitor0" + SubSection "Display" + Viewport 0 0 + Depth 1 + EndSubSection + SubSection "Display" + Viewport 0 0 + Depth 4 + EndSubSection + SubSection "Display" + Viewport 0 0 + Depth 8 + EndSubSection + SubSection "Display" + Viewport 0 0 + Depth 15 + EndSubSection + SubSection "Display" + Viewport 0 0 + Depth 16 + EndSubSection + SubSection "Display" + Viewport 0 0 + Depth 24 + EndSubSection +EndSection + diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf new file mode 100644 index 0000000000..be3c6ec545 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf @@ -0,0 +1,69 @@ +Section "Monitor" + Identifier "Monitor0" + Mode "320x480" + DotClock 0 + HTimings 320 320 320 320 + VTimings 480 480 480 480 + Flags "-HSync" "-VSync" + EndMode +EndSection + +Section "Device" + Identifier "fbdev" + Driver "fbdev" + Option "ShadowFB" "on" + Option "Rotate" "CW" # comment for disabling rotation +EndSection + +Section "Screen" + Identifier "Framebuffer" + Device "fbdev" + Monitor "Monitor0" + DefaultFbBpp 16 + SubSection "Display" + Depth 16 + Modes "320x480" + EndSubSection +EndSection + + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Framebuffer" + InputDevice "Trackball" + InputDevice "Touchscreen" + InputDevice "Keyboard" +EndSection + +Section "InputDevice" + Identifier "Trackball" + Driver "evdev" + Option "Device" "/dev/input/event2" + Option "ScreenNumber" "0" + Option "ReportingMode" "Raw" + Option "SwapAxes" "True" # comment for disabling rotation + Option "InvertY" "True" # comment for disabling rotation +EndSection + + +Section "InputDevice" + Identifier "Touchscreen" + Driver "evdev" + Option "Device" "/dev/input/event1" + Option "SwapAxes" "True" # comment for disabling rotation + Option "InvertY" "True" # comment for disabling rotation + Option "ReportingMode" "Raw" +EndSection + +Section "InputDevice" + Identifier "Keyboard" + Driver "kbd" + Option "XkbLayout" "us" + Option "XkbModel" "htcdream" +EndSection + + +Section "ServerFlags" + Option "AutoAddDevices" "false" +EndSection + diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf new file mode 100644 index 0000000000..4153a26281 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/htcleo/xorg.conf @@ -0,0 +1,73 @@ +Section "Monitor" + Identifier "Monitor0" + Mode "480x800" + DotClock 0 + HTimings 480 480 480 480 + VTimings 800 800 800 800 + Flags "-HSync" "-VSync" + EndMode +EndSection + + + +Section "Device" + Identifier "fbdev" + Driver "fbdev" + Option "ShadowFB" "on" + #Option "Rotate" "CW" +EndSection + + +Section "Screen" + Identifier "Framebuffer" + Device "fbdev" + Monitor "Monitor" + DefaultFbBpp 16 + SubSection "Display" + Depth 16 + Modes "480x800" + EndSubSection +EndSection + +Section "Screen" + Identifier "480x800x16" + Device "fbdev" + Monitor "Monitor" + DefaultFbBpp 16 + SubSection "Display" + Depth 16 + Modes "480x800" + EndSubSection +EndSection + + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Framebuffer" + InputDevice "Touchscreen" "CorePointer" + InputDevice "Keyboard" "CoreKeyboard" +EndSection + +Section "InputDevice" + Identifier "Mouse0" + Driver "mouse" + Option "Protocol" "auto" + Option "Device" "/dev/input/mice" + Option "Emulate3Buttons" "no" + Option "ZAxisMapping" "4 5" +EndSection + + +Section "InputDevice" + Identifier "Touchscreen" + Driver "tslib" + Option "Protocol" "auto" + Option "Device" "/dev/input/event0" + Option "CorePointer" "true" +EndSection + +Section "InputDevice" + Identifier "Keyboard" + Driver "kbd" + Option "XkbLayout" "en_US" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/igep0020/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/igep0020/xorg.conf new file mode 100644 index 0000000000..07d849d705 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/igep0020/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ion/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ion/xorg.conf new file mode 100644 index 0000000000..95a15235b9 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ion/xorg.conf @@ -0,0 +1,51 @@ +# xorg.conf (X.Org X Window System server configuration file) +# +# This file was generated by dexconf, the Debian X Configuration tool, using +# values from the debconf database. +# +# Edit this file with caution, and see the xorg.conf manual page. +# (Type "man xorg.conf" at the shell prompt.) +# +# This file is automatically updated on xserver-xorg package upgrades *only* +# if it has not been modified since the last upgrade of the xserver-xorg +# package. +# +# Note that some configuration settings that could be done previously +# in this file, now are automatically configured by the server and settings +# here are ignored. +# +# If you have edited this file but would like it to be automatically updated +# again, run the following command: +# sudo dpkg-reconfigure -phigh xserver-xorg + +Section "Device" + Identifier "NVidia" + Driver "nvidia" +# Option "NoLogo" "True" +EndSection + +Section "Monitor" + Identifier "DELL 2007WFP" +# Option "DPMS" + HorizSync 30.0-83.0 + VertRefresh 56.0-76.0 + ModeLine "1680x1050" 119.0 1680 1728 1760 1840 1050 1053 1059 1080 -HSync +VSync +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "NVidia" + Monitor "DELL 2007WFP" + DefaultDepth 24 + SubSection "Display" + Depth 24 + Modes "1680x1050" + ViewPort 0 0 + EndSubSection +EndSection + +Section "Module" + Load "glx" +EndSection + + diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/iphone3g/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/iphone3g/xorg.conf new file mode 100644 index 0000000000..83ac9c1486 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/iphone3g/xorg.conf @@ -0,0 +1,29 @@ +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "fbdev" + Option "ShadowFB" "on" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" +EndSection + + +Section "InputDevice" + Identifier "touchscreen" + Driver "evdev" + Option "Device" "/dev/input/event2" + Option "ReportingMode" "Raw" + Option "SendCoreEvents" "On" + Option "GrabDevices" "True" + Option "InvertY" "0" + Option "SwapAxes" "0" +EndSection + + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" + InputDevice "touchscreen" "CorePointer" "AlwaysCore" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/mh355/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/mh355/xorg.conf new file mode 100644 index 0000000000..4c275c9dc4 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/mh355/xorg.conf @@ -0,0 +1,47 @@ +# +# X11 configuration for Microhard MH355 device +# (C)2010 Koan sas - www.KoanSoftware.com +# + +Section "Monitor" + Identifier "Display" +EndSection + +Section "Device" + Identifier "fbdevice" + Driver "fbdev" + Option "fbdev" "/dev/fb0" + Option "shadowfb" "true" +EndSection + +Section "Screen" + Identifier "fbscreen" + Device "fbdevice" + Monitor "Display" +EndSection + +Section "InputDevice" + Identifier "mh355-ts" + Driver "evdev" + Option "SwapAxes" "1" + Option "Device" "/dev/input/touchscreen0" +EndSection + +Section "InputDevice" + Identifier "Generic Mouse" + Driver "mouse" + Option "CorePointer" +EndSection + +Section "ServerLayout" + Identifier "Layout" + Screen "fbscreen" + InputDevice "mh355-ts" "CorePointer" +# Enable mouse only if necessary, it may interfere with touchscreen behaviour +# InputDevice "Generic Mouse" +EndSection + +Section "ServerFlags" + Option "AutoAddDevices" "false" +EndSection + diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia800/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia800/xorg.conf new file mode 100644 index 0000000000..983bb0823a --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia800/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf new file mode 100644 index 0000000000..d9d742ffb0 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf @@ -0,0 +1,62 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Default Monitor" +EndSection + +Section "Device" + Identifier "Default omapfb Device" + Driver "omapfb" + Option "fb" "/dev/fb0" + +EndSection + +Section "InputDevice" + Identifier "gpio-keys" + Driver "evdev" + Option "Device" "/dev/input/event0" +EndSection + +Section "InputDevice" + Identifier "twl4030_pwrbutton" + Driver "evdev" + Option "Device" "/dev/input/event3" +EndSection + + +Section "InputDevice" + Identifier "Keyboard" + Driver "evdev" + Option "Device" "/dev/input/event1" + Option "XkbModel" "nokiarx51" + Option "XkbLayout" "us" + Option "CoreKeyboard" +EndSection + +Section "InputDevice" + Identifier "Touchscreen" + Driver "evdev" + Option "Device" "/dev/input/event2" +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Default omapfb Device" +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Touchscreen" + InputDevice "Keyboard" + InputDevice "gpio-keys" + InputDevice "twl4030_pwrbutton" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf new file mode 100644 index 0000000000..edb5e0ee41 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf @@ -0,0 +1,49 @@ +Section "Monitor" + Identifier "LCD Panel" +EndSection + + +Section "Device" + Identifier "Fbdev" + Driver "fbdev" +EndSection + + +Section "Screen" + Identifier "Default Screen" + Device "Fbdev" + Monitor "LCD Panel" +EndSection + + +Section "InputDevice" + Identifier "Power Button" + Driver "evdev" + Option "Device" "/dev/input/event2" +EndSection + + +Section "InputDevice" + Identifier "AUX Button" + Driver "evdev" + Option "Device" "/dev/input/event0" +EndSection + + +Section "InputDevice" + Identifier "Touchscreen" + Driver "evdev" + Option "Device" "/dev/input/event1" +EndSection + +Section "ServerFlags" + Option "AutoAddDevices" "False" +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Power Button" + InputDevice "AUX Button" + InputDevice "Touchscreen" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf new file mode 100644 index 0000000000..de6ed1c14f --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf @@ -0,0 +1,55 @@ +Section "Module" + Load "glx" + Load "dri2" +EndSection + + +Section "Monitor" + Identifier "LCD Panel" +EndSection + + +Section "Device" + Identifier "Glamo Graphics Chip" + Driver "glamo" +EndSection + + +Section "Screen" + Identifier "Default Screen" + Device "Glamo Graphics Chip" + Monitor "LCD Panel" +EndSection + + +Section "InputDevice" + Identifier "Power Button" + Driver "evdev" + Option "Device" "/dev/input/event0" +EndSection + + +Section "InputDevice" + Identifier "AUX Button" + Driver "evdev" + Option "Device" "/dev/input/event2" +EndSection + + +Section "InputDevice" + Identifier "Touchscreen" + Driver "evdev" + Option "Device" "/dev/input/event1" +EndSection + +Section "ServerFlags" + Option "AutoAddDevices" "False" +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Power Button" + InputDevice "AUX Button" + InputDevice "Touchscreen" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-pandora/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-pandora/xorg.conf new file mode 100644 index 0000000000..446ac9777f --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-pandora/xorg.conf @@ -0,0 +1,24 @@ +Section "Module" + Load "extmod" + Load "dbe" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf new file mode 100644 index 0000000000..56425abf81 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf @@ -0,0 +1,25 @@ +Section "Module" + Load "extmod" + Load "dbe" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "fbdev" + Option "ShadowFB" "false" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3/xorg.conf new file mode 100644 index 0000000000..983bb0823a --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf new file mode 100644 index 0000000000..983bb0823a --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom/xorg.conf new file mode 100644 index 0000000000..983bb0823a --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom2/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom2/xorg.conf new file mode 100644 index 0000000000..983bb0823a --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom2/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom36x/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom36x/xorg.conf new file mode 100644 index 0000000000..983bb0823a --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/omapzoom36x/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/overo/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/overo/xorg.conf new file mode 100644 index 0000000000..983bb0823a --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/overo/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf new file mode 100644 index 0000000000..6915b87b96 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf @@ -0,0 +1,58 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" + Option "fb" "/dev/fb0" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" + InputDevice "Touchscreen" "CorePointer" +EndSection + +Section "InputDevice" + Identifier "Touchscreen" + Driver "evdev" + Option "Device" "/dev/input/event6" + Option "SendCoreEvents" "true" + Option "Protocol" "Auto" + Option "Width" "320" + Option "Height" "528" + Option "EmulateRightButton" "1" + Option "CorePointer" "true" +EndSection + +Section "InputDevice" + Identifier "Keyboard" + Driver "palm-pre" + Option "Device" "/dev/input/event2" + Option "SendCoreEvents" "true" + #Option "XkbModel" "palm-pre" + Option "XkbLayout" "palm-pre" +# Option "XKbOptions" "" +EndSection + +#Section "InputDevice" +# Identifier "Keyboard" +# Driver "evdev" +# Option "Device" "/dev/input/event2" +#EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf new file mode 100644 index 0000000000..d4651ad877 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf @@ -0,0 +1,47 @@ +# +# X11 configuration for Ronetix PM9263 device. +# (C)2009-2010 Koan sas - www.KoanSoftware.com +# + +Section "Monitor" + Identifier "Display" +EndSection + +Section "Device" + Identifier "fbdevice" + Driver "fbdev" + Option "fbdev" "/dev/fb0" + Option "shadowfb" "true" +EndSection + +Section "Screen" + Identifier "fbscreen" + Device "fbdevice" + Monitor "Display" +EndSection + +Section "InputDevice" + Identifier "atmel-ts" + Driver "evdev" + Option "SwapAxes" "1" + Option "Device" "/dev/input/touchscreen0" +EndSection + +Section "InputDevice" + Identifier "Generic Mouse" + Driver "mouse" + Option "CorePointer" +EndSection + +Section "ServerLayout" + Identifier "Layout" + Screen "fbscreen" + InputDevice "atmel-ts" "CorePointer" +# Enable mouse only if necessary, it may interfere with touchscreen behaviour +# InputDevice "Generic Mouse" +EndSection + +Section "ServerFlags" + Option "AutoAddDevices" "false" +EndSection + diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/spitz/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/spitz/xorg.conf new file mode 100644 index 0000000000..224df5c8b0 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/spitz/xorg.conf @@ -0,0 +1,49 @@ +Section "Device" + Identifier "Generic Video Card" + Driver "fbdev" + Option "UseFBDev" "true" + Option "Rotate" "CW" +EndSection + +Section "Monitor" + Identifier "Generic Monitor" + Option "DPMS" + HorizSync 28-32 + VertRefresh 43-60 +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Generic Video Card" + Monitor "Generic Monitor" + DefaultDepth 16 + SubSection "Display" + Depth 1 + Modes "640x480" + EndSubSection + SubSection "Display" + Depth 4 + Modes "640x480" + EndSubSection + SubSection "Display" + Depth 8 + Modes "640x480" + EndSubSection + SubSection "Display" + Depth 15 + Modes "640x480" + EndSubSection + SubSection "Display" + Depth 16 + Modes "640x480" + EndSubSection + SubSection "Display" + Depth 24 + Modes "640x480" + EndSubSection +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/vortex86sx/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/vortex86sx/xorg.conf new file mode 100644 index 0000000000..0f03faf33d --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/vortex86sx/xorg.conf @@ -0,0 +1,13 @@ +Section "Device" + Identifier "Card0" + Driver "vesa" +EndSection + +# SIS driver is proper one for this device but fails with misc errors. +#Section "Device" +# Identifier "Card0" +# Driver "sis" +# +# Disable MMX/SSE tests +# Option "BenchmarkMemCpy" "off" +#EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-ml507/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-ml507/xorg.conf new file mode 100644 index 0000000000..2950193ce3 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-ml507/xorg.conf @@ -0,0 +1,39 @@ +Section "Monitor" + Identifier "LCD Panel" +EndSection + +Section "Device" + Identifier "Xilinx frame buffer" + Driver "fbdev" +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Xilinx frame buffer" + Monitor "LCD Panel" + SubSection "Display" + Depth 24 + Modes "640x480" + EndSubSection +EndSection + +Section "InputDevice" + Identifier "Keyboard" + Driver "kbd" +# Option "XkbLayout" "es" +# Option "XkbModel" "pc105" +EndSection + +Section "InputDevice" + Identifier "Mouse" + Driver "mouse" + Option "protocol" "auto" + Option "device" "/dev/input/mice" +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Keyboard" + InputDevice "Mouse" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-virtex5/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-virtex5/xorg.conf new file mode 100644 index 0000000000..61f0f9fcdd --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xilinx-virtex5/xorg.conf @@ -0,0 +1,38 @@ +# Xorg conf file for Xilinx platforms +Section "Monitor" + Identifier "LCD Panel" +EndSection + +Section "Device" + Identifier "Xilinx frame buffer" + Driver "fbdev" +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Xilinx frame buffer" + Monitor "LCD Panel" + SubSection "Display" + Depth 24 + Modes "640x480" + EndSubSection +EndSection + +Section "InputDevice" + Identifier "Keyboard" + Driver "kbd" +EndSection + +Section "InputDevice" + Identifier "Mouse" + Driver "mouse" + Option "protocol" "auto" + Option "device" "/dev/input/mice" +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen 0 "Default Screen" 0 0 + InputDevice "Keyboard" + InputDevice "Mouse" +EndSection diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xorg.conf b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xorg.conf new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf/xorg.conf diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf_0.1.bb b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf_0.1.bb new file mode 100644 index 0000000000..ae4493d41d --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf_0.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Machine specific xorg.conf files" +PR = "r43" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${TOPDIR}/meta-shr/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI = "file://xorg.conf" + +do_install() { + install -d ${D}/${sysconfdir}/X11 + install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ +} + +# Set some dependencies to make the confs actually work +RDEPENDS_omap3 = "xf86-video-omapfb" + +CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf" +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.0.901.bb b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.0.901.bb new file mode 100644 index 0000000000..c1d956648a --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.0.901.bb @@ -0,0 +1,29 @@ +# Assign it here, since the hal->udev transition happens post 1.7 in angstrom +DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev" + +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native" +PE = "2" +PR = "${INC_PR}.0" + +SRC_URI += " \ + file://hack-fbdev-ignore-return-mode.patch \ + file://hack-assume-pixman-supports-overlapped-blt.patch \ + " +SRC_URI[md5sum] = "d750cf5f6342b548b7ac2be56e9d1841" +SRC_URI[sha256sum] = "de18f52c35fc3d3f18c7e905296f9de5ac42dc71e4e01da9ae8e154a78c7771c" + +do_install_prepend() { + mkdir -p ${D}/${libdir}/X11/fonts +} + +# The NVidia driver requires Xinerama support in the X server. Ion uses it. +PACKAGE_ARCH_ion = "${MACHINE_ARCH}" +XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" + +EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs" + +export LDFLAGS += " -ldl " diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.9.4.bb b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.9.4.bb new file mode 100644 index 0000000000..086ac176f3 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.9.4.bb @@ -0,0 +1,31 @@ +# Assign it here, since the hal->udev transition happens post 1.7 in angstrom +DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev" + +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native" +PE = "2" +PR = "${INC_PR}.0" + +SRC_URI += " \ + file://dolt-fix.patch \ + file://randr-support.patch \ + file://hack-fbdev-ignore-return-mode.patch \ + file://hack-assume-pixman-supports-overlapped-blt.patch \ + " +SRC_URI[md5sum] = "040f091dfdfb4e335116eb0032cc690b" +SRC_URI[sha256sum] = "ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458" + +do_install_prepend() { + mkdir -p ${D}/${libdir}/X11/fonts +} + +# The NVidia driver requires Xinerama support in the X server. Ion uses it. +PACKAGE_ARCH_ion = "${MACHINE_ARCH}" +XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" + +EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs" + +export LDFLAGS += " -ldl " diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_git.bb b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_git.bb new file mode 100644 index 0000000000..be441a35af --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_git.bb @@ -0,0 +1,38 @@ +# Assign it here, since the hal->udev transition happens post 1.7 in angstrom +DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev" + +require xorg-xserver-common.inc + +LICENSE = "MIT-X" +LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00" + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native" +PV = "1.10.0.901" +PR = "${INC_PR}.0" +PR_append = "+gitr${SRCPV}" +PE = "2" + +#DEFAULT_PREFERENCE = "-1" + +SRCREV = "1f51fe4f748b2997e466863d8387bd6791b32931" +SRC_URI = " \ + git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=server-1.10-branch \ + file://hack-fbdev-ignore-return-mode.patch \ + file://hack-assume-pixman-supports-overlapped-blt.patch \ +" + +S = "${WORKDIR}/git" + +do_install_prepend() { + mkdir -p ${D}/${libdir}/X11/fonts +} + +# The NVidia driver requires Xinerama support in the X server. Ion uses it. +PACKAGE_ARCH_ion = "${MACHINE_ARCH}" +XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" + +EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs" + +export LDFLAGS += " -ldl " |