mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-14 08:26:57 +02:00
chore(x11-*): remove all x11 packages
we don't need x11 anymore after remove crosh. Dump all of these ebuilds.
This commit is contained in:
Brandon Philips
parent
965578faf3
commit
6a8f10845d
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile install postinst postrm preinst unpack
|
||||
DEPEND=>=x11-libs/libdrm-2.4.6 >=x11-libs/libpciaccess-0.10 x11-libs/cairo || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
|
||||
DESCRIPTION=intel gpu userland tools
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
IUSE=debug
|
||||
KEYWORDS=amd64 x86
|
||||
LICENSE=MIT
|
||||
RDEPEND=>=x11-libs/libdrm-2.4.6 >=x11-libs/libpciaccess-0.10 x11-libs/cairo !<=x11-base/xorg-x11-6.9
|
||||
RESTRICT=test
|
||||
SLOT=0
|
||||
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/intel-gpu-tools-1.0.3_pre2.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 x-modular 9f4ee0c44a3a3b7ecdf52cefc1e10280
|
||||
_md5_=44bf81d69ae01fb36afc31911c34870b
|
||||
@ -1,11 +0,0 @@
|
||||
DEFINED_PHASES=compile install setup unpack
|
||||
DEPEND=virtual/glut virtual/opengl virtual/glu
|
||||
DESCRIPTION=Mesa's OpenGL utility and demo programs (glxgears and glxinfo)
|
||||
HOMEPAGE=http://mesa3d.sourceforge.net/
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
|
||||
LICENSE=LGPL-2
|
||||
RDEPEND=virtual/glut virtual/opengl virtual/glu
|
||||
SLOT=0
|
||||
SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/7.5.1/MesaLib-7.5.1.tar.bz2 ftp://ftp.freedesktop.org/pub/mesa/7.5.1/MesaDemos-7.5.1.tar.bz2
|
||||
_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=d1c64255283116c9e9fddc28b1c62f7c
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=info prepare setup unpack
|
||||
DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
|
||||
DESCRIPTION=Multitouch Contact Plotter
|
||||
EAPI=4
|
||||
HOMEPAGE=http://src.chromium.org
|
||||
IUSE=cros_workon_tree_ccfcb72fba4959143cc6e3273301e2be6965ff53
|
||||
KEYWORDS=amd64 arm x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=x11-libs/libX11
|
||||
SLOT=0
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=8be5e1bcd3160cca6ac479709c8e3852
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=info prepare setup unpack
|
||||
DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
|
||||
DESCRIPTION=Multitouch Contact Plotter
|
||||
EAPI=4
|
||||
HOMEPAGE=http://src.chromium.org
|
||||
IUSE=cros_workon_tree_
|
||||
KEYWORDS=~amd64 ~arm ~x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=x11-libs/libX11
|
||||
SLOT=0
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=f6e2bf580dd4e8030f300bee7fb2a303
|
||||
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
|
||||
DEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
|
||||
DESCRIPTION=X Window System initializer
|
||||
EAPI=3
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
IUSE=+minimal
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
|
||||
LICENSE=MIT GPL-2
|
||||
PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x11-wm/twm )
|
||||
RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
|
||||
SLOT=0
|
||||
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinit-1.3.0.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=eac70a42b0e19f597b938daeaed4f996
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=configure unpack
|
||||
DEPEND=x11-libs/libXmu x11-libs/libX11
|
||||
DESCRIPTION=X.Org xset application stripped down for just 'r' and 'm' commands
|
||||
EAPI=4
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
IUSE=+minimal
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
|
||||
LICENSE=MIT
|
||||
RDEPEND=x11-libs/libXmu x11-libs/libX11
|
||||
SLOT=0
|
||||
_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912
|
||||
_md5_=b04332feeb0d0993c0ffa5e38b4ddae0
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=install prepare
|
||||
DEPEND=x11-libs/libX11
|
||||
DESCRIPTION=X11 proxy that logs communication between a client and a server
|
||||
EAPI=2
|
||||
HOMEPAGE=http://xtrace.alioth.debian.org/
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=x11-libs/libX11
|
||||
SLOT=0
|
||||
SRC_URI=http://alioth.debian.org/frs/download.php/3201/_1.0.2.orig.tar.gz
|
||||
_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=76357eacf71887eaa6ddfc9b47099733
|
||||
@ -1,10 +0,0 @@
|
||||
DEFINED_PHASES=-
|
||||
DESCRIPTION=Meta package containing deps on all xorg drivers
|
||||
EAPI=4
|
||||
HOMEPAGE=http://www.gentoo.org/
|
||||
IUSE=video_cards_ark video_cards_ast video_cards_cirrus video_cards_dummy video_cards_epson video_cards_fbdev video_cards_geode video_cards_glint video_cards_i128 video_cards_i740 video_cards_intel video_cards_mach64 video_cards_mga video_cards_neomagic video_cards_newport video_cards_nouveau video_cards_nv video_cards_omapfb video_cards_qxl video_cards_r128 video_cards_radeon video_cards_s3 video_cards_savage video_cards_siliconmotion video_cards_sis video_cards_sunbw2 video_cards_suncg14 video_cards_suncg3 video_cards_suncg6 video_cards_sunffb video_cards_sunleo video_cards_suntcx video_cards_tdfx video_cards_tga video_cards_trident video_cards_v4l video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_fglrx video_cards_nvidia input_devices_acecad input_devices_aiptek input_devices_cmt input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
|
||||
LICENSE=as-is
|
||||
PDEPEND=input_devices_acecad? ( x11-drivers/xf86-input-acecad ) input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) input_devices_cmt? ( x11-drivers/xf86-input-cmt ) input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_fpit? ( x11-drivers/xf86-input-fpit ) input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) input_devices_penmount? ( x11-drivers/xf86-input-penmount ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_ark? ( x11-drivers/xf86-video-ark ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i128? ( x11-drivers/xf86-video-i128 ) video_cards_i740? ( x11-drivers/xf86-video-i740 ) video_cards_intel? ( x11-drivers/xf86-video-intel ) video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) video_cards_newport? ( x11-drivers/xf86-video-newport ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omapfb? ( x11-drivers/xf86-video-omapfb ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_fglrx? ( x11-drivers/ati-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_s3? ( x11-drivers/xf86-video-s3 ) video_cards_savage? ( x11-drivers/xf86-video-savage ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_sis? ( x11-drivers/xf86-video-sis ) video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tga? ( x11-drivers/xf86-video-tga ) video_cards_trident? ( x11-drivers/xf86-video-trident ) video_cards_v4l? ( x11-drivers/xf86-video-v4l ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !<=x11-drivers/xf86-video-apm-1.2.3 !<=x11-drivers/xf86-video-chips-1.2.4 !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-nsc !<=x11-drivers/xf86-video-rendition-4.2.4 !<=x11-drivers/xf86-video-s3virge-1.10.4 !<=x11-drivers/xf86-video-sisusb-0.9.4 !x11-drivers/xf86-video-sunbw2 !<=x11-drivers/xf86-video-tseng-1.2.4
|
||||
SLOT=0
|
||||
_md5_=2eddde1a6dcbb1481b4f8ec02ae4a5c8
|
||||
@ -1,15 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
|
||||
DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-2.1.99.3 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
|
||||
DESCRIPTION=X.Org X servers
|
||||
EAPI=4
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
IUSE=dmx kdrive xnest xorg xvfb broken_partialswaps -doc ipv6 minimal nptl selinux +suid tegra tslib +udev static-libs doc
|
||||
KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
|
||||
LICENSE=MIT
|
||||
PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.12 )
|
||||
RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )
|
||||
REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
|
||||
SLOT=0
|
||||
SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.12.4.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=cc1937987d75e7653bcd0e616dbc8461
|
||||
@ -1,7 +0,0 @@
|
||||
DEFINED_PHASES=install
|
||||
DESCRIPTION=Rules for setting permissions right on /dev/mali0
|
||||
EAPI=4
|
||||
KEYWORDS=arm
|
||||
LICENSE=BSD
|
||||
SLOT=0
|
||||
_md5_=992e7bee8e0705fcf9bd18cdaaec1d0c
|
||||
@ -1,7 +0,0 @@
|
||||
DEFINED_PHASES=install
|
||||
DESCRIPTION=Rules for setting permissions right on /dev/mali0
|
||||
EAPI=4
|
||||
KEYWORDS=arm
|
||||
LICENSE=BSD
|
||||
SLOT=0
|
||||
_md5_=992e7bee8e0705fcf9bd18cdaaec1d0c
|
||||
@ -1,15 +0,0 @@
|
||||
DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
|
||||
DEPEND=<x11-base/xorg-server-1.9.99 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) >=app-admin/eselect-opengl-1.0.9 !<media-video/nvidia-settings-256.52 kernel_linux? ( virtual/linux-sources ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils
|
||||
DESCRIPTION=NVIDIA X11 driver and GLX libraries
|
||||
EAPI=2
|
||||
HOMEPAGE=http://www.nvidia.com/
|
||||
IUSE=acpi custom-cflags gtk multilib kernel_linux kernel_linux
|
||||
KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
|
||||
LICENSE=NVIDIA
|
||||
PDEPEND=>=x11-libs/libvdpau-0.3-r1 gtk? ( media-video/nvidia-settings )
|
||||
RDEPEND=<x11-base/xorg-server-1.9.99 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) >=app-admin/eselect-opengl-1.0.9 !<media-video/nvidia-settings-256.52 x11-libs/libXvMC kernel_linux? ( virtual/modutils ) acpi? ( sys-power/acpid ) kernel_linux? ( virtual/modutils )
|
||||
RESTRICT=strip
|
||||
SLOT=0
|
||||
SRC_URI=x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/260.19.36/NVIDIA-Linux-x86-260.19.36.run ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/260.19.36/NVIDIA-Linux-x86_64-260.19.36.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/260.19.36/NVIDIA-FreeBSD-x86-260.19.36.tar.gz )
|
||||
_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 linux-info 01b7a221ed254c010703fd454e011ea6 linux-mod 07a3d250a1268d811d3e8730e5741394 multilib 5f4ad6cf85e365e8f0c6050ddd21659e nvidia-driver f195f64263551aa3c4a9aff69ed97059 portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed
|
||||
_md5_=eb8b68ad54621db9e4c589760db8ff53
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=compile info install setup unpack
|
||||
DEPEND=x11-libs/libX11 x11-drivers/opengles-headers dev-vcs/git
|
||||
DESCRIPTION=OpenGL|ES mock library
|
||||
EAPI=4
|
||||
HOMEPAGE=http://www.khronos.org/opengles/2_X/
|
||||
IUSE=cros_workon_tree_1a5966915f51a670b1f1bd4fda10ec670b40244b
|
||||
KEYWORDS=arm x86
|
||||
LICENSE=SGI-B-2.0
|
||||
RDEPEND=x11-libs/libX11 x11-drivers/opengles-headers
|
||||
SLOT=0
|
||||
_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=72c7bf2505c79a2fbc32f5a62e9703d6
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=compile info install setup unpack
|
||||
DEPEND=x11-libs/libX11 x11-drivers/opengles-headers dev-vcs/git
|
||||
DESCRIPTION=OpenGL|ES mock library
|
||||
EAPI=4
|
||||
HOMEPAGE=http://www.khronos.org/opengles/2_X/
|
||||
IUSE=cros_workon_tree_
|
||||
KEYWORDS=~arm ~x86
|
||||
LICENSE=SGI-B-2.0
|
||||
RDEPEND=x11-libs/libX11 x11-drivers/opengles-headers
|
||||
SLOT=0
|
||||
_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=02b7e831a4820d044457bfb81d793c38
|
||||
@ -1,11 +0,0 @@
|
||||
DEFINED_PHASES=info install setup unpack
|
||||
DEPEND=dev-vcs/git
|
||||
DESCRIPTION=OpenGL|ES headers.
|
||||
EAPI=2
|
||||
HOMEPAGE=http://www.khronos.org/opengles/2_X/
|
||||
IUSE=cros_workon_tree_1a5966915f51a670b1f1bd4fda10ec670b40244b
|
||||
KEYWORDS=x86 arm
|
||||
LICENSE=SGI-B-2.0
|
||||
SLOT=0
|
||||
_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=e898726ef860a0c3b55b099ffafffadd
|
||||
@ -1,11 +0,0 @@
|
||||
DEFINED_PHASES=info install setup unpack
|
||||
DEPEND=dev-vcs/git
|
||||
DESCRIPTION=OpenGL|ES headers.
|
||||
EAPI=2
|
||||
HOMEPAGE=http://www.khronos.org/opengles/2_X/
|
||||
IUSE=cros_workon_tree_
|
||||
KEYWORDS=~x86 ~arm
|
||||
LICENSE=SGI-B-2.0
|
||||
SLOT=0
|
||||
_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=688d878f6579919131fa744d9c5fd3cb
|
||||
@ -1,11 +0,0 @@
|
||||
DEFINED_PHASES=compile configure info install prepare setup test unpack
|
||||
DEPEND=chromeos-base/gestures chromeos-base/libevdev app-misc/utouch-evemu x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
|
||||
DESCRIPTION=Chromium OS multitouch driver regression tests.
|
||||
EAPI=4
|
||||
IUSE=cros_workon_tree_7d097ae9d618817e2c9a274a07c3ec207a631583
|
||||
KEYWORDS=arm amd64 x86
|
||||
LICENSE=BSD
|
||||
RDEPEND=chromeos-base/gestures chromeos-base/libevdev app-misc/utouch-evemu x11-proto/inputproto
|
||||
SLOT=0
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=8a5ea11aa36a73c4e56db6ab6f8ef1ac
|
||||
@ -1,11 +0,0 @@
|
||||
DEFINED_PHASES=compile configure info install prepare setup test unpack
|
||||
DEPEND=chromeos-base/gestures chromeos-base/libevdev app-misc/utouch-evemu x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
|
||||
DESCRIPTION=Chromium OS multitouch driver regression tests.
|
||||
EAPI=4
|
||||
IUSE=cros_workon_tree_
|
||||
KEYWORDS=~arm amd64 ~x86
|
||||
LICENSE=BSD
|
||||
RDEPEND=chromeos-base/gestures chromeos-base/libevdev app-misc/utouch-evemu x11-proto/inputproto
|
||||
SLOT=0
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=3c61498470d6bd908bb97cf565c66646
|
||||
@ -1,11 +0,0 @@
|
||||
DEFINED_PHASES=compile configure info install prepare setup test unpack
|
||||
DEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
|
||||
DESCRIPTION=Chromium OS multitouch input driver for Xorg X server.
|
||||
EAPI=4
|
||||
IUSE=cros_workon_tree_3b26ecfe0fc8246a9771a6b1539572d0d70e3ad1
|
||||
KEYWORDS=arm amd64 x86
|
||||
LICENSE=BSD
|
||||
RDEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server
|
||||
SLOT=0
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=cf420d228f97cd5a8b4ee387258f2506
|
||||
@ -1,11 +0,0 @@
|
||||
DEFINED_PHASES=compile configure info install prepare setup test unpack
|
||||
DEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
|
||||
DESCRIPTION=Chromium OS multitouch input driver for Xorg X server.
|
||||
EAPI=4
|
||||
IUSE=cros_workon_tree_
|
||||
KEYWORDS=~arm ~amd64 ~x86
|
||||
LICENSE=BSD
|
||||
RDEPEND=chromeos-base/gestures chromeos-base/libevdev x11-base/xorg-server
|
||||
SLOT=0
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=d96ebc46f1e988ac78f9b3120ae18bc5
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
|
||||
DEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3 >=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
|
||||
DESCRIPTION=Generic Linux input driver
|
||||
EAPI=4
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
|
||||
LICENSE=MIT
|
||||
RDEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev x11-base/xorg-server[xorg]
|
||||
SLOT=0
|
||||
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.7.3.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=9d45ae64d4a90840058743a4ab653c51
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
|
||||
DEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3 >=sys-kernel/linux-headers-2.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
|
||||
DESCRIPTION=Generic Linux input driver
|
||||
EAPI=4
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
|
||||
LICENSE=MIT
|
||||
RDEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev x11-base/xorg-server[xorg]
|
||||
SLOT=0
|
||||
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.7.3.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=9d45ae64d4a90840058743a4ab653c51
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure info install postinst postrm prepare setup test unpack
|
||||
DEPEND=>=x11-base/xorg-server-1.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess dev-vcs/git
|
||||
DESCRIPTION=X.Org driver for ARM devices
|
||||
EAPI=4
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
IUSE=cros_workon_tree_0d2d6cd5e23e84585ebe72df251360086c8408bf
|
||||
KEYWORDS=-* arm
|
||||
LICENSE=MIT
|
||||
RDEPEND=>=x11-base/xorg-server-1.9 x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
|
||||
SLOT=0
|
||||
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-armsoc-0.0.1.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=76626a63ead6a130a7b910ce5e45c597
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=compile configure info install postinst postrm prepare setup test unpack
|
||||
DEPEND=>=x11-base/xorg-server-1.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess dev-vcs/git
|
||||
DESCRIPTION=X.Org driver for ARM devices
|
||||
EAPI=4
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
IUSE=cros_workon_tree_
|
||||
KEYWORDS=-* ~arm
|
||||
LICENSE=MIT
|
||||
RDEPEND=>=x11-base/xorg-server-1.9 x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
|
||||
SLOT=0
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=944ebfd311dc1090a8066b5328a5fcf8
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
|
||||
DEPEND=x11-libs/libXext x11-libs/libXfixes xvmc? ( x11-libs/libXvMC ) >=x11-libs/libxcb-1.5 >=x11-libs/libdrm-2.4.23[video_cards_intel] sna? ( >=x11-base/xorg-server-1.10 ) >=x11-proto/dri2proto-2.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
|
||||
DESCRIPTION=X.Org driver for Intel cards
|
||||
EAPI=4
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
IUSE=dri sna xvmc broken_partialswaps dri
|
||||
KEYWORDS=amd64 ~ia64 x86 -x86-fbsd
|
||||
LICENSE=MIT
|
||||
RDEPEND=x11-libs/libXext x11-libs/libXfixes xvmc? ( x11-libs/libXvMC ) >=x11-libs/libxcb-1.5 >=x11-libs/libdrm-2.4.23[video_cards_intel] sna? ( >=x11-base/xorg-server-1.10 ) dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
|
||||
SLOT=0
|
||||
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.16.0.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea linux-info 01b7a221ed254c010703fd454e011ea6 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=84828c443d7f2f2603fb2ab324282add
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=compile install postinst postrm preinst unpack
|
||||
DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
|
||||
DESCRIPTION=Generic VESA video driver
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
IUSE=debug
|
||||
KEYWORDS=-* ~alpha amd64 ~ia64 x86 ~x86-fbsd
|
||||
LICENSE=MIT
|
||||
RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
|
||||
SLOT=0
|
||||
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.0.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 x-modular 9f4ee0c44a3a3b7ecdf52cefc1e10280
|
||||
_md5_=9ae88dd31766afb3218be4e38413dea4
|
||||
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare
|
||||
DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) dev-util/pkgconfig >=sys-devel/libtool-2 doc? ( >=dev-util/gtk-doc-1.6 ~app-text/docbook-xml-dtd-4.2 ) X? ( x11-proto/renderproto drm? ( x11-proto/xproto >=x11-proto/xextproto-7.1 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
|
||||
DESCRIPTION=A vector graphics library with cross-device output support
|
||||
EAPI=3
|
||||
HOMEPAGE=http://cairographics.org/
|
||||
IUSE=X aqua debug directfb doc drm gallium opengl openvg qt4 static-libs +svg xcb cairo-perf-trace
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=|| ( LGPL-2.1 MPL-1.1 )
|
||||
RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util )
|
||||
RESTRICT=test
|
||||
SLOT=0
|
||||
SRC_URI=http://cairographics.org/releases/cairo-1.10.2.tar.gz
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=b5614dee88eda90b8c43e94b9c072d55
|
||||
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=configure install postinst prepare setup test
|
||||
DEPEND=!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.2 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.21.3 >=x11-libs/pango-1.20 >=dev-libs/atk-1.13 media-libs/fontconfig x11-misc/shared-mime-info >=media-libs/libpng-1.2.1 cups? ( net-print/cups ) jpeg? ( >=media-libs/jpeg-6b-r2:0 ) jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.5.7 ) !<gnome-base/gail-1000 >=dev-util/pkgconfig-0.9 !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) x86-interix? ( sys-libs/itx-bind ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost )
|
||||
DESCRIPTION=Gimp ToolKit +
|
||||
EAPI=2
|
||||
HOMEPAGE=http://www.gtk.org/
|
||||
IUSE=aqua cups debug doc jpeg jpeg2k tiff test vim-syntax xinerama test
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=LGPL-2
|
||||
PDEPEND=vim-syntax? ( app-vim/gtk-syntax )
|
||||
RDEPEND=!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.2 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.21.3 >=x11-libs/pango-1.20 >=dev-libs/atk-1.13 media-libs/fontconfig x11-misc/shared-mime-info >=media-libs/libpng-1.2.1 cups? ( net-print/cups ) jpeg? ( >=media-libs/jpeg-6b-r2:0 ) jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.5.7 ) !<gnome-base/gail-1000
|
||||
SLOT=2
|
||||
SRC_URI=mirror://gnome/sources/gtk+/2.20/gtk+-2.20.1.tar.bz2
|
||||
_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed virtualx e9162f65645513120b4e12863a5fa972
|
||||
_md5_=e0d42fb0f56b4edbbdcf8c033ea9b026
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
|
||||
DEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
|
||||
DESCRIPTION=X.Org Xfont library
|
||||
EAPI=4
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
IUSE=ipv6 static-libs doc
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=MIT
|
||||
RDEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto
|
||||
SLOT=0
|
||||
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.4.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=db339124932f4f4e0a848e0069d4a361
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
|
||||
DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
|
||||
DESCRIPTION=X.Org Xft library
|
||||
EAPI=3
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
IUSE=static-libs
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
|
||||
LICENSE=MIT
|
||||
RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto
|
||||
SLOT=0
|
||||
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.2.0.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=367c6899b512349ba82ae0af0eeee0ba
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
|
||||
DEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
|
||||
DESCRIPTION=X.Org Xi library
|
||||
EAPI=4
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
IUSE=static-libs doc
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
|
||||
LICENSE=MIT
|
||||
RDEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3
|
||||
SLOT=0
|
||||
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.6.0.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=023590ebd190057dd23a605b6f34afa3
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=compile install postinst postrm preinst setup unpack
|
||||
DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto >=x11-misc/util-macros-1.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
|
||||
DESCRIPTION=X.Org Xt library
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
IUSE=debug
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
|
||||
LICENSE=MIT
|
||||
RDEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto !<=x11-base/xorg-x11-6.9
|
||||
SLOT=0
|
||||
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXt-1.0.6.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 x-modular 9f4ee0c44a3a3b7ecdf52cefc1e10280
|
||||
_md5_=a2d9a6d549fb2b552bc5a0318b2384b6
|
||||
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
|
||||
DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
|
||||
DESCRIPTION=X.Org libdrm library
|
||||
EAPI=4
|
||||
HOMEPAGE=http://dri.freedesktop.org/
|
||||
IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=MIT
|
||||
RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )
|
||||
RESTRICT=test
|
||||
SLOT=0
|
||||
SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.39.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=643307b815fed12113f6105c3491df70
|
||||
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
|
||||
DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
|
||||
DESCRIPTION=X.Org libdrm library
|
||||
EAPI=4
|
||||
HOMEPAGE=http://dri.freedesktop.org/
|
||||
IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=MIT
|
||||
RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )
|
||||
RESTRICT=test
|
||||
SLOT=0
|
||||
SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.39.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=643307b815fed12113f6105c3491df70
|
||||
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
|
||||
DEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
|
||||
DESCRIPTION=X.Org libdrm library
|
||||
EAPI=4
|
||||
HOMEPAGE=http://dri.freedesktop.org/
|
||||
IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=MIT
|
||||
RDEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39
|
||||
RESTRICT=test
|
||||
SLOT=0
|
||||
SRC_URI=http://dri.freedesktop.org/libdrm-tests/libdrm-2.4.39.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=a39302dc6251f406fdf336d67ef7a85e
|
||||
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
|
||||
DEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
|
||||
DESCRIPTION=X.Org libdrm library
|
||||
EAPI=4
|
||||
HOMEPAGE=http://dri.freedesktop.org/
|
||||
IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=MIT
|
||||
RDEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39
|
||||
RESTRICT=test
|
||||
SLOT=0
|
||||
SRC_URI=http://dri.freedesktop.org/libdrm-tests/libdrm-2.4.39.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=a39302dc6251f406fdf336d67ef7a85e
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
|
||||
DEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
|
||||
DESCRIPTION=Library providing generic access to the PCI bus and devices
|
||||
EAPI=4
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
IUSE=minimal zlib static-libs
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=MIT
|
||||
RDEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib )
|
||||
SLOT=0
|
||||
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.12.902.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=0dfac7dd99c75dbb44b4dbced0083aaf
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=install prepare
|
||||
DEPEND=>=x11-libs/libva-1.1.0_rc1 !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
|
||||
DESCRIPTION=HW video decode support for Intel integrated graphics
|
||||
EAPI=3
|
||||
HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
|
||||
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
|
||||
LICENSE=MIT
|
||||
RDEPEND=>=x11-libs/libva-1.1.0_rc1 !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel]
|
||||
SLOT=0
|
||||
SRC_URI=http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-1.0.19_pre2.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=6f9fe16aace2cab1e655386667acbd39
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
|
||||
DEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs doc? ( app-doc/doxygen ) dev-libs/libxslt >=x11-proto/xcb-proto-1.7.1 >=dev-lang/python-2.5[xml] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
|
||||
DESCRIPTION=X C-language Bindings library
|
||||
EAPI=3
|
||||
HOMEPAGE=http://xcb.freedesktop.org/
|
||||
IUSE=doc selinux static-libs
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
|
||||
LICENSE=MIT
|
||||
RDEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs
|
||||
SLOT=0
|
||||
SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.8.1.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=c6e17d064c8ad5852ef61735d1de6053
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
|
||||
DEPEND=x11-proto/xproto >=x11-proto/kbproto-1.0.5 sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 dev-vcs/git
|
||||
DESCRIPTION=X.Org xkbcommon library
|
||||
EAPI=4
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
IUSE=static-libs
|
||||
KEYWORDS=amd64 arm x86
|
||||
LICENSE=MIT
|
||||
RDEPEND=x11-proto/xproto >=x11-proto/kbproto-1.0.5
|
||||
SLOT=0
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=8003ff2c6465aa25e15a598521c3e84e
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
|
||||
DEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) test? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) X? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
|
||||
DESCRIPTION=Internationalized text layout and rendering library
|
||||
EAPI=3
|
||||
HOMEPAGE=http://www.pango.org/
|
||||
IUSE=X doc introspection test debug
|
||||
KEYWORDS=amd64 arm x86
|
||||
LICENSE=LGPL-2 FTL
|
||||
RDEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gnome/sources/pango/1.28/pango-1.28.4.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a fdo-mime 9c46e30acd923ff12e325dbe96bb98b9 gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 e766f648c9d51ea0afabaf25bddb1ad9 gnome2-utils 0067e2e4dc66e2ff223a9c527e329407 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed
|
||||
_md5_=e910bba8f04a9558bd3a2d94ea1297c0
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
|
||||
DEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) test? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) X? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
|
||||
DESCRIPTION=Internationalized text layout and rendering library
|
||||
EAPI=3
|
||||
HOMEPAGE=http://www.pango.org/
|
||||
IUSE=X doc introspection test debug
|
||||
KEYWORDS=amd64 arm x86
|
||||
LICENSE=LGPL-2 FTL
|
||||
RDEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gnome/sources/pango/1.28/pango-1.28.4.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a fdo-mime 9c46e30acd923ff12e325dbe96bb98b9 gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 e766f648c9d51ea0afabaf25bddb1ad9 gnome2-utils 0067e2e4dc66e2ff223a9c527e329407 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed
|
||||
_md5_=e910bba8f04a9558bd3a2d94ea1297c0
|
||||
@ -1,11 +0,0 @@
|
||||
DEFINED_PHASES=compile install
|
||||
DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-proto/xproto
|
||||
DESCRIPTION=Hides mouse pointer while not in use.
|
||||
HOMEPAGE=http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.README
|
||||
KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86
|
||||
LICENSE=public-domain
|
||||
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi
|
||||
SLOT=0
|
||||
SRC_URI=ftp://ftp.x.org/contrib/utilities/unclutter-8.tar.Z
|
||||
_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=a355a91ecb5832e54d9264a820696f03
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
|
||||
DEPEND=>=x11-apps/xkbcomp-1.2.1 >=x11-libs/libX11-1.4.2 x11-proto/xproto >=dev-util/intltool-0.30 dev-perl/XML-Parser || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
|
||||
DESCRIPTION=X keyboard configuration database
|
||||
EAPI=4
|
||||
HOMEPAGE=http://www.freedesktop.org/wiki/Software/XKeyboardConfig
|
||||
IUSE=parrot
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
|
||||
LICENSE=MIT
|
||||
RDEPEND=>=x11-apps/xkbcomp-1.2.1 >=x11-libs/libX11-1.4.2
|
||||
SLOT=0
|
||||
SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config-2.4.1.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=f842bf5aa0be0ffead4745fb313a5ba6
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
|
||||
DEPEND=dev-libs/libxml2 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
|
||||
DESCRIPTION=X C-language Bindings protocol headers
|
||||
EAPI=3
|
||||
HOMEPAGE=http://xcb.freedesktop.org/
|
||||
KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=MIT
|
||||
RDEPEND=>=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
|
||||
SLOT=0
|
||||
SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.7.1.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=d014d8c7e782e2eb0eb136851b7425a1
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
|
||||
DEPEND=!<x11-libs/libXext-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
|
||||
DESCRIPTION=X.Org XExt protocol headers
|
||||
EAPI=4
|
||||
HOMEPAGE=http://xorg.freedesktop.org/
|
||||
IUSE=doc
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
|
||||
LICENSE=MIT
|
||||
RDEPEND=!<x11-libs/libXext-1.0.99
|
||||
SLOT=0
|
||||
SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.2.0.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5
|
||||
_md5_=3e782d06a1d651f7c856662bcaac1fc3
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare
|
||||
DEPEND=x11-libs/libX11 x11-libs/libXft afterimage? ( media-libs/libafterimage ) x11-libs/libXrender perl? ( dev-lang/perl ) >=sys-libs/ncurses-5.7-r3 dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
|
||||
DESCRIPTION=rxvt clone with xft and unicode support
|
||||
EAPI=2
|
||||
HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
|
||||
IUSE=minimal +truetype perl iso14755 afterimage xterm-color wcwidth +vanilla
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=x11-libs/libX11 x11-libs/libXft afterimage? ( media-libs/libafterimage ) x11-libs/libXrender perl? ( dev-lang/perl ) >=sys-libs/ncurses-5.7-r3
|
||||
SLOT=0
|
||||
SRC_URI=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.07.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=a99a8294e901c6dd487d4c21e409f87d
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare
|
||||
DEPEND=x11-libs/libX11 x11-libs/libXft afterimage? ( media-libs/libafterimage ) x11-libs/libXrender perl? ( dev-lang/perl ) >=sys-libs/ncurses-5.7-r3 dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
|
||||
DESCRIPTION=rxvt clone with xft and unicode support
|
||||
EAPI=2
|
||||
HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
|
||||
IUSE=minimal +truetype perl iso14755 afterimage xterm-color wcwidth +vanilla
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=x11-libs/libX11 x11-libs/libXft afterimage? ( media-libs/libafterimage ) x11-libs/libXrender perl? ( dev-lang/perl ) >=sys-libs/ncurses-5.7-r3
|
||||
SLOT=0
|
||||
SRC_URI=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.10.tar.bz2
|
||||
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=a99a8294e901c6dd487d4c21e409f87d
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=configure install setup
|
||||
DEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXft x11-libs/libXaw x11-apps/xmessage unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/Xaw3d ) x11-proto/xproto
|
||||
DESCRIPTION=Terminal Emulator for X Windows
|
||||
EAPI=2
|
||||
HOMEPAGE=http://dickey.his.com/xterm/
|
||||
IUSE=-toolbar +truetype +unicode -Xaw3d
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
|
||||
LICENSE=MIT
|
||||
RDEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXft x11-libs/libXaw x11-apps/xmessage unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/Xaw3d )
|
||||
SLOT=0
|
||||
SRC_URI=ftp://invisible-island.net/xterm/xterm-255.tgz
|
||||
_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912
|
||||
_md5_=0e8c765a4b6d83bf496a1cb03122fff8
|
||||
@ -1 +0,0 @@
|
||||
DIST intel-gpu-tools-1.0.3_pre2.tar.bz2 808375 SHA256 a647fe7b777d5a084f4be9995fc2984239af115fb5a9f19d850880e243118e4a SHA512 da9aede40a378223f9e6a5fa14818a9684da3b1a8a597291b6e2e45b0f088f1aabdf64dc5c5c6a341da5770baadd17d1131197ef78f73e32a1cecc4c1de9dc02 WHIRLPOOL 643b8e02b5e7bed2fcb469aec36e82a0ac8740efd5ca0ef12d104ef5155c7c31d12483f5b4977e0f79e76cf720442ce626055f03d8ab8ea283a2c60e6f15dcac
|
||||
@ -1,19 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.0.2.ebuild,v 1.3 2009/12/10 18:16:44 fauli Exp $
|
||||
|
||||
# Must be before x-modular eclass is inherited
|
||||
#SNAPSHOT="yes"
|
||||
|
||||
inherit x-modular
|
||||
|
||||
DESCRIPTION="intel gpu userland tools"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND="
|
||||
>=x11-libs/libdrm-2.4.6
|
||||
>=x11-libs/libpciaccess-0.10
|
||||
x11-libs/cairo"
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -1,2 +0,0 @@
|
||||
DIST MesaDemos-7.5.1.tar.bz2 1552059 RMD160 9147d9fba75998fcd344a736995069ec642c8893 SHA1 5bafef98a896f4e5c22d17b435db0d14e981ba6c SHA256 64d6b9b42a93e93b770cd07d944a5fe872752db18b1cd84224198f7a431a1721
|
||||
DIST MesaLib-7.5.1.tar.bz2 4382803 RMD160 bccf6f52fce3b3c7ac6525444f907e3c2fe790c2 SHA1 26171fb4de23a21431861d6663203e400df45bf7 SHA256 48f21e5a91a82fa9fb6d0bc5ae72d9d9cc1824429dcfc759cfcc1a44e3e1440a
|
||||
@ -1,12 +0,0 @@
|
||||
diff -ru Mesa-7.5.1/progs/xdemos/Makefile Mesa-7.5.1.patched/progs/xdemos/Makefile
|
||||
--- Mesa-7.5.1/progs/xdemos/Makefile 2010-10-06 10:21:04.000000000 -0700
|
||||
+++ Mesa-7.5.1.patched/progs/xdemos/Makefile 2010-10-06 10:20:31.000000000 -0700
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
|
||||
|
||||
-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
|
||||
+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) -lX11 -lpthread
|
||||
|
||||
PROGS = \
|
||||
corender \
|
||||
@ -1,83 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-7.5.1.ebuild,v 1.8 2009/12/16 18:02:52 scarabeus Exp $
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
MY_PN="${PN/m/M}"
|
||||
MY_PN="${MY_PN/-progs}"
|
||||
MY_P="${MY_PN}-${PV/_/-}"
|
||||
LIB_P="${MY_PN}Lib-${PV/_/-}"
|
||||
PROG_P="${MY_PN}Demos-${PV/_/-}"
|
||||
DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
|
||||
HOMEPAGE="http://mesa3d.sourceforge.net/"
|
||||
if [[ $PV = *_rc* ]]; then
|
||||
SRC_URI="http://www.mesa3d.org/beta/${LIB_P}.tar.gz
|
||||
http://www.mesa3d.org/beta/${PROG_P}.tar.gz"
|
||||
elif [[ $PV = 9999 ]]; then
|
||||
SRC_URI=""
|
||||
else
|
||||
SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${PV}/${LIB_P}.tar.bz2
|
||||
ftp://ftp.freedesktop.org/pub/mesa/${PV}/${PROG_P}.tar.bz2"
|
||||
fi
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="virtual/glut
|
||||
virtual/opengl
|
||||
virtual/glu"
|
||||
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
pkg_setup() {
|
||||
if [[ ${KERNEL} == "FreeBSD" ]]; then
|
||||
CONFIG="freebsd"
|
||||
elif use x86; then
|
||||
CONFIG="linux-dri-x86"
|
||||
elif use amd64; then
|
||||
CONFIG="linux-dri-x86-64"
|
||||
elif use ppc; then
|
||||
CONFIG="linux-dri-ppc"
|
||||
else
|
||||
CONFIG="linux-dri"
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
HOSTCONF="${S}/configs/${CONFIG}"
|
||||
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
|
||||
# Kill this; we don't want /usr/X11R6/lib ever to be searched in this
|
||||
# build.
|
||||
echo "EXTRA_LIB_PATH =" >> ${HOSTCONF}
|
||||
|
||||
echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
|
||||
echo "CC = $(tc-getCC)" >> ${HOSTCONF}
|
||||
echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
|
||||
echo "LDFLAGS = ${LDFLAGS}" >> ${HOSTCONF}
|
||||
|
||||
# Just executables here, no need to compile with -fPIC
|
||||
echo "PIC_FLAGS =" >> ${HOSTCONF}
|
||||
|
||||
epatch "${FILESDIR}"/${P}-gold.patch
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd "${S}"/configs
|
||||
ln -s ${CONFIG} current
|
||||
|
||||
cd "${S}"/progs/xdemos
|
||||
|
||||
emake glxinfo || die "glxinfo failed"
|
||||
emake glxgears || die "glxgears failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin "${S}"/progs/xdemos/{glxgears,glxinfo} || die
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=4
|
||||
|
||||
CROS_WORKON_COMMIT="f0fda739ab48538a97ed784c9cd1f94dc2569555"
|
||||
CROS_WORKON_TREE="ccfcb72fba4959143cc6e3273301e2be6965ff53"
|
||||
CROS_WORKON_PROJECT="chromiumos/platform/mtplot"
|
||||
inherit autotools cros-workon
|
||||
|
||||
DESCRIPTION="Multitouch Contact Plotter"
|
||||
CROS_WORKON_LOCALNAME="../platform/mtplot"
|
||||
HOMEPAGE="http://src.chromium.org"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm x86"
|
||||
IUSE=""
|
||||
RDEPEND="x11-libs/libX11"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
eautoreconf
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=4
|
||||
|
||||
CROS_WORKON_PROJECT="chromiumos/platform/mtplot"
|
||||
inherit autotools cros-workon
|
||||
|
||||
DESCRIPTION="Multitouch Contact Plotter"
|
||||
CROS_WORKON_LOCALNAME="../platform/mtplot"
|
||||
HOMEPAGE="http://src.chromium.org"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
IUSE=""
|
||||
RDEPEND="x11-libs/libX11"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
eautoreconf
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
DIST xinit-1.3.0.tar.bz2 138315 RMD160 6759083ed787beace9f485e69d46b97fb397edbd SHA1 6437292214bbca6efad8889c68e72a1ca584928b SHA256 ba76e36e1a42a7cf76505b7e6fc4777f5d14f45ddff74341abfb7dd10d5fe04c
|
||||
@ -1,61 +0,0 @@
|
||||
From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001
|
||||
From: Tomas Chvatal <scarabeus@gentoo.org>
|
||||
Date: Mon, 1 Nov 2010 16:46:36 +0100
|
||||
Subject: [PATCH] Gentoo customizations.
|
||||
|
||||
|
||||
Signed-off-by: Tomas Chvatal <scarabeus@gentoo.org>
|
||||
---
|
||||
xinitrc.cpp | 26 ++++++++++++++++++--------
|
||||
1 files changed, 18 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/xinitrc.cpp b/xinitrc.cpp
|
||||
index 049a8e4..80c3ad9 100644
|
||||
--- a/xinitrc.cpp
|
||||
+++ b/xinitrc.cpp
|
||||
@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD
|
||||
|
||||
userresources=$HOME/.Xresources
|
||||
usermodmap=$HOME/.Xmodmap
|
||||
-sysresources=XINITDIR/.Xresources
|
||||
-sysmodmap=XINITDIR/.Xmodmap
|
||||
+sysresources=XINITDIR/Xresources
|
||||
+sysmodmap=XINITDIR/Xmodmap
|
||||
|
||||
XCOMM merge in defaults and keymaps
|
||||
|
||||
@@ -84,15 +84,25 @@ fi
|
||||
XCOMM This is the fallback case if nothing else is executed above
|
||||
#endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */
|
||||
|
||||
+if [ -n "`/etc/X11/chooser.sh`" ]; then
|
||||
+ command="`/etc/X11/chooser.sh`"
|
||||
+else
|
||||
+ failsafe="yes"
|
||||
+fi
|
||||
+
|
||||
if [ -d XINITDIR/xinitrc.d ] ; then
|
||||
- for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
|
||||
+ for f in XINITDIR/xinitrc.dXSLASHGLOB ; do
|
||||
[ -x "$f" ] && . "$f"
|
||||
done
|
||||
unset f
|
||||
fi
|
||||
|
||||
-TWM &
|
||||
-XCLOCK -geometry 50x50-1+1 &
|
||||
-XTERM -geometry 80x50+494+51 &
|
||||
-XTERM -geometry 80x20+494-0 &
|
||||
-exec XTERM -geometry 80x66+0+0 -name login
|
||||
+if [ -n "$failsafe" ]; then
|
||||
+ TWM &
|
||||
+ XCLOCK -geometry 50x50-1+1 &
|
||||
+ XTERM -geometry 80x50+494+51 &
|
||||
+ XTERM -geometry 80x20+494-0 &
|
||||
+ exec XTERM -geometry 80x66+0+0 -name login
|
||||
+else
|
||||
+ exec $command
|
||||
+fi
|
||||
--
|
||||
1.7.3.1
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
#!/bin/sh
|
||||
# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
|
||||
|
||||
case $# in
|
||||
1)
|
||||
case $1 in
|
||||
failsafe)
|
||||
exec xterm -geometry 80x24-0-0
|
||||
;;
|
||||
esac
|
||||
esac
|
||||
|
||||
# redirect errors to a file in user's home directory if we can
|
||||
for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
|
||||
do
|
||||
if ( cp /dev/null "$errfile" 2> /dev/null )
|
||||
then
|
||||
chmod 600 "$errfile"
|
||||
exec > "$errfile" 2>&1
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
# clean up after xbanner
|
||||
if which freetemp 2> /dev/null ; then
|
||||
freetemp
|
||||
fi
|
||||
|
||||
startup=$HOME/.xsession
|
||||
|
||||
userresources=$HOME/.Xresources
|
||||
usermodmap=$HOME/.Xmodmap
|
||||
userxkbmap=$HOME/.Xkbmap
|
||||
|
||||
sysresources=/etc/X11/Xresources
|
||||
sysmodmap=/etc/X11/Xmodmap
|
||||
sysxkbmap=/etc/X11/Xkbmap
|
||||
|
||||
rh6sysresources=/etc/X11/xinit/Xresources
|
||||
rh6sysmodmap=/etc/X11/xinit/Xmodmap
|
||||
|
||||
|
||||
# merge in defaults
|
||||
if [ -f "$rh6sysresources" ]; then
|
||||
xrdb -merge "$rh6sysresources"
|
||||
fi
|
||||
|
||||
if [ -f "$sysresources" ]; then
|
||||
xrdb -merge "$sysresources"
|
||||
fi
|
||||
|
||||
if [ -f "$userresources" ]; then
|
||||
xrdb -merge "$userresources"
|
||||
fi
|
||||
|
||||
# merge in keymaps
|
||||
if [ -f "$sysxkbmap" ]; then
|
||||
setxkbmap `cat "$sysxkbmap"`
|
||||
XKB_IN_USE=yes
|
||||
fi
|
||||
|
||||
if [ -f "$userxkbmap" ]; then
|
||||
setxkbmap `cat "$userxkbmap"`
|
||||
XKB_IN_USE=yes
|
||||
fi
|
||||
|
||||
#
|
||||
# Eeek, this seems like too much magic here
|
||||
#
|
||||
if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
|
||||
if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
|
||||
xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
|
||||
if [ -n "$xkbsymbols" ]; then
|
||||
setxkbmap -symbols "$xkbsymbols"
|
||||
XKB_IN_USE=yes
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# xkb and xmodmap don't play nice together
|
||||
if [ -z "$XKB_IN_USE" ]; then
|
||||
if [ -f "$rh6sysmodmap" ]; then
|
||||
xmodmap "$rh6sysmodmap"
|
||||
fi
|
||||
|
||||
if [ -f "$sysmodmap" ]; then
|
||||
xmodmap "$sysmodmap"
|
||||
fi
|
||||
|
||||
if [ -f "$usermodmap" ]; then
|
||||
xmodmap "$usermodmap"
|
||||
fi
|
||||
fi
|
||||
|
||||
unset XKB_IN_USE
|
||||
|
||||
if [ -x "$startup" ]; then
|
||||
exec "$startup"
|
||||
elif [ -x "$HOME/.Xclients" ]; then
|
||||
exec "$HOME/.Xclients"
|
||||
elif [ -x /etc/X11/xinit/Xclients ]; then
|
||||
exec /etc/X11/xinit/Xclients
|
||||
elif [ -x /etc/X11/Xclients ]; then
|
||||
exec /etc/X11/Xclients
|
||||
else
|
||||
exec xsm
|
||||
fi
|
||||
@ -1,52 +0,0 @@
|
||||
#!/bin/sh
|
||||
# Copyright 1999-2004 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License, v2
|
||||
# Author: Martin Schlemmer <azarah@gentoo.org>
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/chooser.sh,v 1.5 2009/11/14 14:18:43 scarabeus Exp $
|
||||
|
||||
# Find a match for $XSESSION in /etc/X11/Sessions
|
||||
GENTOO_SESSION=""
|
||||
for x in /etc/X11/Sessions/* ; do
|
||||
if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \
|
||||
= "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ]; then
|
||||
GENTOO_SESSION=${x}
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
GENTOO_EXEC=""
|
||||
|
||||
if [ -n "${XSESSION}" ]; then
|
||||
if [ -f /etc/X11/Sessions/${XSESSION} ]; then
|
||||
if [ -x /etc/X11/Sessions/${XSESSION} ]; then
|
||||
GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}"
|
||||
else
|
||||
GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}"
|
||||
fi
|
||||
elif [ -n "${GENTOO_SESSION}" ]; then
|
||||
if [ -x "${GENTOO_SESSION}" ]; then
|
||||
GENTOO_EXEC="${GENTOO_SESSION}"
|
||||
else
|
||||
GENTOO_EXEC="/bin/sh ${GENTOO_SESSION}"
|
||||
fi
|
||||
else
|
||||
x=""
|
||||
y=""
|
||||
|
||||
for x in "${XSESSION}" \
|
||||
"`echo ${XSESSION} | awk '{ print toupper($1) }'`" \
|
||||
"`echo ${XSESSION} | awk '{ print tolower($1) }'`"
|
||||
do
|
||||
# Fall through ...
|
||||
if [ -x "`which ${x} 2>/dev/null`" ]; then
|
||||
GENTOO_EXEC="`which ${x} 2>/dev/null`"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "${GENTOO_EXEC}"
|
||||
|
||||
|
||||
# vim:ts=4
|
||||
@ -1,30 +0,0 @@
|
||||
#!/bin/sh
|
||||
# Copyright 1999-2006 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License, v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.4 2007/04/05 15:30:19 uberlord Exp $
|
||||
|
||||
# We need to source /etc/profile for stuff like $LANG to work
|
||||
# bug #10190.
|
||||
. /etc/profile
|
||||
|
||||
. /etc/init.d/functions.sh
|
||||
|
||||
# baselayout-1 compat
|
||||
if ! type get_options >/dev/null 2>/dev/null ; then
|
||||
[ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
|
||||
fi
|
||||
|
||||
# Great new Gnome2 feature, AA
|
||||
# We enable this by default
|
||||
export GDK_USE_XFT=1
|
||||
|
||||
export SVCNAME=xdm
|
||||
EXEC="$(get_options service)"
|
||||
NAME="$(get_options name)"
|
||||
PIDFILE="$(get_options pidfile)"
|
||||
|
||||
start-stop-daemon --start --exec ${EXEC} \
|
||||
${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} || \
|
||||
eerror "ERROR: could not start the Display Manager"
|
||||
|
||||
# vim:ts=4
|
||||
@ -1,14 +0,0 @@
|
||||
diff --git a/xinit.c b/xinit.c
|
||||
index 42ff008..2ab817f 100644
|
||||
--- a/xinit.c
|
||||
+++ b/xinit.c
|
||||
@@ -49,10 +49,8 @@ in this Software without prior written authorization from The Open Group.
|
||||
#endif
|
||||
|
||||
/* For PRIO_PROCESS and setpriority() */
|
||||
-#ifdef __DragonFly__
|
||||
#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
-#endif /* __DragonFly__ */
|
||||
|
||||
#include <stdlib.h>
|
||||
@ -1,2 +0,0 @@
|
||||
#!/bin/sh
|
||||
exec /usr/bin/X -nolisten tcp "$@"
|
||||
@ -1,64 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.0-r1.ebuild,v 1.3 2010/12/19 12:21:00 ssuominen Exp $
|
||||
|
||||
EAPI=3
|
||||
|
||||
inherit xorg-2
|
||||
|
||||
DESCRIPTION="X Window System initializer"
|
||||
|
||||
LICENSE="${LICENSE} GPL-2"
|
||||
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
|
||||
IUSE="+minimal"
|
||||
|
||||
RDEPEND="
|
||||
!<x11-base/xorg-server-1.8.0
|
||||
x11-apps/xauth
|
||||
x11-libs/libX11
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
PDEPEND="x11-apps/xrdb
|
||||
!minimal? (
|
||||
x11-apps/xclock
|
||||
x11-apps/xsm
|
||||
x11-terms/xterm
|
||||
x11-wm/twm
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/0001-Gentoo-customizations.patch"
|
||||
"${FILESDIR}/${PN}-1.3.1-prio-process.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
xorg-2_pkg_setup
|
||||
|
||||
CONFIGURE_OPTIONS="--with-xinitdir=/etc/X11/xinit"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
xorg-2_src_install
|
||||
|
||||
exeinto /etc/X11
|
||||
doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh || die
|
||||
exeinto /etc/X11/Sessions
|
||||
doexe "${FILESDIR}"/Xsession || die
|
||||
exeinto /etc/X11/xinit
|
||||
doexe "${FILESDIR}"/xserverrc || die
|
||||
exeinto /etc/X11/xinit/xinitrc.d/
|
||||
doexe "${FILESDIR}/00-xhost"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xorg-2_pkg_postinst
|
||||
ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
|
||||
ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
|
||||
ewarn "any executable. When you run startx, it will run this as the login session."
|
||||
ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
|
||||
ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
|
||||
ewarn "Here's an example of setting it for the whole system:"
|
||||
ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
|
||||
ewarn " env-update && source /etc/profile"
|
||||
}
|
||||
@ -1,6 +0,0 @@
|
||||
LDLIBS = -lXmuu -lX11
|
||||
CFLAGS += -Wall
|
||||
all: xset
|
||||
install:
|
||||
mkdir -p $(DESTDIR)/usr/bin
|
||||
install -m 755 xset $(DESTDIR)/usr/bin/xset-mini
|
||||
@ -1,311 +0,0 @@
|
||||
/*
|
||||
|
||||
Copyright 1985, 1998 The Open Group
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
documentation for any purpose is hereby granted without fee, provided that
|
||||
the above copyright notice appear in all copies and that both that
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation.
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the name of The Open Group shall not be
|
||||
used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
|
||||
*/
|
||||
/* Modified by Stephen so keyboard rate is set using XKB extensions */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <X11/Xos.h>
|
||||
#include <X11/Xfuncs.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/keysym.h>
|
||||
#include <X11/Xproto.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Xmu/Error.h>
|
||||
#include <X11/XKBlib.h>
|
||||
|
||||
#define ON 1
|
||||
#define OFF 0
|
||||
|
||||
#define SERVER_DEFAULT (-1)
|
||||
#define DONT_CHANGE -2
|
||||
|
||||
#define ALL -1
|
||||
|
||||
#define XKBDDELAY_DEFAULT 660
|
||||
#define XKBDRATE_DEFAULT (1000/40)
|
||||
|
||||
static char *progName;
|
||||
|
||||
static int error_status = 0;
|
||||
|
||||
static int is_number(char *arg, int maximum);
|
||||
static void set_mouse(Display *dpy, int acc_num, int acc_denom, int threshold);
|
||||
static void set_repeat(Display *dpy, int key, int auto_repeat_mode);
|
||||
static void usage(char *fmt, ...) _X_NORETURN;
|
||||
static int local_xerror(Display *dpy, XErrorEvent *rep);
|
||||
|
||||
static void xkbset_repeatrate(Display *dpy, int delay, int rate);
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
register char *arg;
|
||||
register int i;
|
||||
int acc_num, acc_denom, threshold;
|
||||
|
||||
int key, auto_repeat_mode;
|
||||
|
||||
char *disp = NULL;
|
||||
Display *dpy;
|
||||
|
||||
int miscpresent = 0;
|
||||
int xkbpresent = 0;
|
||||
|
||||
int xkbmajor = XkbMajorVersion, xkbminor = XkbMinorVersion;
|
||||
int xkbopcode, xkbevent, xkberror;
|
||||
|
||||
progName = argv[0];
|
||||
if (argc < 2) {
|
||||
usage(NULL, NULL); /* replace with window interface */
|
||||
}
|
||||
|
||||
dpy = XOpenDisplay(disp); /* Open display and check for success */
|
||||
if (dpy == NULL) {
|
||||
fprintf(stderr, "%s: unable to open display \"%s\"\n",
|
||||
argv[0], XDisplayName(disp));
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
XSetErrorHandler(local_xerror);
|
||||
for (i = 1; i < argc;) {
|
||||
arg = argv[i++];
|
||||
/* Set pointer (mouse) settings: Acceleration and Threshold. */
|
||||
if (strcmp(arg, "m") == 0 || strcmp(arg, "mouse") == 0) {
|
||||
acc_num = SERVER_DEFAULT; /* restore server defaults */
|
||||
acc_denom = SERVER_DEFAULT;
|
||||
threshold = SERVER_DEFAULT;
|
||||
if (i >= argc) {
|
||||
set_mouse(dpy, acc_num, acc_denom, threshold);
|
||||
break;
|
||||
}
|
||||
arg = argv[i];
|
||||
if (strcmp(arg, "default") == 0) {
|
||||
i++;
|
||||
} else if (*arg >= '0' && *arg <= '9') {
|
||||
acc_denom = 1;
|
||||
sscanf(arg, "%d/%d", &acc_num, &acc_denom);
|
||||
i++;
|
||||
if (i >= argc) {
|
||||
set_mouse(dpy, acc_num, acc_denom, threshold);
|
||||
break;
|
||||
}
|
||||
arg = argv[i];
|
||||
if (*arg >= '0' && *arg <= '9') {
|
||||
threshold = atoi(arg); /* Set threshold as user specified. */
|
||||
i++;
|
||||
}
|
||||
}
|
||||
set_mouse(dpy, acc_num, acc_denom, threshold);
|
||||
} else if (strcmp(arg, "-r") == 0) { /* Turn off one or
|
||||
all autorepeats */
|
||||
auto_repeat_mode = OFF;
|
||||
key = ALL; /* None specified */
|
||||
arg = argv[i];
|
||||
if (i < argc)
|
||||
if (is_number(arg, 255)) {
|
||||
key = atoi(arg);
|
||||
i++;
|
||||
}
|
||||
set_repeat(dpy, key, auto_repeat_mode);
|
||||
} else if (strcmp(arg, "r") == 0) { /* Turn on one or
|
||||
all autorepeats */
|
||||
auto_repeat_mode = ON;
|
||||
key = ALL; /* None specified */
|
||||
arg = argv[i];
|
||||
if (i < argc) {
|
||||
if (strcmp(arg, "on") == 0) {
|
||||
i++;
|
||||
} else if (strcmp(arg, "off") == 0) { /* ...except in
|
||||
this case */
|
||||
auto_repeat_mode = OFF;
|
||||
i++;
|
||||
}
|
||||
else if (strcmp(arg, "rate") == 0) { /* ...or this one. */
|
||||
int delay = 0, rate = 0;
|
||||
|
||||
if (XkbQueryExtension(dpy, &xkbopcode, &xkbevent,
|
||||
&xkberror, &xkbmajor, &xkbminor)) {
|
||||
delay = XKBDDELAY_DEFAULT;
|
||||
rate = XKBDRATE_DEFAULT;
|
||||
xkbpresent = 1;
|
||||
}
|
||||
if (!xkbpresent && !miscpresent)
|
||||
fprintf(stderr,
|
||||
"server does not have extension for \"r rate\" option\n");
|
||||
i++;
|
||||
arg = argv[i];
|
||||
if (i < argc) {
|
||||
if (is_number(arg, 10000) && atoi(arg) > 0) {
|
||||
delay = atoi(arg);
|
||||
i++;
|
||||
arg = argv[i];
|
||||
if (i < argc) {
|
||||
if (is_number(arg, 255) && atoi(arg) > 0) {
|
||||
rate = atoi(arg);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (xkbpresent) {
|
||||
xkbset_repeatrate(dpy, delay, 1000 / rate);
|
||||
}
|
||||
}
|
||||
else if (is_number(arg, 255)) {
|
||||
key = atoi(arg);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
set_repeat(dpy, key, auto_repeat_mode);
|
||||
} else
|
||||
usage("unknown option %s", arg);
|
||||
}
|
||||
|
||||
XCloseDisplay(dpy);
|
||||
|
||||
exit(error_status); /* Done. We can go home now. */
|
||||
}
|
||||
|
||||
static int
|
||||
is_number(char *arg, int maximum)
|
||||
{
|
||||
register char *p;
|
||||
|
||||
if (arg[0] == '-' && arg[1] == '1' && arg[2] == '\0')
|
||||
return (1);
|
||||
for (p = arg; isdigit(*p); p++) ;
|
||||
if (*p || atoi(arg) > maximum)
|
||||
return (0);
|
||||
return (1);
|
||||
}
|
||||
|
||||
static void
|
||||
set_mouse(Display *dpy, int acc_num, int acc_denom, int threshold)
|
||||
{
|
||||
int do_accel = True, do_threshold = True;
|
||||
|
||||
if (acc_num == DONT_CHANGE) /* what an incredible crock... */
|
||||
do_accel = False;
|
||||
if (threshold == DONT_CHANGE)
|
||||
do_threshold = False;
|
||||
if (acc_num < 0) /* shouldn't happen */
|
||||
acc_num = SERVER_DEFAULT;
|
||||
if (acc_denom <= 0) /* prevent divide by zero */
|
||||
acc_denom = SERVER_DEFAULT;
|
||||
if (threshold < 0)
|
||||
threshold = SERVER_DEFAULT;
|
||||
XChangePointerControl(dpy, do_accel, do_threshold, acc_num,
|
||||
acc_denom, threshold);
|
||||
return;
|
||||
}
|
||||
|
||||
static void
|
||||
set_repeat(Display *dpy, int key, int auto_repeat_mode)
|
||||
{
|
||||
XKeyboardControl values;
|
||||
|
||||
values.auto_repeat_mode = auto_repeat_mode;
|
||||
if (key != ALL) {
|
||||
values.key = key;
|
||||
XChangeKeyboardControl(dpy, KBKey | KBAutoRepeatMode, &values);
|
||||
} else {
|
||||
XChangeKeyboardControl(dpy, KBAutoRepeatMode, &values);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
static void
|
||||
xkbset_repeatrate(Display *dpy, int delay, int interval)
|
||||
{
|
||||
XkbDescPtr xkb = XkbAllocKeyboard();
|
||||
|
||||
if (!xkb)
|
||||
return;
|
||||
XkbGetControls(dpy, XkbRepeatKeysMask, xkb);
|
||||
xkb->ctrls->repeat_delay = delay;
|
||||
xkb->ctrls->repeat_interval = interval;
|
||||
XkbSetControls(dpy, XkbRepeatKeysMask, xkb);
|
||||
XkbFreeKeyboard(xkb, 0, True);
|
||||
}
|
||||
|
||||
/* This is the usage function */
|
||||
|
||||
static void
|
||||
usage(char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
|
||||
if (fmt) {
|
||||
fprintf(stderr, "%s: ", progName);
|
||||
va_start(ap, fmt);
|
||||
vfprintf(stderr, fmt, ap);
|
||||
va_end(ap);
|
||||
fprintf(stderr, "\n\n");
|
||||
}
|
||||
|
||||
fprintf(stderr, "usage: %s option ...\n", progName);
|
||||
fprintf(stderr, " To set mouse acceleration and threshold:\n");
|
||||
fprintf(stderr, "\t m [acc_mult[/acc_div] [thr]] m default\n");
|
||||
fprintf(stderr, " To set pixel colors:\n");
|
||||
fprintf(stderr, "\t-r [keycode] r off\n");
|
||||
fprintf(stderr, "\t r [keycode] r on\n");
|
||||
fprintf(stderr, "\t r rate [delay [rate]]\n");
|
||||
exit(EXIT_SUCCESS);
|
||||
}
|
||||
|
||||
static int
|
||||
local_xerror(Display *dpy, XErrorEvent *rep)
|
||||
{
|
||||
if (rep->request_code == X_SetFontPath && rep->error_code == BadValue) {
|
||||
fprintf(stderr,
|
||||
"%s: bad font path element (#%ld), possible causes are:\n",
|
||||
progName, rep->resourceid);
|
||||
fprintf(stderr,
|
||||
" Directory does not exist or has wrong permissions\n");
|
||||
fprintf(stderr, " Directory missing fonts.dir\n");
|
||||
fprintf(stderr, " Incorrect font server address or syntax\n");
|
||||
} else if (rep->request_code == X_StoreColors) {
|
||||
switch (rep->error_code) {
|
||||
case BadAccess:
|
||||
fprintf(stderr,
|
||||
"%s: pixel not allocated read/write\n", progName);
|
||||
break;
|
||||
case BadValue:
|
||||
fprintf(stderr,
|
||||
"%s: cannot store in pixel 0x%lx, invalid pixel number\n",
|
||||
progName, rep->resourceid);
|
||||
break;
|
||||
default:
|
||||
XmuPrintDefaultErrorMessage(dpy, rep, stderr);
|
||||
}
|
||||
} else
|
||||
XmuPrintDefaultErrorMessage(dpy, rep, stderr);
|
||||
|
||||
error_status = -1;
|
||||
|
||||
return (0);
|
||||
}
|
||||
@ -1,30 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.0-r1.ebuild,v 1.3 2010/12/19 12:21:00 ssuominen Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="X.Org xset application stripped down for just 'r' and 'm' commands"
|
||||
HOMEPAGE="http://xorg.freedesktop.org/"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
IUSE="+minimal"
|
||||
|
||||
RDEPEND="x11-libs/libXmu
|
||||
x11-libs/libX11"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S=${WORKDIR}
|
||||
|
||||
src_unpack() {
|
||||
cp "${FILESDIR}"/* ./ || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
DIST _1.0.2.orig.tar.gz 175083 SHA256 04f8c10b256e0914a38242fc4faa96d8ca64d15f546240ab8b3b491ec5e4fe33 SHA512 4d92abb61b1fa15a930bd213ada01d388c3daa603132207663b32c3b39f2137541ab145eae0e9980ce767aba77a332a4eba769ecfba92da15e90f495edf25440 WHIRLPOOL dca6970fd82cd8d3f4698d4e74b831a7ef72283e8d83f914195bb65335479ea0b0fe49f3f62fab15ff8899efecb01e583f2867be7dd8d9a2e98695f95085086c
|
||||
@ -1,201 +0,0 @@
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 6f41217..ee8f40c 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
||||
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
@@ -488,7 +488,8 @@ distdir: $(DISTFILES)
|
||||
fi; \
|
||||
done
|
||||
-test -n "$(am__skip_mode_fix)" \
|
||||
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
||||
+ || find "$(distdir)" -type d ! -perm -755 \
|
||||
+ -exec chmod u+rwx,go+rx {} \; -o \
|
||||
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|
||||
@@ -532,17 +533,17 @@ dist dist-all: distdir
|
||||
distcheck: dist
|
||||
case '$(DIST_ARCHIVES)' in \
|
||||
*.tar.gz*) \
|
||||
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
|
||||
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
|
||||
*.tar.bz2*) \
|
||||
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
|
||||
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
|
||||
*.tar.lzma*) \
|
||||
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
|
||||
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
|
||||
*.tar.xz*) \
|
||||
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
|
||||
*.tar.Z*) \
|
||||
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
||||
*.shar.gz*) \
|
||||
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
|
||||
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
|
||||
*.zip*) \
|
||||
unzip $(distdir).zip ;;\
|
||||
esac
|
||||
diff --git a/configure b/configure
|
||||
index f25c412..3b328b7 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -4837,6 +4837,54 @@ else
|
||||
fi
|
||||
|
||||
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
|
||||
+$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
|
||||
+if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
|
||||
+ $as_echo_n "(cached) " >&6
|
||||
+else
|
||||
+ ac_check_lib_save_LIBS=$LIBS
|
||||
+LIBS="-lrt $LIBS"
|
||||
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
+/* end confdefs.h. */
|
||||
+
|
||||
+/* Override any GCC internal prototype to avoid an error.
|
||||
+ Use char because int might match the return type of a GCC
|
||||
+ builtin and then its argument prototype would still apply. */
|
||||
+#ifdef __cplusplus
|
||||
+extern "C"
|
||||
+#endif
|
||||
+char clock_gettime ();
|
||||
+int
|
||||
+main ()
|
||||
+{
|
||||
+return clock_gettime ();
|
||||
+ ;
|
||||
+ return 0;
|
||||
+}
|
||||
+_ACEOF
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
+ ac_cv_lib_rt_clock_gettime=yes
|
||||
+else
|
||||
+ ac_cv_lib_rt_clock_gettime=no
|
||||
+fi
|
||||
+rm -f core conftest.err conftest.$ac_objext \
|
||||
+ conftest$ac_exeext conftest.$ac_ext
|
||||
+LIBS=$ac_check_lib_save_LIBS
|
||||
+fi
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
|
||||
+$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
|
||||
+if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
|
||||
+ cat >>confdefs.h <<_ACEOF
|
||||
+#define HAVE_LIBRT 1
|
||||
+_ACEOF
|
||||
+
|
||||
+ LIBS="-lrt $LIBS"
|
||||
+
|
||||
+else
|
||||
+ as_fn_error "Could not find librt" "$LINENO" 5
|
||||
+fi
|
||||
+
|
||||
+
|
||||
|
||||
ac_config_files="$ac_config_files Makefile"
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index d611b38..583cf97 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -24,6 +24,8 @@ LIBS="$LIBS -lsocket -lnsl"; break],[AC_MSG_ERROR([Could not find socket library
|
||||
fi
|
||||
AC_CHECK_FUNC([getaddrinfo],,[AC_MSG_ERROR([Could not find getaddrinfo library function])])
|
||||
|
||||
+AC_CHECK_LIB(rt, clock_gettime, , [AC_MSG_ERROR([Could not find librt])])
|
||||
+
|
||||
dnl AC_CHECK_HEADER(X11/X.h,[],[AC_MSG_ERROR([Could not find X11/X.h])])
|
||||
dnl AC_CHECK_HEADER(X11/Xlib.h,[],[AC_MSG_ERROR([Could not find X11/Xlib.h])])
|
||||
dnl AC_CHECK_HEADER(X11/extensions/security.h,[],[AC_MSG_ERROR([Could not find X11/extensions/secruity.h])],[#include <X11/Xlib.h>])
|
||||
diff --git a/main.c b/main.c
|
||||
index b6b27a6..a8e1725 100644
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -45,6 +45,7 @@ bool denyallextensions = false;
|
||||
bool interactive = false;
|
||||
bool print_timestamps = false;
|
||||
bool print_reltimestamps = false;
|
||||
+bool print_uptime = false;
|
||||
static bool buffered = false;
|
||||
size_t maxshownlistlen = SIZE_MAX;
|
||||
|
||||
@@ -390,7 +391,7 @@ char *strndup(const char *str,size_t n) {
|
||||
}
|
||||
#endif
|
||||
|
||||
-enum {LO_DEFAULT=0, LO_TIMESTAMPS, LO_RELTIMESTAMPS, LO_VERSION, LO_HELP};
|
||||
+enum {LO_DEFAULT=0, LO_TIMESTAMPS, LO_RELTIMESTAMPS, LO_UPTIME, LO_VERSION, LO_HELP};
|
||||
static int long_only_option = 0;
|
||||
static const struct option longoptions[] = {
|
||||
{"display", required_argument, NULL, 'd'},
|
||||
@@ -412,6 +413,7 @@ static const struct option longoptions[] = {
|
||||
{"version", no_argument, &long_only_option, LO_VERSION},
|
||||
{"timestamps", no_argument, &long_only_option, LO_TIMESTAMPS},
|
||||
{"relative-timestamps", no_argument, &long_only_option, LO_RELTIMESTAMPS},
|
||||
+ {"uptime", no_argument, &long_only_option, LO_UPTIME},
|
||||
{NULL, 0, NULL, 0}
|
||||
};
|
||||
|
||||
@@ -526,6 +528,9 @@ argv[0]);
|
||||
case LO_RELTIMESTAMPS:
|
||||
print_reltimestamps = true;
|
||||
break;
|
||||
+ case LO_UPTIME:
|
||||
+ print_uptime = true;
|
||||
+ break;
|
||||
}
|
||||
break;
|
||||
case ':':
|
||||
diff --git a/parse.c b/parse.c
|
||||
index 8bdd363..b808766 100644
|
||||
--- a/parse.c
|
||||
+++ b/parse.c
|
||||
@@ -27,6 +27,7 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/select.h>
|
||||
+#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "xtrace.h"
|
||||
@@ -46,6 +47,7 @@ static inline unsigned int padded(unsigned int s) {
|
||||
static void startline(struct connection *c, enum package_direction d, const char *format, ...) {
|
||||
va_list ap;
|
||||
struct timeval tv;
|
||||
+ struct timespec ts;
|
||||
|
||||
if( (print_timestamps || print_reltimestamps)
|
||||
&& gettimeofday(&tv, NULL) == 0 ) {
|
||||
@@ -60,6 +62,10 @@ static void startline(struct connection *c, enum package_direction d, const char
|
||||
(unsigned int)((tt - c->starttime)%1000));
|
||||
}
|
||||
}
|
||||
+ if( print_uptime && clock_gettime(CLOCK_MONOTONIC, &ts ) == 0 ) {
|
||||
+ fprintf(out, "%lu.%03u ", (unsigned long)ts.tv_sec,
|
||||
+ (unsigned int)(ts.tv_nsec/1000000));
|
||||
+ }
|
||||
va_start(ap, format);
|
||||
fprintf(out, "%03d:%c:", c->id, (d == TO_SERVER)?'<':'>');
|
||||
vfprintf(out, format, ap);
|
||||
@@ -1749,4 +1755,3 @@ const struct extension *find_extension(const uint8_t *name,size_t len) {
|
||||
|
||||
return NULL;
|
||||
}
|
||||
-
|
||||
diff --git a/xtrace.h b/xtrace.h
|
||||
index 95a725a..1c9bd4a 100644
|
||||
--- a/xtrace.h
|
||||
+++ b/xtrace.h
|
||||
@@ -46,6 +46,7 @@ extern bool denyallextensions;
|
||||
extern size_t maxshownlistlen;
|
||||
extern bool print_timestamps;
|
||||
extern bool print_reltimestamps;
|
||||
+extern bool print_uptime;
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define UNUSED __attribute__ ((unused))
|
||||
@ -1,198 +0,0 @@
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index ba359c2..c611a14 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -12,7 +12,7 @@ dist_man_MANS = xtrace.1
|
||||
|
||||
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/configure $(srcdir)/stamp-h.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
|
||||
|
||||
-dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto vidmode.proto xinerama.proto xinput.proto xkb.proto
|
||||
+dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto sync.proto vidmode.proto xinerama.proto xinput.proto xkb.proto
|
||||
|
||||
distclean-local:
|
||||
-rm -rf $(srcdir)/autom4te.cache
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 6f41217..a611645 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -204,7 +204,7 @@ xtrace_LDFLAGS = -Wl,-z,defs
|
||||
noinst_HEADERS = xtrace.h parse.h stringlist.h translate.h
|
||||
dist_man_MANS = xtrace.1
|
||||
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/configure $(srcdir)/stamp-h.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
|
||||
-dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto vidmode.proto xinerama.proto xinput.proto xkb.proto
|
||||
+dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto sync.proto vidmode.proto xinerama.proto xinput.proto xkb.proto
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||
|
||||
diff --git a/all.proto b/all.proto
|
||||
index b2fd22d..23d873d 100644
|
||||
--- a/all.proto
|
||||
+++ b/all.proto
|
||||
@@ -14,6 +14,7 @@ NEEDS "randr.proto"
|
||||
NEEDS "render.proto"
|
||||
NEEDS "saver.proto"
|
||||
NEEDS "shape.proto"
|
||||
+NEEDS "sync.proto"
|
||||
NEEDS "vidmode.proto"
|
||||
NEEDS "xinerama.proto"
|
||||
NEEDS "xinput.proto"
|
||||
diff --git a/sync.proto b/sync.proto
|
||||
new file mode 100644
|
||||
index 0000000..e593c18
|
||||
--- /dev/null
|
||||
+++ b/sync.proto
|
||||
@@ -0,0 +1,154 @@
|
||||
+EXTENSION "SYNC" Sync
|
||||
+USE core
|
||||
+
|
||||
+REQUESTS
|
||||
+Initialize RESPONDS
|
||||
+ListSystemCounters RESPONDS
|
||||
+CreateCounter
|
||||
+SetCounter
|
||||
+ChangeCounter
|
||||
+QueryCounter RESPONDS
|
||||
+DestroyCounter
|
||||
+Await
|
||||
+CreateAlarm
|
||||
+ChangeAlarm
|
||||
+QueryAlarm RESPONDS
|
||||
+DestroyAlarm
|
||||
+SetPriority
|
||||
+GetPriority RESPONDS
|
||||
+END
|
||||
+
|
||||
+EVENTS
|
||||
+CounterNotify
|
||||
+AlarmNotify
|
||||
+END
|
||||
+
|
||||
+ERRORS
|
||||
+BadCounter
|
||||
+BadAlarm
|
||||
+END
|
||||
+
|
||||
+CONSTANTS alarm_state
|
||||
+0 Active
|
||||
+1 Inactive
|
||||
+2 Destroyed
|
||||
+END
|
||||
+TYPE ALARM_STATE ENUM8 alarm_state
|
||||
+
|
||||
+CONSTANTS test_type
|
||||
+0 PositiveTransition
|
||||
+1 NegativeTransition
|
||||
+2 PositiveComparison
|
||||
+3 NegativeComparison
|
||||
+END
|
||||
+TYPE TEST_TYPE ENUM32 test_type
|
||||
+
|
||||
+REQUEST Initialize
|
||||
+ 4 major-version UINT8
|
||||
+ 5 minor-version UINT8
|
||||
+END
|
||||
+RESPONSE Initialize
|
||||
+ 8 major-version UINT16
|
||||
+ 9 minor-version UINT16
|
||||
+END
|
||||
+
|
||||
+REQUEST ListSystemCounters ALIASES Empty
|
||||
+RESPONSE ListSystemCounters
|
||||
+ 8 num-counters INT32
|
||||
+END
|
||||
+
|
||||
+REQUEST CreateCounter
|
||||
+ 4 counter UINT32
|
||||
+ 8 initial-value-high INT32
|
||||
+12 initial-value-low UINT32
|
||||
+END
|
||||
+
|
||||
+REQUEST SetCounter
|
||||
+ 4 counter UINT32
|
||||
+ 8 initial-value-high INT32
|
||||
+12 initial-value-low UINT32
|
||||
+END
|
||||
+
|
||||
+REQUEST ChangeCounter
|
||||
+ 4 counter UINT32
|
||||
+ 8 initial-value-high INT32
|
||||
+12 initial-value-low UINT32
|
||||
+END
|
||||
+
|
||||
+REQUEST QueryCounter
|
||||
+ 4 counter UINT32
|
||||
+END
|
||||
+RESPONSE QueryCounter
|
||||
+ 8 value-high INT32
|
||||
+12 value-low UINT32
|
||||
+END
|
||||
+
|
||||
+REQUEST DestroyCounter
|
||||
+ 4 counter UINT32
|
||||
+END
|
||||
+
|
||||
+REQUEST Await ALIASES Empty
|
||||
+
|
||||
+REQUEST CreateAlarm
|
||||
+ 4 alarm UINT32
|
||||
+ 8 value-mask UINT32
|
||||
+END
|
||||
+
|
||||
+REQUEST ChangeAlarm
|
||||
+ 4 alarm UINT32
|
||||
+ 8 value-mask UINT32
|
||||
+END
|
||||
+
|
||||
+REQUEST QueryAlarm
|
||||
+ 4 alarm UINT32
|
||||
+END
|
||||
+RESPONSE QueryAlarm
|
||||
+ 8 counter UINT32
|
||||
+12 value-type UINT32
|
||||
+16 wait-value-high INT32
|
||||
+20 wait-value-low UINT32
|
||||
+24 test-type TEST_TYPE
|
||||
+28 delta-high INT32
|
||||
+32 delta-low UINT32
|
||||
+36 events BOOL
|
||||
+37 state ALARM_STATE
|
||||
+END
|
||||
+
|
||||
+REQUEST DestroyAlarm
|
||||
+ 4 alarm UINT32
|
||||
+END
|
||||
+
|
||||
+REQUEST SetPriority
|
||||
+ 4 id UINT32
|
||||
+ 8 priority INT32
|
||||
+END
|
||||
+
|
||||
+REQUEST GetPriority
|
||||
+ 4 id UINT32
|
||||
+END
|
||||
+RESPONSE GetPriority
|
||||
+ 8 priority INT32
|
||||
+END
|
||||
+
|
||||
+EVENT CounterNotify
|
||||
+ 4 counter UINT32
|
||||
+ 8 wait-value-high INT32
|
||||
+12 wait-value-low UINT32
|
||||
+16 counter-value-high INT32
|
||||
+20 counter-value-low UINT32
|
||||
+24 time TIMESTAMP
|
||||
+28 count INT16
|
||||
+30 destroyed BOOL
|
||||
+END
|
||||
+
|
||||
+EVENT AlarmNotify
|
||||
+ 4 alarm UINT32
|
||||
+ 8 counter-value-high INT32
|
||||
+12 counter-value-low UINT32
|
||||
+16 alarm-value-high INT32
|
||||
+20 alarm-value-low UINT32
|
||||
+24 time TIMESTAMP
|
||||
+28 state ALARM_STATE
|
||||
+END
|
||||
+
|
||||
+EOF
|
||||
@ -1,27 +0,0 @@
|
||||
# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=2
|
||||
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="X11 proxy that logs communication between a client and a server"
|
||||
HOMEPAGE="http://xtrace.alioth.debian.org/"
|
||||
SRC_URI="http://alioth.debian.org/frs/download.php/3201/${MY_PN}_${PV}.orig.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="x11-libs/libX11"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PV}-print-uptime.patch
|
||||
epatch "${FILESDIR}"/${PV}-sync-extension.patch
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
}
|
||||
@ -1,154 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild,v 1.3 2012/03/24 16:30:25 chithanh Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="Meta package containing deps on all xorg drivers"
|
||||
HOMEPAGE="http://www.gentoo.org/"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="as-is"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
|
||||
|
||||
IUSE_INPUT_DEVICES="
|
||||
input_devices_acecad
|
||||
input_devices_aiptek
|
||||
input_devices_cmt
|
||||
input_devices_elographics
|
||||
input_devices_evdev
|
||||
input_devices_fpit
|
||||
input_devices_hyperpen
|
||||
input_devices_joystick
|
||||
input_devices_keyboard
|
||||
input_devices_mouse
|
||||
input_devices_mutouch
|
||||
input_devices_penmount
|
||||
input_devices_tslib
|
||||
input_devices_vmmouse
|
||||
input_devices_void
|
||||
input_devices_synaptics
|
||||
input_devices_wacom
|
||||
"
|
||||
IUSE_VIDEO_CARDS="
|
||||
video_cards_ark
|
||||
video_cards_ast
|
||||
video_cards_cirrus
|
||||
video_cards_dummy
|
||||
video_cards_epson
|
||||
video_cards_fbdev
|
||||
video_cards_geode
|
||||
video_cards_glint
|
||||
video_cards_i128
|
||||
video_cards_i740
|
||||
video_cards_intel
|
||||
video_cards_mach64
|
||||
video_cards_mga
|
||||
video_cards_neomagic
|
||||
video_cards_newport
|
||||
video_cards_nouveau
|
||||
video_cards_nv
|
||||
video_cards_omapfb
|
||||
video_cards_qxl
|
||||
video_cards_r128
|
||||
video_cards_radeon
|
||||
video_cards_s3
|
||||
video_cards_savage
|
||||
video_cards_siliconmotion
|
||||
video_cards_sis
|
||||
video_cards_sunbw2
|
||||
video_cards_suncg14
|
||||
video_cards_suncg3
|
||||
video_cards_suncg6
|
||||
video_cards_sunffb
|
||||
video_cards_sunleo
|
||||
video_cards_suntcx
|
||||
video_cards_tdfx
|
||||
video_cards_tga
|
||||
video_cards_trident
|
||||
video_cards_v4l
|
||||
video_cards_vesa
|
||||
video_cards_via
|
||||
video_cards_virtualbox
|
||||
video_cards_vmware
|
||||
video_cards_voodoo
|
||||
video_cards_fglrx
|
||||
video_cards_nvidia
|
||||
"
|
||||
|
||||
IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
|
||||
|
||||
PDEPEND="
|
||||
input_devices_acecad? ( x11-drivers/xf86-input-acecad )
|
||||
input_devices_aiptek? ( x11-drivers/xf86-input-aiptek )
|
||||
input_devices_cmt? ( x11-drivers/xf86-input-cmt )
|
||||
input_devices_elographics? ( x11-drivers/xf86-input-elographics )
|
||||
input_devices_evdev? ( x11-drivers/xf86-input-evdev )
|
||||
input_devices_fpit? ( x11-drivers/xf86-input-fpit )
|
||||
input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen )
|
||||
input_devices_joystick? ( x11-drivers/xf86-input-joystick )
|
||||
input_devices_keyboard? ( x11-drivers/xf86-input-keyboard )
|
||||
input_devices_mouse? ( x11-drivers/xf86-input-mouse )
|
||||
input_devices_mutouch? ( x11-drivers/xf86-input-mutouch )
|
||||
input_devices_penmount? ( x11-drivers/xf86-input-penmount )
|
||||
input_devices_tslib? ( x11-drivers/xf86-input-tslib )
|
||||
input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse )
|
||||
input_devices_void? ( x11-drivers/xf86-input-void )
|
||||
input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
|
||||
input_devices_wacom? ( x11-drivers/xf86-input-wacom )
|
||||
|
||||
video_cards_ark? ( x11-drivers/xf86-video-ark )
|
||||
video_cards_ast? ( x11-drivers/xf86-video-ast )
|
||||
video_cards_cirrus? ( x11-drivers/xf86-video-cirrus )
|
||||
video_cards_dummy? ( x11-drivers/xf86-video-dummy )
|
||||
video_cards_fbdev? ( x11-drivers/xf86-video-fbdev )
|
||||
video_cards_geode? ( x11-drivers/xf86-video-geode )
|
||||
video_cards_glint? ( x11-drivers/xf86-video-glint )
|
||||
video_cards_i128? ( x11-drivers/xf86-video-i128 )
|
||||
video_cards_i740? ( x11-drivers/xf86-video-i740 )
|
||||
video_cards_intel? ( x11-drivers/xf86-video-intel )
|
||||
video_cards_mach64? ( x11-drivers/xf86-video-mach64 )
|
||||
video_cards_mga? ( x11-drivers/xf86-video-mga )
|
||||
video_cards_neomagic? ( x11-drivers/xf86-video-neomagic )
|
||||
video_cards_newport? ( x11-drivers/xf86-video-newport )
|
||||
video_cards_nouveau? ( x11-drivers/xf86-video-nouveau )
|
||||
video_cards_nv? ( x11-drivers/xf86-video-nv )
|
||||
video_cards_omapfb? ( x11-drivers/xf86-video-omapfb )
|
||||
video_cards_qxl? ( x11-drivers/xf86-video-qxl )
|
||||
video_cards_nvidia? ( x11-drivers/nvidia-drivers )
|
||||
video_cards_fglrx? ( x11-drivers/ati-drivers )
|
||||
video_cards_r128? ( x11-drivers/xf86-video-r128 )
|
||||
video_cards_radeon? ( x11-drivers/xf86-video-ati )
|
||||
video_cards_s3? ( x11-drivers/xf86-video-s3 )
|
||||
video_cards_savage? ( x11-drivers/xf86-video-savage )
|
||||
video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion )
|
||||
video_cards_sis? ( x11-drivers/xf86-video-sis )
|
||||
video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 )
|
||||
video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 )
|
||||
video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 )
|
||||
video_cards_sunffb? ( x11-drivers/xf86-video-sunffb )
|
||||
video_cards_sunleo? ( x11-drivers/xf86-video-sunleo )
|
||||
video_cards_suntcx? ( x11-drivers/xf86-video-suntcx )
|
||||
video_cards_tdfx? ( x11-drivers/xf86-video-tdfx )
|
||||
video_cards_tga? ( x11-drivers/xf86-video-tga )
|
||||
video_cards_trident? ( x11-drivers/xf86-video-trident )
|
||||
video_cards_v4l? ( x11-drivers/xf86-video-v4l )
|
||||
video_cards_vesa? ( x11-drivers/xf86-video-vesa )
|
||||
video_cards_via? ( x11-drivers/xf86-video-openchrome )
|
||||
video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox )
|
||||
video_cards_vmware? ( x11-drivers/xf86-video-vmware )
|
||||
video_cards_voodoo? ( x11-drivers/xf86-video-voodoo )
|
||||
|
||||
!x11-drivers/xf86-input-citron
|
||||
!<=x11-drivers/xf86-video-apm-1.2.3
|
||||
!<=x11-drivers/xf86-video-chips-1.2.4
|
||||
!x11-drivers/xf86-video-cyrix
|
||||
!x11-drivers/xf86-video-impact
|
||||
!x11-drivers/xf86-video-nsc
|
||||
!<=x11-drivers/xf86-video-rendition-4.2.4
|
||||
!<=x11-drivers/xf86-video-s3virge-1.10.4
|
||||
!<=x11-drivers/xf86-video-sisusb-0.9.4
|
||||
!x11-drivers/xf86-video-sunbw2
|
||||
!<=x11-drivers/xf86-video-tseng-1.2.4
|
||||
"
|
||||
@ -1 +0,0 @@
|
||||
DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98
|
||||
@ -1,22 +0,0 @@
|
||||
diff --git a/dix/window.c b/dix/window.c
|
||||
index 823294b..d293e90 100644
|
||||
--- a/dix/window.c
|
||||
+++ b/dix/window.c
|
||||
@@ -1083,12 +1083,8 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
|
||||
if (pixID == None) {
|
||||
if (pWin->backgroundState == BackgroundPixmap)
|
||||
(*pScreen->DestroyPixmap) (pWin->background.pixmap);
|
||||
- if (!pWin->parent)
|
||||
- SetRootWindowBackground(pWin, pScreen, &index2);
|
||||
- else {
|
||||
- pWin->backgroundState = XaceBackgroundNoneState(pWin);
|
||||
- pWin->background.pixel = pScreen->whitePixel;
|
||||
- }
|
||||
+ pWin->backgroundState = XaceBackgroundNoneState(pWin);
|
||||
+ pWin->background.pixel = pScreen->whitePixel;
|
||||
}
|
||||
else if (pixID == ParentRelative) {
|
||||
if (pWin->parent &&
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,333 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f94b88c..03beb36 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -515,9 +515,9 @@ AC_MSG_RESULT([$FONTPATH])
|
||||
AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
|
||||
[ XKBPATH="$withval" ],
|
||||
[ XKBPATH="${datadir}/X11/xkb" ])
|
||||
-AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),
|
||||
+AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${localstatedir}/cache/xkb)]),
|
||||
[ XKBOUTPUT="$withval" ],
|
||||
- [ XKBOUTPUT="compiled" ])
|
||||
+ [ XKBOUTPUT="${localstatedir}/cache/xkb" ])
|
||||
AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES],
|
||||
[Keyboard ruleset (default: base/evdev)]),
|
||||
[ XKB_DFLT_RULES="$withval" ],
|
||||
@@ -1202,7 +1202,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir])
|
||||
dnl Make sure XKM_OUTPUT_DIR is an absolute path
|
||||
XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
|
||||
if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
|
||||
- XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
|
||||
+ AC_MSG_ERROR([xkb-output must be an absolute path.])
|
||||
fi
|
||||
|
||||
dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
|
||||
diff --git a/xkb/README.compiled b/xkb/README.compiled
|
||||
index 71caa2f..a4a2ae0 100644
|
||||
--- a/xkb/README.compiled
|
||||
+++ b/xkb/README.compiled
|
||||
@@ -4,10 +4,10 @@ current keymap and/or any scratch keymaps used by clients. The X server
|
||||
or some other tool might destroy or replace the files in this directory,
|
||||
so it is not a safe place to store compiled keymaps for long periods of
|
||||
time. The default keymap for any server is usually stored in:
|
||||
- X<num>-default.xkm
|
||||
-where <num> is the display number of the server in question, which makes
|
||||
-it possible for several servers *on the same host* to share the same
|
||||
-directory.
|
||||
+ server-<SHA1>.xkm
|
||||
+
|
||||
+where <SHA1> is the SHA1 hash of keymap source, so that compiled
|
||||
+keymap of different keymap sources are stored in different files.
|
||||
|
||||
Unless the X server is modified, sharing this directory between servers on
|
||||
different hosts could cause problems.
|
||||
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
|
||||
index 1961423..411b677 100644
|
||||
--- a/xkb/ddxLoad.c
|
||||
+++ b/xkb/ddxLoad.c
|
||||
@@ -30,6 +30,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
#include <xkb-config.h>
|
||||
|
||||
+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
|
||||
+# include <sha1.h>
|
||||
+#else /* Use OpenSSL's libcrypto */
|
||||
+# include <stddef.h> /* buggy openssl/sha.h wants size_t */
|
||||
+# include <openssl/sha.h>
|
||||
+#endif
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <X11/X.h>
|
||||
@@ -43,20 +49,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
#define XKBSRV_NEED_FILE_FUNCS
|
||||
#include <xkbsrv.h>
|
||||
#include <X11/extensions/XI.h>
|
||||
+#include <errno.h>
|
||||
#include "xkb.h"
|
||||
|
||||
- /*
|
||||
- * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is
|
||||
- * relative to the top-level XKB configuration directory.
|
||||
- * Making the server write to a subdirectory of that directory
|
||||
- * requires some work in the general case (install procedure
|
||||
- * has to create links to /var or somesuch on many machines),
|
||||
- * so we just compile into /usr/tmp for now.
|
||||
- */
|
||||
-#ifndef XKM_OUTPUT_DIR
|
||||
-#define XKM_OUTPUT_DIR "compiled/"
|
||||
-#endif
|
||||
-
|
||||
#define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
|
||||
#define ERROR_PREFIX "\"> \""
|
||||
#define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\""
|
||||
@@ -166,13 +161,56 @@ OutputDirectory(char *outdir, size_t size)
|
||||
}
|
||||
|
||||
static Bool
|
||||
+Sha1Asc(char sha1Asc[SHA_DIGEST_LENGTH*2+1], const char * input)
|
||||
+{
|
||||
+ int i;
|
||||
+ unsigned char sha1[SHA_DIGEST_LENGTH];
|
||||
+
|
||||
+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
|
||||
+ SHA1_CTX ctx;
|
||||
+
|
||||
+ SHA1Init (&ctx);
|
||||
+ SHA1Update (&ctx, input, strlen(input));
|
||||
+ SHA1Final (sha1, &ctx);
|
||||
+#else /* Use OpenSSL's libcrypto */
|
||||
+ SHA_CTX ctx;
|
||||
+ int success;
|
||||
+
|
||||
+ success = SHA1_Init (&ctx);
|
||||
+ if (! success)
|
||||
+ return BadAlloc;
|
||||
+
|
||||
+ success = SHA1_Update (&ctx, input, strlen(input));
|
||||
+ if (! success)
|
||||
+ return BadAlloc;
|
||||
+
|
||||
+ success = SHA1_Final (sha1, &ctx);
|
||||
+ if (! success)
|
||||
+ return BadAlloc;
|
||||
+#endif
|
||||
+
|
||||
+ /* convert sha1 to sha1_asc */
|
||||
+ for(i=0; i<SHA_DIGEST_LENGTH; ++i) {
|
||||
+ sprintf(sha1Asc+i*2, "%02X", sha1[i]);
|
||||
+ }
|
||||
+
|
||||
+ return Success;
|
||||
+}
|
||||
+
|
||||
+/* call xkbcomp and compile XKB keymap, return xkm file name in
|
||||
+ nameRtrn */
|
||||
+static Bool
|
||||
XkbDDXCompileKeymapByNames(XkbDescPtr xkb,
|
||||
XkbComponentNamesPtr names,
|
||||
unsigned want,
|
||||
unsigned need, char *nameRtrn, int nameRtrnLen)
|
||||
{
|
||||
FILE *out;
|
||||
- char *buf = NULL, keymap[PATH_MAX], xkm_output_dir[PATH_MAX];
|
||||
+ char *buf = NULL, xkmfile[PATH_MAX], xkm_output_dir[PATH_MAX];
|
||||
+ char *tmpXkmFile = NULL;
|
||||
+ char *canonicalXkmFileName = NULL;
|
||||
+ char sha1Asc[SHA_DIGEST_LENGTH*2+1], xkbKeyMapBuf[100*1024];
|
||||
+ int ret, result;
|
||||
|
||||
const char *emptystring = "";
|
||||
char *xkbbasedirflag = NULL;
|
||||
@@ -183,15 +221,67 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb,
|
||||
/* WIN32 has no popen. The input must be stored in a file which is
|
||||
used as input for xkbcomp. xkbcomp does not read from stdin. */
|
||||
char tmpname[PATH_MAX];
|
||||
- const char *xkmfile = tmpname;
|
||||
+ const char *xkbfile = tmpname;
|
||||
#else
|
||||
- const char *xkmfile = "-";
|
||||
+ const char *xkbfile = "-";
|
||||
+#endif
|
||||
+
|
||||
+ /* Write keymap source (xkbfile) to memory buffer `xkbKeyMapBuf',
|
||||
+ of which SHA1 is generated and used as result xkm file name */
|
||||
+ memset(xkbKeyMapBuf, 0, sizeof(xkbKeyMapBuf));
|
||||
+ out = fmemopen(xkbKeyMapBuf, sizeof(xkbKeyMapBuf), "w");
|
||||
+ if (NULL == out) {
|
||||
+ ErrorF("[xkb] Open xkbKeyMapBuf for writing failed\n");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+ ret = XkbWriteXKBKeymapForNames(out, names, xkb, want, need);
|
||||
+ if (fclose(out) !=0) {
|
||||
+ ErrorF("[xkb] XkbWriteXKBKeymapForNames error, perhaps xkbKeyMapBuf is too small\n");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+#ifdef DEBUG
|
||||
+ if (xkbDebugFlags) {
|
||||
+ ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
|
||||
+ fputs(xkbKeyMapBuf, stderr);
|
||||
+ }
|
||||
#endif
|
||||
+ if (!ret) {
|
||||
+ ErrorF("[xkb] Generating XKB Keymap failed, giving up compiling keymap\n");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
|
||||
- snprintf(keymap, sizeof(keymap), "server-%s", display);
|
||||
+ DebugF("[xkb] computing SHA1 of keymap\n");
|
||||
+ if (Success == Sha1Asc(sha1Asc, xkbKeyMapBuf)) {
|
||||
+ snprintf(xkmfile, sizeof(xkmfile), "server-%s", sha1Asc);
|
||||
+ } else {
|
||||
+ ErrorF("[xkb] Computing SHA1 of keymap failed, "
|
||||
+ "using display name instead as xkm file name\n");
|
||||
+ snprintf(xkmfile, sizeof(xkmfile), "server-%s", display);
|
||||
+ }
|
||||
|
||||
OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
|
||||
|
||||
+ /* set nameRtrn, fail if it's too small */
|
||||
+ if ((strlen(xkmfile)+1 > nameRtrnLen) && nameRtrn) {
|
||||
+ ErrorF("[xkb] nameRtrn too small to hold xkmfile name\n");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+ strncpy(nameRtrn, xkmfile, nameRtrnLen);
|
||||
+
|
||||
+ /* if the xkm file already exists, reuse it */
|
||||
+ canonicalXkmFileName = Xprintf("%s%s.xkm", xkm_output_dir, xkmfile);
|
||||
+ if (access(canonicalXkmFileName, R_OK) == 0) {
|
||||
+ /* yes, we can reuse the old xkm file */
|
||||
+ LogMessage(X_INFO, "XKB: reuse xkmfile %s\n", canonicalXkmFileName);
|
||||
+ result = TRUE;
|
||||
+ goto _ret;
|
||||
+ }
|
||||
+ LogMessage(X_INFO, "XKB: generating xkmfile %s\n", canonicalXkmFileName);
|
||||
+
|
||||
+ /* continue to call xkbcomp to compile the keymap. to avoid race
|
||||
+ condition, we compile it to a tmpfile then rename it to
|
||||
+ xkmfile */
|
||||
+
|
||||
#ifdef WIN32
|
||||
strcpy(tmpname, Win32TempDir());
|
||||
strcat(tmpname, "\\xkb_XXXXXX");
|
||||
@@ -214,15 +304,21 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb,
|
||||
}
|
||||
}
|
||||
|
||||
+ if ( (tmpXkmFile = tempnam(xkm_output_dir, NULL)) == NULL ) {
|
||||
+ ErrorF("[xkb] Can't generate temp xkm file name");
|
||||
+ result = FALSE;
|
||||
+ goto _ret;
|
||||
+ }
|
||||
+
|
||||
if (asprintf(&buf,
|
||||
"\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" "
|
||||
- "-em1 %s -emp %s -eml %s \"%s%s.xkm\"",
|
||||
+ "-em1 %s -emp %s -eml %s \"%s\"",
|
||||
xkbbindir, xkbbindirsep,
|
||||
((xkbDebugFlags < 2) ? 1 :
|
||||
((xkbDebugFlags > 10) ? 10 : (int) xkbDebugFlags)),
|
||||
- xkbbasedirflag ? xkbbasedirflag : "", xkmfile,
|
||||
+ xkbbasedirflag ? xkbbasedirflag : "", xkbfile,
|
||||
PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1,
|
||||
- xkm_output_dir, keymap) == -1)
|
||||
+ tmpXkmFile) == -1)
|
||||
buf = NULL;
|
||||
|
||||
free(xkbbasedirflag);
|
||||
@@ -233,6 +329,11 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb,
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
+ /* there's a potential race condition between calling tempnam()
|
||||
+ and invoking xkbcomp to write the result file (potential temp
|
||||
+ file name conflicts), but since xkbcomp is a standalone
|
||||
+ program, we have to live with this */
|
||||
+
|
||||
#ifndef WIN32
|
||||
out = Popen(buf, "w");
|
||||
#else
|
||||
@@ -240,32 +341,41 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb,
|
||||
#endif
|
||||
|
||||
if (out != NULL) {
|
||||
-#ifdef DEBUG
|
||||
- if (xkbDebugFlags) {
|
||||
- ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
|
||||
- XkbWriteXKBKeymapForNames(stderr, names, xkb, want, need);
|
||||
+ /* write XKBKeyMapBuf to xkbcomp */
|
||||
+ if (EOF==fputs(xkbKeyMapBuf, out))
|
||||
+ {
|
||||
+ ErrorF("[xkb] Sending keymap to xkbcomp failed\n");
|
||||
+ result = FALSE;
|
||||
+ goto _ret;
|
||||
}
|
||||
-#endif
|
||||
- XkbWriteXKBKeymapForNames(out, names, xkb, want, need);
|
||||
#ifndef WIN32
|
||||
if (Pclose(out) == 0)
|
||||
#else
|
||||
if (fclose(out) == 0 && System(buf) >= 0)
|
||||
#endif
|
||||
{
|
||||
+ /* xkbcomp success */
|
||||
if (xkbDebugFlags)
|
||||
DebugF("[xkb] xkb executes: %s\n", buf);
|
||||
- if (nameRtrn) {
|
||||
- strlcpy(nameRtrn, keymap, nameRtrnLen);
|
||||
+ /* if canonicalXkmFileName already exists now, we simply
|
||||
+ overwrite it, this is OK */
|
||||
+ ret = rename(tmpXkmFile, canonicalXkmFileName);
|
||||
+ if (0 != ret) {
|
||||
+ ErrorF("[xkb] Can't rename %s to %s, error: %s\n",
|
||||
+ tmpXkmFile, canonicalXkmFileName,
|
||||
+ strerror(errno));
|
||||
+
|
||||
+ /* in case of error, don't unlink tmpXkmFile, leave it
|
||||
+ for debugging */
|
||||
+
|
||||
+ result = FALSE;
|
||||
+ goto _ret;
|
||||
}
|
||||
- free(buf);
|
||||
-#ifdef WIN32
|
||||
- unlink(tmpname);
|
||||
-#endif
|
||||
- return TRUE;
|
||||
+ result = TRUE;
|
||||
+ goto _ret;
|
||||
}
|
||||
else
|
||||
- LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap);
|
||||
+ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile);
|
||||
#ifdef WIN32
|
||||
/* remove the temporary file */
|
||||
unlink(tmpname);
|
||||
@@ -280,8 +390,15 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb,
|
||||
}
|
||||
if (nameRtrn)
|
||||
nameRtrn[0] = '\0';
|
||||
+ result = FALSE;
|
||||
+
|
||||
+_ret:
|
||||
+ if (tmpXkmFile)
|
||||
+ free(tmpXkmFile);
|
||||
+ if (canonicalXkmFileName)
|
||||
+ xfree(canonicalXkmFileName);
|
||||
free(buf);
|
||||
- return FALSE;
|
||||
+ return result;
|
||||
}
|
||||
|
||||
static FILE *
|
||||
@@ -368,7 +485,6 @@ XkbDDXLoadKeymapByNames(DeviceIntPtr keybd,
|
||||
(*xkbRtrn)->defined);
|
||||
}
|
||||
fclose(file);
|
||||
- (void) unlink(fileName);
|
||||
return (need | want) & (~missing);
|
||||
}
|
||||
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,113 +0,0 @@
|
||||
diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c
|
||||
index 30e14b1..ea447a8 100644
|
||||
--- a/dix/ptrveloc.c
|
||||
+++ b/dix/ptrveloc.c
|
||||
@@ -863,6 +863,82 @@ PowerProfile(DeviceIntPtr dev,
|
||||
}
|
||||
|
||||
/**
|
||||
+ * Computes Acceleration based on the Chromium acceleration algorithm.
|
||||
+ * This algorithm was taken from our Chromium MultiTouch touchpad driver.
|
||||
+ * We think about acceleration curve taking an input velocity and returning
|
||||
+ * an output velocity. The shape of the curve is parabolic at the low end
|
||||
+ * and then at a certain point, it continues straight. The curve operates
|
||||
+ * in units of inches/second.
|
||||
+ *
|
||||
+ * Note that X acceleration profile functions operate using very different
|
||||
+ * units, generally, so a little bit of gynmastics is required to fit our
|
||||
+ * curve to the X convention.
|
||||
+ *
|
||||
+ * Inputs:
|
||||
+ * velocity: mouse velocity in inches per millisecond[1]
|
||||
+ * threshold: if greater than 0, the X cutoff in 100ths of an inch/sec
|
||||
+ * acc: multiplier applied to output, for user's speed preferences, multiplied
|
||||
+ * by screen resolution (DPI). A good default for the user prefs is 1.0.
|
||||
+ * A good default for the screen resolution is 125.[2]
|
||||
+ *
|
||||
+ * Outputs:
|
||||
+ * Returns a multiplier m such that m * mouse counts = screen pixels.
|
||||
+ *
|
||||
+ * [1] To get this value to be inches per millisecond, the following xinput
|
||||
+ * properties must be set accordingly:
|
||||
+ * "Device Accel Velocity Scaling": 1.0
|
||||
+ * "Device Accel Constant Deceleration": CPI (Counts per inch)
|
||||
+ *
|
||||
+ * [2] To set this value for a particular device, do:
|
||||
+ * xinput set-ptr-feedback <device> 0 acc 1 # 0=thresh, acc/1 = num/den
|
||||
+ * or for all devices(?):
|
||||
+ * xset m acc/1 0 # num/den thresh
|
||||
+ *
|
||||
+ * Note about CPI: CPI is the resolution of the mouse. Many common mice at the
|
||||
+ * time of writing have a CPI of approximately 1000, so that may be a good
|
||||
+ * default value.
|
||||
+ */
|
||||
+static double
|
||||
+ChromiumMouseProfile(
|
||||
+ DeviceIntPtr dev,
|
||||
+ DeviceVelocityPtr vel,
|
||||
+ double velocity,
|
||||
+ double threshold,
|
||||
+ double acc)
|
||||
+{
|
||||
+ /* Parabola: v_out = a * v_in^2 + b * v_in
|
||||
+ Line: v_out = m * v_in + b */
|
||||
+ /* These three constants seem to work well */
|
||||
+ const float kParabolaA = 1.3;
|
||||
+ const float kParabolaB = 0.2;
|
||||
+ /* v_in where we switch from parab. to line: */
|
||||
+ const float kCutoffX = threshold > 0 ? threshold * 0.01 : 8.0;
|
||||
+ const float kCutoffY =
|
||||
+ kParabolaA * kCutoffX * kCutoffX + kParabolaB * kCutoffX;
|
||||
+ /* d/dx (ax^2 + bx) = 2ax + 1 */
|
||||
+ const float kLineM = 2.0 * kParabolaA * kCutoffX + kParabolaB;
|
||||
+ const float kLineB = kCutoffY - kCutoffX * kLineM;
|
||||
+
|
||||
+ float inch_per_sec = velocity * 1000.0; // inches/ms -> inches/s
|
||||
+ float new_inch_per_sec;
|
||||
+ if (velocity == 0.0)
|
||||
+ return 1.0;
|
||||
+
|
||||
+ /* acc defaults to a very small value, so if we see it, pick a better
|
||||
+ default. It probably means that the user doesn't know how to properly
|
||||
+ use this accel profile, but it sucks if we cause super slow mouse
|
||||
+ movement. */
|
||||
+ if (acc < 50.0)
|
||||
+ acc = 225.0;
|
||||
+
|
||||
+ if (inch_per_sec <= kCutoffX)
|
||||
+ return (kParabolaA * inch_per_sec + kParabolaB) * acc;
|
||||
+ else
|
||||
+ new_inch_per_sec = kLineM * inch_per_sec + kLineB;
|
||||
+ return acc * new_inch_per_sec / inch_per_sec;
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
* just a smooth function in [0..1] -> [0..1]
|
||||
* - point symmetry at 0.5
|
||||
* - f'(0) = f'(1) = 0
|
||||
@@ -988,6 +1064,8 @@ GetAccelerationProfile(DeviceVelocityPtr vel, int profile_num)
|
||||
return LinearProfile;
|
||||
case AccelProfileSmoothLimited:
|
||||
return SmoothLimitedProfile;
|
||||
+ case AccelProfileChromiumMouse:
|
||||
+ return ChromiumMouseProfile;
|
||||
case AccelProfileNone:
|
||||
return NoProfile;
|
||||
default:
|
||||
diff --git a/include/ptrveloc.h b/include/ptrveloc.h
|
||||
index 6f999a8..979bd30 100644
|
||||
--- a/include/ptrveloc.h
|
||||
+++ b/include/ptrveloc.h
|
||||
@@ -38,7 +38,8 @@
|
||||
#define AccelProfilePower 5
|
||||
#define AccelProfileLinear 6
|
||||
#define AccelProfileSmoothLimited 7
|
||||
-#define AccelProfileLAST AccelProfileSmoothLimited
|
||||
+#define AccelProfileChromiumMouse 8
|
||||
+#define AccelProfileLAST AccelProfileChromiumMouse
|
||||
|
||||
/* fwd */
|
||||
struct _DeviceVelocityRec;
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
From f1c50bbaf22a272b44d36441811ef9d8483838ca Mon Sep 17 00:00:00 2001
|
||||
From: David James <davidjames@google.com>
|
||||
Date: Wed, 19 May 2010 09:24:39 -0700
|
||||
Subject: [PATCH] Discover monotonic clock using compile-time check.
|
||||
|
||||
When xorg-xserver is being cross-compiled, there is currently no way
|
||||
for us to detect whether the monotonic clock is available on the
|
||||
target system, because we aren't able to run a test program. Currently, in
|
||||
this situation, we default to not use the monotonic clock. One problem
|
||||
with this situation is that the user will be treated as idle when the date
|
||||
is updated.
|
||||
|
||||
To fix this situation, we now use a compile-time check to detect whether the
|
||||
monotonic clock is available. This check can run just fine when we are
|
||||
cross-compiling.
|
||||
|
||||
Signed-off-by: David James <davidjames@google.com>
|
||||
---
|
||||
configure.ac | 14 ++++++--------
|
||||
1 files changed, 6 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1c7875e..36f7bdd 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -935,19 +935,17 @@ if ! test "x$have_clock_gettime" = xno; then
|
||||
CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
|
||||
fi
|
||||
|
||||
- AC_RUN_IFELSE([AC_LANG_SOURCE([
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
|
||||
#include <time.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
int main(int argc, char *argv[[]]) {
|
||||
- struct timespec tp;
|
||||
-
|
||||
- if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
|
||||
+#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC))
|
||||
+ #error No monotonic clock
|
||||
+#endif
|
||||
return 0;
|
||||
- else
|
||||
- return 1;
|
||||
}
|
||||
- ])], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no],
|
||||
- [MONOTONIC_CLOCK="cross compiling"])
|
||||
+ ])], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no])
|
||||
|
||||
LIBS="$LIBS_SAVE"
|
||||
CPPFLAGS="$CPPFLAGS_SAVE"
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
Subject: [PATCH] xorg-server: add the ability to run without root privileges.
|
||||
|
||||
Of course we'll need more changes in our startup scripts for this to work.
|
||||
---
|
||||
hw/xfree86/os-support/linux/lnx_init.c | 7 +++++++
|
||||
hw/xfree86/os-support/linux/lnx_video.c | 4 ++++
|
||||
2 files changed, 11 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
|
||||
index 2176985..70c99b0 100644
|
||||
--- a/hw/xfree86/os-support/linux/lnx_init.c
|
||||
+++ b/hw/xfree86/os-support/linux/lnx_init.c
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <sys/stat.h>
|
||||
|
||||
static Bool KeepTty = FALSE;
|
||||
+Bool NoHwAccess = FALSE;
|
||||
static int activeVT = -1;
|
||||
|
||||
static char vtname[11];
|
||||
@@ -314,6 +315,11 @@ xf86ProcessArgument(int argc, char *argv[], int i)
|
||||
return 1;
|
||||
}
|
||||
|
||||
+ if (!strcmp(argv[i], "-nohwaccess"))
|
||||
+ {
|
||||
+ NoHwAccess = TRUE;
|
||||
+ return(1);
|
||||
+ }
|
||||
if ((argv[i][0] == 'v') && (argv[i][1] == 't')) {
|
||||
if (sscanf(argv[i], "vt%2d", &xf86Info.vtno) == 0) {
|
||||
UseMsg();
|
||||
@@ -331,4 +337,5 @@ xf86UseMsg(void)
|
||||
ErrorF("vtXX use the specified VT number\n");
|
||||
ErrorF("-keeptty ");
|
||||
ErrorF("don't detach controlling tty (for debugging only)\n");
|
||||
+ ErrorF("-nohwaccess don't access hardware ports directly\n");
|
||||
}
|
||||
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
|
||||
index 0d91f7a..42f42d6 100644
|
||||
--- a/hw/xfree86/os-support/linux/lnx_video.c
|
||||
+++ b/hw/xfree86/os-support/linux/lnx_video.c
|
||||
@@ -46,6 +46,7 @@
|
||||
#include <asm/mtrr.h>
|
||||
#endif
|
||||
|
||||
+extern Bool NoHwAccess;
|
||||
static Bool ExtendedEnabled = FALSE;
|
||||
|
||||
#ifdef __ia64__
|
||||
@@ -488,6 +489,9 @@ xf86EnableIO(void)
|
||||
int fd;
|
||||
unsigned int ioBase_phys;
|
||||
#endif
|
||||
+ /* Fake it... */
|
||||
+ if (NoHwAccess)
|
||||
+ return TRUE;
|
||||
|
||||
if (ExtendedEnabled)
|
||||
return TRUE;
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,126 +0,0 @@
|
||||
From 37093bb245ccd57b7ed65e71163ea5b65e949521 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Wilson <chris@chris-wilson.co.uk>
|
||||
Date: Fri, 10 Dec 2010 11:30:34 +0000
|
||||
Subject: [PATCH] glx: Refcnt the GLXDrawable to avoid use after free with multiple FreeResource
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Although there may be more than one resource handles pointing to the
|
||||
Drawable, we only want to destroy it once and only reference the
|
||||
resource which may have just been deleted on the first instance.
|
||||
|
||||
v2: Apply fixes and combine with another bug fix from Michel Dänzer,
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=28181
|
||||
|
||||
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
|
||||
Cc: Kristian Høgsberg <krh@bitplanet.net>
|
||||
Cc: Michel Dänzer <daenzer@vmware.com>
|
||||
---
|
||||
glx/glxcmds.c | 24 +++++++++++++++---------
|
||||
glx/glxdrawable.h | 3 +++
|
||||
glx/glxext.c | 19 ++++++++++---------
|
||||
3 files changed, 28 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
|
||||
index de9c3f0..b3ea784 100644
|
||||
--- a/glx/glxcmds.c
|
||||
+++ b/glx/glxcmds.c
|
||||
@@ -507,6 +507,7 @@ __glXGetDrawable(__GLXcontext * glxc, GLXDrawable drawId, ClientPtr client,
|
||||
*error = BadAlloc;
|
||||
return NULL;
|
||||
}
|
||||
+ pGlxDraw->refcnt++;
|
||||
|
||||
return pGlxDraw;
|
||||
}
|
||||
@@ -1127,8 +1128,10 @@ __glXDrawableInit(__GLXdrawable * drawable,
|
||||
drawable->pDraw = pDraw;
|
||||
drawable->type = type;
|
||||
drawable->drawId = drawId;
|
||||
+ drawable->otherId = 0;
|
||||
drawable->config = config;
|
||||
drawable->eventMask = 0;
|
||||
+ drawable->refcnt = 0;
|
||||
|
||||
return GL_TRUE;
|
||||
}
|
||||
@@ -1158,15 +1161,18 @@ DoCreateGLXDrawable(ClientPtr client, __GLXscreen * pGlxScreen,
|
||||
pGlxDraw->destroy(pGlxDraw);
|
||||
return BadAlloc;
|
||||
}
|
||||
-
|
||||
- /*
|
||||
- * Windows aren't refcounted, so track both the X and the GLX window
|
||||
- * so we get called regardless of destruction order.
|
||||
- */
|
||||
- if (drawableId != glxDrawableId && type == GLX_DRAWABLE_WINDOW &&
|
||||
- !AddResource(pDraw->id, __glXDrawableRes, pGlxDraw)) {
|
||||
- pGlxDraw->destroy(pGlxDraw);
|
||||
- return BadAlloc;
|
||||
+ pGlxDraw->refcnt++;
|
||||
+
|
||||
+ if (drawableId != glxDrawableId && type == GLX_DRAWABLE_WINDOW) {
|
||||
+ /* Add the glx drawable under the XID of the underlying X drawable
|
||||
+ * too. That way we'll get a callback in DrawableGone and can
|
||||
+ * clean up properly when the drawable is destroyed. */
|
||||
+ if (!AddResource(drawableId, __glXDrawableRes, pGlxDraw)) {
|
||||
+ pGlxDraw->destroy (pGlxDraw);
|
||||
+ return BadAlloc;
|
||||
+ }
|
||||
+ pGlxDraw->refcnt++;
|
||||
+ pGlxDraw->otherId = drawableId;
|
||||
}
|
||||
|
||||
return Success;
|
||||
diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h
|
||||
index 2a365c5..80c3234 100644
|
||||
--- a/glx/glxdrawable.h
|
||||
+++ b/glx/glxdrawable.h
|
||||
@@ -51,8 +51,11 @@ struct __GLXdrawable {
|
||||
void (*waitX) (__GLXdrawable *);
|
||||
void (*waitGL) (__GLXdrawable *);
|
||||
|
||||
+ int refcnt; /* number of resources handles referencing this */
|
||||
+
|
||||
DrawablePtr pDraw;
|
||||
XID drawId;
|
||||
+ XID otherId; /* for glx1.3 we need to track the original Drawable as well */
|
||||
|
||||
/*
|
||||
** Either GLX_DRAWABLE_PIXMAP, GLX_DRAWABLE_WINDOW or
|
||||
diff --git a/glx/glxext.c b/glx/glxext.c
|
||||
index 4bd5d6b..77db8b0 100644
|
||||
--- a/glx/glxext.c
|
||||
+++ b/glx/glxext.c
|
||||
@@ -123,17 +123,18 @@ DrawableGone(__GLXdrawable * glxPriv, XID xid)
|
||||
{
|
||||
__GLXcontext *c, *next;
|
||||
|
||||
- if (glxPriv->type == GLX_DRAWABLE_WINDOW) {
|
||||
- /* If this was created by glXCreateWindow, free the matching resource */
|
||||
- if (glxPriv->drawId != glxPriv->pDraw->id) {
|
||||
- if (xid == glxPriv->drawId)
|
||||
- FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE);
|
||||
- else
|
||||
- FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE);
|
||||
- }
|
||||
- /* otherwise this window was implicitly created by MakeCurrent */
|
||||
+ if (glxPriv->otherId) {
|
||||
+ XID other = glxPriv->otherId;
|
||||
+ glxPriv->otherId = 0;
|
||||
+ if (xid == other)
|
||||
+ FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE);
|
||||
+ else
|
||||
+ FreeResourceByType(other, __glXDrawableRes, TRUE);
|
||||
}
|
||||
|
||||
+ if (--glxPriv->refcnt)
|
||||
+ return True;
|
||||
+
|
||||
for (c = glxAllContexts; c; c = next) {
|
||||
next = c->next;
|
||||
if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv)) {
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,101 +0,0 @@
|
||||
diff --git a/dix/window.c b/dix/window.c
|
||||
index d293e90..c33514b 100644
|
||||
--- a/dix/window.c
|
||||
+++ b/dix/window.c
|
||||
@@ -550,9 +550,13 @@ InitRootWindow(WindowPtr pWin)
|
||||
pWin->optional->cursor = rootCursor;
|
||||
rootCursor->refcnt++;
|
||||
|
||||
+ pWin->backingStore = defaultBackingStore;
|
||||
+ pWin->forcedBS = (defaultBackingStore != NotUseful);
|
||||
+
|
||||
if (party_like_its_1989) {
|
||||
MakeRootTile(pWin);
|
||||
backFlag |= CWBackPixmap;
|
||||
+ (*pScreen->ChangeWindowAttributes)(pWin, backFlag);
|
||||
}
|
||||
else if (pScreen->canDoBGNoneRoot && bgNoneRoot) {
|
||||
pWin->backgroundState = XaceBackgroundNoneState(pWin);
|
||||
@@ -560,19 +564,9 @@ InitRootWindow(WindowPtr pWin)
|
||||
backFlag |= CWBackPixmap;
|
||||
}
|
||||
else {
|
||||
- pWin->backgroundState = BackgroundPixel;
|
||||
- if (whiteRoot)
|
||||
- pWin->background.pixel = pScreen->whitePixel;
|
||||
- else
|
||||
- pWin->background.pixel = pScreen->blackPixel;
|
||||
- backFlag |= CWBackPixel;
|
||||
+ /* nothing, handled in xf86CreateRootWindow */
|
||||
}
|
||||
|
||||
- pWin->backingStore = defaultBackingStore;
|
||||
- pWin->forcedBS = (defaultBackingStore != NotUseful);
|
||||
- /* We SHOULD check for an error value here XXX */
|
||||
- (*pScreen->ChangeWindowAttributes) (pWin, backFlag);
|
||||
-
|
||||
MapWindow(pWin, serverClient);
|
||||
}
|
||||
|
||||
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
|
||||
index 5263b5f..eb530bb 100644
|
||||
--- a/hw/xfree86/common/xf86Init.c
|
||||
+++ b/hw/xfree86/common/xf86Init.c
|
||||
@@ -60,6 +60,7 @@
|
||||
#ifdef XFreeXDGA
|
||||
#include "dgaproc.h"
|
||||
#endif
|
||||
+#include "xace.h"
|
||||
|
||||
#define XF86_OS_PRIVS
|
||||
#include "xf86.h"
|
||||
@@ -308,6 +309,7 @@ xf86CreateRootWindow(WindowPtr pWin)
|
||||
int ret = TRUE;
|
||||
int err = Success;
|
||||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
||||
RootWinPropPtr pProp;
|
||||
CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
|
||||
dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
|
||||
@@ -357,6 +359,15 @@ xf86CreateRootWindow(WindowPtr pWin)
|
||||
}
|
||||
}
|
||||
|
||||
+ if (pScrn->canDoBGNoneRoot) {
|
||||
+ pWin->backgroundState = XaceBackgroundNoneState(pWin);
|
||||
+ pWin->background.pixel = pScreen->whitePixel;
|
||||
+ pScreen->ChangeWindowAttributes(pWin, CWBackPixmap | CWBorderPixel | CWCursor | CWBackingStore);
|
||||
+ } else {
|
||||
+ pWin->background.pixel = pScreen->blackPixel;
|
||||
+ pScreen->ChangeWindowAttributes(pWin, CWBackPixel | CWBorderPixel | CWCursor | CWBackingStore);
|
||||
+ }
|
||||
+
|
||||
DebugF("xf86CreateRootWindow() returns %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
|
||||
index e2ca558..e1c5331 100644
|
||||
--- a/hw/xfree86/common/xf86str.h
|
||||
+++ b/hw/xfree86/common/xf86str.h
|
||||
@@ -497,7 +497,7 @@ typedef struct _confdrirec {
|
||||
} confDRIRec, *confDRIPtr;
|
||||
|
||||
/* These values should be adjusted when new fields are added to ScrnInfoRec */
|
||||
-#define NUM_RESERVED_INTS 16
|
||||
+#define NUM_RESERVED_INTS 15
|
||||
#define NUM_RESERVED_POINTERS 14
|
||||
#define NUM_RESERVED_FUNCS 10
|
||||
|
||||
@@ -758,6 +758,9 @@ typedef struct _ScrnInfoRec {
|
||||
ClockRangePtr clockRanges;
|
||||
int adjustFlags;
|
||||
|
||||
+ /* -nr support */
|
||||
+ int canDoBGNoneRoot;
|
||||
+
|
||||
/*
|
||||
* These can be used when the minor ABI version is incremented.
|
||||
* The NUM_* parameters must be reduced appropriately to keep the
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,77 +0,0 @@
|
||||
From: Yoshiki IGUCHI <yoshiki@chromium.org>
|
||||
Date: Mon, 12 Nov 2012 14:21:28 +0800
|
||||
Subject: [PATCH] Add the flag to specify the maximum VT number the user
|
||||
can switch to.
|
||||
|
||||
This CL adds the flag named '-maxvt', which specify the maximum VT
|
||||
number the user can switch to with Ctrl-Alt-Fn keys.
|
||||
|
||||
BUG=chromium:153961
|
||||
TEST=manual
|
||||
---
|
||||
hw/xfree86/common/xf86Events.c | 4 +++-
|
||||
os/utils.c | 12 ++++++++++++
|
||||
2 files changed, 15 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
|
||||
index 3ad34b5..cfe92f0 100644
|
||||
--- a/hw/xfree86/common/xf86Events.c
|
||||
+++ b/hw/xfree86/common/xf86Events.c
|
||||
@@ -100,6 +100,8 @@ Bool VTSwitchEnabled = TRUE; /* Allows run-time disabling for
|
||||
|
||||
extern fd_set EnabledDevices;
|
||||
|
||||
+extern int maxVT;
|
||||
+
|
||||
#ifdef XF86PM
|
||||
extern void (*xf86OSPMClose) (void);
|
||||
#endif
|
||||
@@ -198,7 +200,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
|
||||
if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) {
|
||||
int vtno = *((int *) arg);
|
||||
|
||||
- if (vtno != xf86Info.vtno) {
|
||||
+ if ((maxVT < 0 || vtno <= maxVT) && vtno != xf86Info.vtno) {
|
||||
if (!xf86VTActivate(vtno)) {
|
||||
ErrorF("Failed to switch from vt%02d to vt%02d: %s\n",
|
||||
xf86Info.vtno, vtno, strerror(errno));
|
||||
diff --git a/os/utils.c b/os/utils.c
|
||||
index 04bcbc6..8b19838 100644
|
||||
--- a/os/utils.c
|
||||
+++ b/os/utils.c
|
||||
@@ -202,6 +202,8 @@ Bool PanoramiXExtensionDisabledHack = FALSE;
|
||||
|
||||
int auditTrailLevel = 1;
|
||||
|
||||
+int maxVT = -1;
|
||||
+
|
||||
char *SeatId = NULL;
|
||||
|
||||
#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
|
||||
@@ -502,6 +504,7 @@ UseMsg(void)
|
||||
#ifdef RLIMIT_STACK
|
||||
ErrorF("-ls int limit stack space to N Kb\n");
|
||||
#endif
|
||||
+ ErrorF("-maxvt int maximum switchable VT, -1 to permit any\n");
|
||||
ErrorF("-nolock disable the locking mechanism\n");
|
||||
ErrorF("-nolisten string don't listen on protocol\n");
|
||||
ErrorF("-noreset don't reset after last client exists\n");
|
||||
@@ -734,6 +737,15 @@ ProcessCommandLine(int argc, char *argv[])
|
||||
UseMsg();
|
||||
}
|
||||
#endif
|
||||
+ else if (strcmp(argv[i], "-maxvt") == 0) {
|
||||
+ if (++i < argc) {
|
||||
+ maxVT = atoi(argv[i]);
|
||||
+ if (maxVT < 0)
|
||||
+ maxVT = -1;
|
||||
+ }
|
||||
+ else
|
||||
+ UseMsg();
|
||||
+ }
|
||||
else if (strcmp(argv[i], "-nolock") == 0) {
|
||||
#if !defined(WIN32) && !defined(__CYGWIN__)
|
||||
if (getuid() != 0)
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
From af88b43f9e604157b74270d609c08bdfa256a792 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri, 27 Apr 2012 16:31:17 +1000
|
||||
Subject: [PATCH] dix: don't emulate scroll events for non-existing axes
|
||||
(#47281)
|
||||
|
||||
Test case:
|
||||
- create a device with REL_HWHEEL and ABS_X and ABS_Y. evdev 2.7.0 will set
|
||||
that up as device with 1 relative axis
|
||||
- move pointer to VGA1
|
||||
- xrandr --output VGA1 --off
|
||||
|
||||
Warps the pointer to the new spot and calls GPE with the x/y mask bits set.
|
||||
When running through the loop to check for scroll event, this overruns the
|
||||
axes and may try to emulate scroll events based on random garbage in the
|
||||
memory. If that memory contained non-zero for the scroll type but near-zero
|
||||
for the increment field, the server would hang in an infinite loop.
|
||||
|
||||
This was the trigger for this suggested, never-merged, patch here:
|
||||
http://patchwork.freedesktop.org/patch/9543/
|
||||
|
||||
X.Org Bug 47281 <http://bugs.freedesktop.org/show_bug.cgi?id=47281>
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
|
||||
---
|
||||
dix/getevents.c | 3 +++
|
||||
1 files changed, 3 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dix/getevents.c b/dix/getevents.c
|
||||
index 23bbe06..c960d44 100644
|
||||
--- a/dix/getevents.c
|
||||
+++ b/dix/getevents.c
|
||||
@@ -1577,6 +1577,9 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
|
||||
/* Now turn the smooth-scrolling axes back into emulated button presses
|
||||
* for legacy clients, based on the integer delta between before and now */
|
||||
for (i = 0; i < valuator_mask_size(&mask); i++) {
|
||||
+ if (i >= pDev->valuator->numAxes)
|
||||
+ break;
|
||||
+
|
||||
if (!valuator_mask_isset(&mask, i))
|
||||
continue;
|
||||
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
Subject: [PATCH] xserver: Fix dri2 race
|
||||
|
||||
The is a race where the client disappears after submitting the swapbuffers
|
||||
but before completing the request. Don't attend the client if it is gone.
|
||||
---
|
||||
hw/xfree86/dri2/dri2.c | 4 +++-
|
||||
1 files changed, 3 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
|
||||
index 5cc9068..d03d082 100644
|
||||
--- a/hw/xfree86/dri2/dri2.c
|
||||
+++ b/hw/xfree86/dri2/dri2.c
|
||||
@@ -220,7 +220,9 @@ DRI2SwapLimit(DrawablePtr pDraw, int swap_limit)
|
||||
|
||||
if (pPriv->target_sbc == -1 && !pPriv->blockedOnMsc) {
|
||||
if (pPriv->blockedClient) {
|
||||
- AttendClient(pPriv->blockedClient);
|
||||
+ if ((pPriv->blockedClient->clientState != ClientStateGone) &&
|
||||
+ (pPriv->blockedClient->clientState != ClientStateInitial))
|
||||
+ AttendClient(pPriv->blockedClient);
|
||||
pPriv->blockedClient = NULL;
|
||||
}
|
||||
}
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,372 +0,0 @@
|
||||
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
|
||||
index 5cd95f6..de22540 100644
|
||||
--- a/glx/glxcmds.c
|
||||
+++ b/glx/glxcmds.c
|
||||
@@ -784,7 +784,7 @@ __glXDisp_WaitGL(__GLXclientState * cl, GLbyte * pc)
|
||||
}
|
||||
|
||||
if (glxc && glxc->drawPriv->waitGL)
|
||||
- (*glxc->drawPriv->waitGL) (glxc->drawPriv);
|
||||
+ (*glxc->drawPriv->waitGL) (client, glxc->drawPriv);
|
||||
|
||||
return Success;
|
||||
}
|
||||
@@ -811,7 +811,7 @@ __glXDisp_WaitX(__GLXclientState * cl, GLbyte * pc)
|
||||
}
|
||||
|
||||
if (glxc && glxc->drawPriv->waitX)
|
||||
- (*glxc->drawPriv->waitX) (glxc->drawPriv);
|
||||
+ (*glxc->drawPriv->waitX) (client, glxc->drawPriv);
|
||||
|
||||
return Success;
|
||||
}
|
||||
@@ -1841,7 +1841,7 @@ __glXDisp_CopySubBufferMESA(__GLXclientState * cl, GLbyte * pc)
|
||||
pGlxDraw->copySubBuffer == NULL)
|
||||
return __glXError(GLXBadDrawable);
|
||||
|
||||
- (*pGlxDraw->copySubBuffer) (pGlxDraw, x, y, width, height);
|
||||
+ (*pGlxDraw->copySubBuffer) (client, pGlxDraw, x, y, width, height);
|
||||
|
||||
return Success;
|
||||
}
|
||||
diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h
|
||||
index 80c3234..7e71a23 100644
|
||||
--- a/glx/glxdrawable.h
|
||||
+++ b/glx/glxdrawable.h
|
||||
@@ -46,10 +46,10 @@ enum {
|
||||
struct __GLXdrawable {
|
||||
void (*destroy) (__GLXdrawable * private);
|
||||
GLboolean(*swapBuffers) (ClientPtr client, __GLXdrawable *);
|
||||
- void (*copySubBuffer) (__GLXdrawable * drawable,
|
||||
+ void (*copySubBuffer) (ClientPtr client, __GLXdrawable * drawable,
|
||||
int x, int y, int w, int h);
|
||||
- void (*waitX) (__GLXdrawable *);
|
||||
- void (*waitGL) (__GLXdrawable *);
|
||||
+ void (*waitX) (ClientPtr client, __GLXdrawable *);
|
||||
+ void (*waitGL) (ClientPtr client, __GLXdrawable *);
|
||||
|
||||
int refcnt; /* number of resources handles referencing this */
|
||||
|
||||
diff --git a/glx/glxdri.c b/glx/glxdri.c
|
||||
index 326f539..3fbf118 100644
|
||||
--- a/glx/glxdri.c
|
||||
+++ b/glx/glxdri.c
|
||||
@@ -270,7 +270,7 @@ __glXDRIdrawableSwapInterval(__GLXdrawable * baseDrawable, int interval)
|
||||
}
|
||||
|
||||
static void
|
||||
-__glXDRIdrawableCopySubBuffer(__GLXdrawable * basePrivate,
|
||||
+__glXDRIdrawableCopySubBuffer(ClientPtr client, __GLXdrawable * basePrivate,
|
||||
int x, int y, int w, int h)
|
||||
{
|
||||
__GLXDRIdrawable *private = (__GLXDRIdrawable *) basePrivate;
|
||||
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
|
||||
index 5e524db..ff6145b 100644
|
||||
--- a/glx/glxdri2.c
|
||||
+++ b/glx/glxdri2.c
|
||||
@@ -114,10 +114,11 @@ __glXDRIdrawableDestroy(__GLXdrawable * drawable)
|
||||
}
|
||||
|
||||
static void
|
||||
-__glXDRIdrawableCopySubBuffer(__GLXdrawable * drawable,
|
||||
+__glXDRIdrawableCopySubBuffer(ClientPtr client, __GLXdrawable * drawable,
|
||||
int x, int y, int w, int h)
|
||||
{
|
||||
__GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
|
||||
+ __GLXDRIscreen *screen = private->screen;
|
||||
BoxRec box;
|
||||
RegionRec region;
|
||||
|
||||
@@ -127,12 +128,27 @@ __glXDRIdrawableCopySubBuffer(__GLXdrawable * drawable,
|
||||
box.y2 = private->height - y;
|
||||
RegionInit(®ion, &box, 0);
|
||||
|
||||
- DRI2CopyRegion(drawable->pDraw, ®ion,
|
||||
- DRI2BufferFrontLeft, DRI2BufferBackLeft);
|
||||
+ LogMessage(X_INFO, "%s:%d \n",__func__,__LINE__);
|
||||
+#if __DRI2_FLUSH_VERSION >= 3
|
||||
+ LogMessage(X_INFO, "%s:%d flushing\n",__func__,__LINE__);
|
||||
+ if (screen->flush) {
|
||||
+ LogMessage(X_INFO, "%s:%d flushing2\n",__func__,__LINE__);
|
||||
+ (*screen->flush->flush)(private->driDrawable);
|
||||
+ (*screen->flush->invalidate)(private->driDrawable);
|
||||
+ }
|
||||
+#else
|
||||
+ LogMessage(X_INFO, "%s:%d \n",__func__,__LINE__);
|
||||
+ if (screen->flush)
|
||||
+ (*screen->flush->flushInvalidate)(private->driDrawable);
|
||||
+#endif
|
||||
+
|
||||
+ LogMessage(X_INFO, "%s:%d \n",__func__,__LINE__);
|
||||
+ DRI2CopyRegion(client, drawable->pDraw, ®ion,
|
||||
+ DRI2BufferFrontLeft, DRI2BufferBackLeft, TRUE);
|
||||
}
|
||||
|
||||
static void
|
||||
-__glXDRIdrawableWaitX(__GLXdrawable * drawable)
|
||||
+__glXDRIdrawableWaitX(ClientPtr client, __GLXdrawable * drawable)
|
||||
{
|
||||
__GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
|
||||
BoxRec box;
|
||||
@@ -144,12 +160,12 @@ __glXDRIdrawableWaitX(__GLXdrawable * drawable)
|
||||
box.y2 = private->height;
|
||||
RegionInit(®ion, &box, 0);
|
||||
|
||||
- DRI2CopyRegion(drawable->pDraw, ®ion,
|
||||
- DRI2BufferFakeFrontLeft, DRI2BufferFrontLeft);
|
||||
+ DRI2CopyRegion(client, drawable->pDraw, ®ion,
|
||||
+ DRI2BufferFakeFrontLeft, DRI2BufferFrontLeft, FALSE);
|
||||
}
|
||||
|
||||
static void
|
||||
-__glXDRIdrawableWaitGL(__GLXdrawable * drawable)
|
||||
+__glXDRIdrawableWaitGL(ClientPtr client, __GLXdrawable * drawable)
|
||||
{
|
||||
__GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
|
||||
BoxRec box;
|
||||
@@ -161,8 +177,8 @@ __glXDRIdrawableWaitGL(__GLXdrawable * drawable)
|
||||
box.y2 = private->height;
|
||||
RegionInit(®ion, &box, 0);
|
||||
|
||||
- DRI2CopyRegion(drawable->pDraw, ®ion,
|
||||
- DRI2BufferFrontLeft, DRI2BufferFakeFrontLeft);
|
||||
+ DRI2CopyRegion(client, drawable->pDraw, ®ion,
|
||||
+ DRI2BufferFrontLeft, DRI2BufferFakeFrontLeft, FALSE);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -565,7 +581,7 @@ static void
|
||||
dri2FlushFrontBuffer(__DRIdrawable * driDrawable, void *loaderPrivate)
|
||||
{
|
||||
(void) driDrawable;
|
||||
- __glXDRIdrawableWaitGL((__GLXdrawable *) loaderPrivate);
|
||||
+ __glXDRIdrawableWaitGL(NULL, (__GLXdrawable *) loaderPrivate);
|
||||
}
|
||||
|
||||
static const __DRIdri2LoaderExtension loaderExtension = {
|
||||
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
|
||||
index d03d082..28383fb 100644
|
||||
--- a/hw/xfree86/dri2/dri2.c
|
||||
+++ b/hw/xfree86/dri2/dri2.c
|
||||
@@ -87,6 +87,7 @@ typedef struct _DRI2Drawable {
|
||||
int swap_limit; /* for N-buffering */
|
||||
unsigned long serialNumber;
|
||||
Bool needInvalidate;
|
||||
+ RegionPtr previous_region;
|
||||
} DRI2DrawableRec, *DRI2DrawablePtr;
|
||||
|
||||
typedef struct _DRI2Screen {
|
||||
@@ -175,6 +176,7 @@ DRI2AllocateDrawable(DrawablePtr pDraw)
|
||||
pPriv->swap_count = 0;
|
||||
pPriv->target_sbc = -1;
|
||||
pPriv->swap_interval = 1;
|
||||
+ pPriv->previous_region = NULL;
|
||||
/* Initialize last swap target from DDX if possible */
|
||||
if (!ds->GetMSC || !(*ds->GetMSC) (pDraw, &ust, &pPriv->last_swap_target))
|
||||
pPriv->last_swap_target = 0;
|
||||
@@ -552,8 +554,8 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height,
|
||||
box.y2 = pPriv->height;
|
||||
RegionInit(®ion, &box, 0);
|
||||
|
||||
- DRI2CopyRegion(pDraw, ®ion, DRI2BufferFakeFrontLeft,
|
||||
- DRI2BufferFrontLeft);
|
||||
+ DRI2CopyRegion(NULL, pDraw, ®ion, DRI2BufferFakeFrontLeft,
|
||||
+ DRI2BufferFrontLeft, FALSE);
|
||||
}
|
||||
|
||||
pPriv->needInvalidate = TRUE;
|
||||
@@ -661,9 +663,118 @@ DRI2BlockClient(ClientPtr client, DrawablePtr pDraw)
|
||||
pPriv->blockedOnMsc = TRUE;
|
||||
}
|
||||
|
||||
+static Bool DRI2CopyRegionWithFlip(ClientPtr client, DrawablePtr pDraw,
|
||||
+ RegionPtr pRegion,
|
||||
+ DRI2BufferPtr pDestBuffer,
|
||||
+ DRI2BufferPtr pSrcBuffer)
|
||||
+{
|
||||
+ DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
|
||||
+ DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
|
||||
+ ScreenPtr pScreen = pPriv->dri2_screen->screen;
|
||||
+ RegionPtr pPreviousRegion;
|
||||
+ RegionPtr pCopyFrontToBack;
|
||||
+ int ret;
|
||||
+ DRI2SwapEventPtr func = NULL;
|
||||
+ void *data = NULL;
|
||||
+ PixmapPtr pWindowPix, pScreenPix;
|
||||
+ CARD64 target_msc = 0, divisor = 0, remainder = 0;
|
||||
+ CARD64 ust, current_msc;
|
||||
+ CARD64 swap_target;
|
||||
+
|
||||
+ /* Make sure we have a window */
|
||||
+ if (pDraw->type != DRAWABLE_WINDOW)
|
||||
+ return FALSE;
|
||||
+
|
||||
+ /* Ensure that our window is the screen pixmap */
|
||||
+ pWindowPix = pScreen->GetWindowPixmap((WindowPtr)pDraw);
|
||||
+ pScreenPix = pScreen->GetScreenPixmap(pScreen);
|
||||
+ if (pWindowPix != pScreenPix)
|
||||
+ return FALSE;
|
||||
+
|
||||
+ /* Create a region pCopyFrontToBack which brings over the changes from
|
||||
+ * the last frame. Do this by subtracting the current region from the
|
||||
+ * previous updates and copying the resulting bits. In the case where we
|
||||
+ * don't have a previous region we'll update the whole drawable */
|
||||
+ pCopyFrontToBack = REGION_CREATE(pScreen, NULL, 0);
|
||||
+
|
||||
+ if (pPriv->previous_region) {
|
||||
+ pPreviousRegion = pPriv->previous_region;
|
||||
+ } else {
|
||||
+ BoxRec box;
|
||||
+ box.x1 = pDraw->x;
|
||||
+ box.y1 = pDraw->y;
|
||||
+ box.x2 = box.x1 + pDraw->width;
|
||||
+ box.y2 = box.y1 + pDraw->height;
|
||||
+ pPreviousRegion = REGION_CREATE(pScreen, &box, 1);
|
||||
+ }
|
||||
+
|
||||
+ REGION_SUBTRACT(pScreen, pCopyFrontToBack, pPreviousRegion, pRegion);
|
||||
+ REGION_DESTROY(pScreen, pPreviousRegion);
|
||||
+ (*ds->CopyRegion)(pDraw, pCopyFrontToBack, pSrcBuffer, pDestBuffer);
|
||||
+
|
||||
+ /*
|
||||
+ * In the simple glXSwapBuffers case, all params will be 0, and we just
|
||||
+ * need to schedule a swap for the last swap target + the swap interval.
|
||||
+ */
|
||||
+ if (target_msc == 0 && divisor == 0 && remainder == 0) {
|
||||
+ /* If the current vblank count of the drawable's crtc is lower
|
||||
+ * than the count stored in last_swap_target from a previous swap
|
||||
+ * then reinitialize last_swap_target to the current crtc's msc,
|
||||
+ * otherwise the swap will hang. This will happen if the drawable
|
||||
+ * is moved to a crtc with a lower refresh rate, or a crtc that just
|
||||
+ * got enabled.
|
||||
+ */
|
||||
+ if (ds->GetMSC) {
|
||||
+ if (!(*ds->GetMSC)(pDraw, &ust, ¤t_msc))
|
||||
+ pPriv->last_swap_target = 0;
|
||||
+
|
||||
+ if (current_msc < pPriv->last_swap_target)
|
||||
+ pPriv->last_swap_target = current_msc;
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
+ * Swap target for this swap is last swap target + swap interval since
|
||||
+ * we have to account for the current swap count, interval, and the
|
||||
+ * number of pending swaps.
|
||||
+ */
|
||||
+ swap_target = pPriv->last_swap_target + pPriv->swap_interval;
|
||||
+
|
||||
+ } else {
|
||||
+ /* glXSwapBuffersMscOML could have a 0 target_msc, honor it */
|
||||
+ swap_target = target_msc;
|
||||
+ }
|
||||
+
|
||||
+ if (pPriv->swapsPending > 0)
|
||||
+ return FALSE;
|
||||
+
|
||||
+ pPriv->swapsPending++;
|
||||
+ ret = (*ds->ScheduleSwap)(client, pDraw, pDestBuffer, pSrcBuffer,
|
||||
+ &swap_target, divisor, remainder, func, data);
|
||||
+ if (!ret) {
|
||||
+ pPriv->swapsPending--; /* didn't schedule */
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ pPriv->last_swap_target = swap_target;
|
||||
+
|
||||
+ /* According to spec, return expected swapbuffers count SBC after this swap
|
||||
+ * will complete.
|
||||
+ */
|
||||
+ swap_target = pPriv->swap_count + pPriv->swapsPending;
|
||||
+
|
||||
+ DRI2InvalidateDrawable(pDraw);
|
||||
+
|
||||
+ pPriv->previous_region = REGION_CREATE(pScreen, NULL, 0);
|
||||
+ REGION_COPY(pScreen, pPriv->previous_region, pRegion);
|
||||
+
|
||||
+ REGION_DESTROY(pScreen, pCopyFrontToBack);
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
int
|
||||
-DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
|
||||
- unsigned int dest, unsigned int src)
|
||||
+DRI2CopyRegion(ClientPtr client, DrawablePtr pDraw, RegionPtr pRegion,
|
||||
+ unsigned int dest, unsigned int src, Bool invalidate)
|
||||
{
|
||||
DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
|
||||
DRI2DrawablePtr pPriv;
|
||||
@@ -685,8 +796,13 @@ DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
|
||||
if (pSrcBuffer == NULL || pDestBuffer == NULL)
|
||||
return BadValue;
|
||||
|
||||
- (*ds->CopyRegion) (pDraw, pRegion, pDestBuffer, pSrcBuffer);
|
||||
+ if (invalidate &&
|
||||
+ DRI2CopyRegionWithFlip(client, pDraw, pRegion,
|
||||
+ pDestBuffer, pSrcBuffer))
|
||||
+ return Success;
|
||||
|
||||
+ pPriv->previous_region = NULL;
|
||||
+ (*ds->CopyRegion)(pDraw, pRegion, pDestBuffer, pSrcBuffer);
|
||||
return Success;
|
||||
}
|
||||
|
||||
@@ -814,8 +930,8 @@ DRI2SwapComplete(ClientPtr client, DrawablePtr pDraw, int frame,
|
||||
box.x2 = pDraw->width;
|
||||
box.y2 = pDraw->height;
|
||||
RegionInit(®ion, &box, 0);
|
||||
- DRI2CopyRegion(pDraw, ®ion, DRI2BufferFakeFrontLeft,
|
||||
- DRI2BufferFrontLeft);
|
||||
+ DRI2CopyRegion(client, pDraw, ®ion, DRI2BufferFakeFrontLeft,
|
||||
+ DRI2BufferFrontLeft, FALSE);
|
||||
|
||||
ust = ((CARD64) tv_sec * 1000000) + tv_usec;
|
||||
if (swap_complete)
|
||||
@@ -889,6 +1005,8 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
|
||||
return BadDrawable;
|
||||
}
|
||||
|
||||
+ pPriv->previous_region = NULL;
|
||||
+
|
||||
/* Old DDX or no swap interval, just blit */
|
||||
if (!ds->ScheduleSwap || !pPriv->swap_interval) {
|
||||
BoxRec box;
|
||||
@@ -1345,3 +1463,4 @@ DRI2Version(int *major, int *minor)
|
||||
if (minor != NULL)
|
||||
*minor = DRI2VersRec.minorversion;
|
||||
}
|
||||
+
|
||||
diff --git a/hw/xfree86/dri2/dri2.h b/hw/xfree86/dri2/dri2.h
|
||||
index a67e35f..e30fb7a 100644
|
||||
--- a/hw/xfree86/dri2/dri2.h
|
||||
+++ b/hw/xfree86/dri2/dri2.h
|
||||
@@ -248,9 +248,11 @@ extern _X_EXPORT DRI2BufferPtr *DRI2GetBuffers(DrawablePtr pDraw,
|
||||
unsigned int *attachments,
|
||||
int count, int *out_count);
|
||||
|
||||
-extern _X_EXPORT int DRI2CopyRegion(DrawablePtr pDraw,
|
||||
+extern _X_EXPORT int DRI2CopyRegion(ClientPtr client,
|
||||
+ DrawablePtr pDraw,
|
||||
RegionPtr pRegion,
|
||||
- unsigned int dest, unsigned int src);
|
||||
+ unsigned int dest, unsigned int src,
|
||||
+ Bool invalidate);
|
||||
|
||||
/**
|
||||
* Determine the major and minor version of the DRI2 extension.
|
||||
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
|
||||
index 73ef7f2..dfa242a 100644
|
||||
--- a/hw/xfree86/dri2/dri2ext.c
|
||||
+++ b/hw/xfree86/dri2/dri2ext.c
|
||||
@@ -319,7 +319,7 @@ ProcDRI2CopyRegion(ClientPtr client)
|
||||
|
||||
VERIFY_REGION(pRegion, stuff->region, client, DixReadAccess);
|
||||
|
||||
- status = DRI2CopyRegion(pDrawable, pRegion, stuff->dest, stuff->src);
|
||||
+ status = DRI2CopyRegion(client, pDrawable, pRegion, stuff->dest, stuff->src, TRUE);
|
||||
if (status != Success)
|
||||
return status;
|
||||
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
From 758de0b68be0b2ace903d3c86fca65865f34d7cd Mon Sep 17 00:00:00 2001
|
||||
From: Yufeng Shen <miletus@chromium.org>
|
||||
Date: Fri, 20 Jul 2012 18:58:10 -0400
|
||||
Subject: [PATCH] x11-base/xorg-server: fix scale_to_desktop for edge ABS
|
||||
events
|
||||
|
||||
Scale_to_desktop() converts ABS events from device coordinates
|
||||
to screen coordinates:
|
||||
[dev_X_min, dev_X_max] -> [screen_X_min, screen_X_max]
|
||||
[dev_Y_min, dev_Y_max] -> [screen_Y_min, screen_Y_max]
|
||||
|
||||
An edge ABS event with X = dev_X_max (e.g., generated from the
|
||||
edge of a touchscreen) will be converted to have screen X value
|
||||
= screen_X_max, which, however, will be filterd out when xserver
|
||||
tries to find proper Window to receive the event, because the
|
||||
range check for a Window to receive events is
|
||||
window_X_min <= event_screen_X < window_X_max
|
||||
Events with event_screen_X = screen_X_max will fail the test get
|
||||
and rejected by the Window.
|
||||
|
||||
To fix this, we change the device to screen coordinates mapping to
|
||||
[dev_X_min, dev_X_max] -> [screen_X_min, screen_X_max-1]
|
||||
[dev_Y_min, dev_Y_max] -> [screen_Y_min, screen_Y_max-1]
|
||||
|
||||
Signed-off-by: Yufeng Shen <miletus@chromium.org>
|
||||
---
|
||||
dix/getevents.c | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dix/getevents.c b/dix/getevents.c
|
||||
index b78d5ce..9898c6a 100644
|
||||
--- a/dix/getevents.c
|
||||
+++ b/dix/getevents.c
|
||||
@@ -890,9 +890,9 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask,
|
||||
|
||||
/* scale x&y to desktop coordinates */
|
||||
*screenx = rescaleValuatorAxis(x, dev->valuator->axes + 0, NULL,
|
||||
- screenInfo.x, screenInfo.width);
|
||||
+ screenInfo.x, screenInfo.width - 1);
|
||||
*screeny = rescaleValuatorAxis(y, dev->valuator->axes + 1, NULL,
|
||||
- screenInfo.y, screenInfo.height);
|
||||
+ screenInfo.y, screenInfo.height - 1);
|
||||
|
||||
*devx = x;
|
||||
*devy = y;
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From d53e6e02a2595ced1882f5fcd34d08ea039b3b85 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Thu, 16 Aug 2012 13:54:42 +1000
|
||||
Subject: [PATCH] mi: don't check for core events in miPointerSetPosition
|
||||
(#53568)
|
||||
|
||||
As of 81cfe44b1ed0de84ad1941fe2ca74bebef3fc58d, miPointerSetPosition now
|
||||
returns the screen pointer of the device. This broke floating slave devices,
|
||||
as soon as a motion event was submitted, miPointerSetPosition returned NULL,
|
||||
crashing the server.
|
||||
|
||||
dev->coreEvents is only false if the device is a floating slave, in which
|
||||
case it has a sprite.
|
||||
|
||||
X.Org Bug 53568 <http://bugs.freedesktop.org/show_bug.cgi?id=53568>
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Keith Packard <keithp@keithp.com>
|
||||
---
|
||||
mi/mipointer.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/mi/mipointer.c b/mi/mipointer.c
|
||||
index a56838e..4defaf5 100644
|
||||
--- a/mi/mipointer.c
|
||||
+++ b/mi/mipointer.c
|
||||
@@ -575,7 +575,7 @@ miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx,
|
||||
|
||||
miPointerPtr pPointer;
|
||||
|
||||
- if (!pDev || !pDev->coreEvents)
|
||||
+ if (!pDev)
|
||||
return NULL;
|
||||
|
||||
pPointer = MIPOINTER(pDev);
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,163 +0,0 @@
|
||||
From: Daniel Kurtz <djkurtz@chromium.org>
|
||||
Date: Sat, 22 Sep 2012 19:58:22 +0800
|
||||
Subject: [PATCH] os: block signals when accessing global timer list
|
||||
|
||||
X Input drivers, such as xf86-input-synaptics, tend to do all of their
|
||||
processing in a SIGIO signal handler. This processing often involves
|
||||
creating, modifying or canceling a timer. Any of these operations may
|
||||
modify the global "timers" array. Therefore, all accesses of this global
|
||||
must be done in critical sections during which signals are blocked.
|
||||
|
||||
Otherwise, for example, a signal may clear the last timer between, which
|
||||
sets timers global to NULL, between the NULL check and checking "expires",
|
||||
which causes a SEGV.
|
||||
|
||||
A previous patch protected write accesses. However, this is not
|
||||
sufficient. ead accesses must also be made atomic such that a signal
|
||||
cannot occur between the timers pointer NULL check and a subsequent
|
||||
dereference.
|
||||
|
||||
This change actually makes the Signal blocking in DoTimer() and
|
||||
CheckAllTimers() redundant, since they are always called with signals
|
||||
already blocked.
|
||||
|
||||
Also, make the global volatile to ensure that the compiler does not
|
||||
cache its value.
|
||||
|
||||
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
|
||||
---
|
||||
os/WaitFor.c | 27 +++++++++++++++++++--------
|
||||
1 files changed, 19 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/os/WaitFor.c b/os/WaitFor.c
|
||||
index 852362e..f105acc 100644
|
||||
--- a/os/WaitFor.c
|
||||
+++ b/os/WaitFor.c
|
||||
@@ -122,7 +122,7 @@ struct _OsTimerRec {
|
||||
|
||||
static void DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev);
|
||||
static void CheckAllTimers(void);
|
||||
-static OsTimerPtr timers = NULL;
|
||||
+volatile static OsTimerPtr timers = NULL;
|
||||
|
||||
/*****************
|
||||
* WaitForSomething:
|
||||
@@ -186,6 +186,7 @@ WaitForSomething(int *pClientsReady)
|
||||
}
|
||||
else {
|
||||
wt = NULL;
|
||||
+ OsBlockSignals();
|
||||
if (timers) {
|
||||
now = GetTimeInMillis();
|
||||
timeout = timers->expires - now;
|
||||
@@ -204,6 +205,7 @@ WaitForSomething(int *pClientsReady)
|
||||
wt = &waittime;
|
||||
}
|
||||
}
|
||||
+ OsReleaseSignals();
|
||||
XFD_COPYSET(&AllSockets, &LastSelectMask);
|
||||
}
|
||||
|
||||
@@ -251,6 +253,7 @@ WaitForSomething(int *pClientsReady)
|
||||
if (*checkForInput[0] != *checkForInput[1])
|
||||
return 0;
|
||||
|
||||
+ OsBlockSignals();
|
||||
if (timers) {
|
||||
int expired = 0;
|
||||
|
||||
@@ -261,14 +264,18 @@ WaitForSomething(int *pClientsReady)
|
||||
while (timers && (int) (timers->expires - now) <= 0)
|
||||
DoTimer(timers, now, &timers);
|
||||
|
||||
- if (expired)
|
||||
+ if (expired) {
|
||||
+ OsReleaseSignals();
|
||||
return 0;
|
||||
+ }
|
||||
}
|
||||
+ OsReleaseSignals();
|
||||
}
|
||||
else {
|
||||
fd_set tmp_set;
|
||||
|
||||
if (*checkForInput[0] == *checkForInput[1]) {
|
||||
+ OsBlockSignals();
|
||||
if (timers) {
|
||||
int expired = 0;
|
||||
|
||||
@@ -279,9 +286,12 @@ WaitForSomething(int *pClientsReady)
|
||||
while (timers && (int) (timers->expires - now) <= 0)
|
||||
DoTimer(timers, now, &timers);
|
||||
|
||||
- if (expired)
|
||||
+ if (expired) {
|
||||
+ OsReleaseSignals();
|
||||
return 0;
|
||||
+ }
|
||||
}
|
||||
+ OsReleaseSignals();
|
||||
}
|
||||
if (someReady)
|
||||
XFD_ORSET(&LastSelectMask, &ClientsWithInput, &LastSelectMask);
|
||||
@@ -382,7 +392,6 @@ CheckAllTimers(void)
|
||||
OsTimerPtr timer;
|
||||
CARD32 now;
|
||||
|
||||
- OsBlockSignals();
|
||||
start:
|
||||
now = GetTimeInMillis();
|
||||
|
||||
@@ -392,7 +401,6 @@ CheckAllTimers(void)
|
||||
goto start;
|
||||
}
|
||||
}
|
||||
- OsReleaseSignals();
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -400,13 +408,11 @@ DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev)
|
||||
{
|
||||
CARD32 newTime;
|
||||
|
||||
- OsBlockSignals();
|
||||
*prev = timer->next;
|
||||
timer->next = NULL;
|
||||
newTime = (*timer->callback) (timer, now, timer->arg);
|
||||
if (newTime)
|
||||
TimerSet(timer, 0, newTime, timer->callback, timer->arg);
|
||||
- OsReleaseSignals();
|
||||
}
|
||||
|
||||
OsTimerPtr
|
||||
@@ -508,10 +514,13 @@ TimerFree(OsTimerPtr timer)
|
||||
void
|
||||
TimerCheck(void)
|
||||
{
|
||||
- CARD32 now = GetTimeInMillis();
|
||||
+ CARD32 now;
|
||||
|
||||
+ OsBlockSignals();
|
||||
+ now = GetTimeInMillis();
|
||||
while (timers && (int) (timers->expires - now) <= 0)
|
||||
DoTimer(timers, now, &timers);
|
||||
+ OsReleaseSignals();
|
||||
}
|
||||
|
||||
void
|
||||
@@ -519,10 +528,12 @@ TimerInit(void)
|
||||
{
|
||||
OsTimerPtr timer;
|
||||
|
||||
+ OsBlockSignals();
|
||||
while ((timer = timers)) {
|
||||
timers = timer->next;
|
||||
free(timer);
|
||||
}
|
||||
+ OsReleaseSignals();
|
||||
}
|
||||
|
||||
#ifdef DPMSExtension
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,131 +0,0 @@
|
||||
From 2011e215a101ce928f81baae4ffa9d9ae817ce33 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri, 27 Apr 2012 08:52:39 +0800
|
||||
Subject: [PATCH] os: make timers signal-safe
|
||||
|
||||
If TimerSet() is called from a signal handler (synaptics tap handling code)
|
||||
may result in list corruption if we're currently inside TimerSet().
|
||||
|
||||
See backtrace in
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=814869
|
||||
|
||||
Block signals for all list manipulations in the timers.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
|
||||
(cherry picked from commit 08962951de969b9d8c870af8b6e47303dc0decfd)
|
||||
|
||||
Conflicts:
|
||||
|
||||
os/WaitFor.c
|
||||
---
|
||||
os/WaitFor.c | 18 ++++++++++++++++--
|
||||
1 files changed, 16 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/os/WaitFor.c b/os/WaitFor.c
|
||||
index 867cb04..236406e 100644
|
||||
--- a/os/WaitFor.c
|
||||
+++ b/os/WaitFor.c
|
||||
@@ -405,6 +405,7 @@ CheckAllTimers(void)
|
||||
OsTimerPtr timer;
|
||||
CARD32 now;
|
||||
|
||||
+ OsBlockSignals();
|
||||
start:
|
||||
now = GetTimeInMillis();
|
||||
|
||||
@@ -414,6 +415,7 @@ start:
|
||||
goto start;
|
||||
}
|
||||
}
|
||||
+ OsReleaseSignals();
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -421,11 +423,13 @@ DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev)
|
||||
{
|
||||
CARD32 newTime;
|
||||
|
||||
+ OsBlockSignals();
|
||||
*prev = timer->next;
|
||||
timer->next = NULL;
|
||||
newTime = (*timer->callback)(timer, now, timer->arg);
|
||||
if (newTime)
|
||||
TimerSet(timer, 0, newTime, timer->callback, timer->arg);
|
||||
+ OsReleaseSignals();
|
||||
}
|
||||
|
||||
OsTimerPtr
|
||||
@@ -443,6 +447,7 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
|
||||
}
|
||||
else
|
||||
{
|
||||
+ OsBlockSignals();
|
||||
for (prev = &timers; *prev; prev = &(*prev)->next)
|
||||
{
|
||||
if (*prev == timer)
|
||||
@@ -453,6 +458,7 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
|
||||
break;
|
||||
}
|
||||
}
|
||||
+ OsReleaseSignals();
|
||||
}
|
||||
if (!millis)
|
||||
return timer;
|
||||
@@ -473,29 +479,35 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
|
||||
if (!millis)
|
||||
return timer;
|
||||
}
|
||||
+ OsBlockSignals();
|
||||
for (prev = &timers;
|
||||
*prev && (int) ((*prev)->expires - millis) <= 0;
|
||||
prev = &(*prev)->next)
|
||||
;
|
||||
timer->next = *prev;
|
||||
*prev = timer;
|
||||
+ OsReleaseSignals();
|
||||
return timer;
|
||||
}
|
||||
|
||||
Bool
|
||||
TimerForce(OsTimerPtr timer)
|
||||
{
|
||||
+ int rc = FALSE;
|
||||
OsTimerPtr *prev;
|
||||
|
||||
+ OsBlockSignals();
|
||||
for (prev = &timers; *prev; prev = &(*prev)->next)
|
||||
{
|
||||
if (*prev == timer)
|
||||
{
|
||||
DoTimer(timer, GetTimeInMillis(), prev);
|
||||
- return TRUE;
|
||||
+ rc = TRUE;
|
||||
+ break;
|
||||
}
|
||||
}
|
||||
- return FALSE;
|
||||
+ OsReleaseSignals();
|
||||
+ return rc;
|
||||
}
|
||||
|
||||
|
||||
@@ -506,6 +518,7 @@ TimerCancel(OsTimerPtr timer)
|
||||
|
||||
if (!timer)
|
||||
return;
|
||||
+ OsBlockSignals();
|
||||
for (prev = &timers; *prev; prev = &(*prev)->next)
|
||||
{
|
||||
if (*prev == timer)
|
||||
@@ -514,6 +527,7 @@ TimerCancel(OsTimerPtr timer)
|
||||
break;
|
||||
}
|
||||
}
|
||||
+ OsReleaseSignals();
|
||||
}
|
||||
|
||||
void
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,85 +0,0 @@
|
||||
From d09984016e41b602885e25b17582a0f563384e16 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew de los Reyes <adlr@chromium.org>
|
||||
Date: Tue, 28 Aug 2012 14:33:45 -0700
|
||||
Subject: [PATCH] config/config.c: Workaround for handling udev REMOVED
|
||||
messages.
|
||||
|
||||
Details at http://code.google.com/p/chromium-os/issues/detail?id=33813 .
|
||||
|
||||
The result of the bug is that sometimes a path will have the non-/sys part
|
||||
of the prefix missing. For example,
|
||||
'/sys/devices/pci0000:00/0000:00:1d.3/usb5/5-1/5-1:1.0/bluetooth/hci0/hci0:21/input32'
|
||||
may come in as '/sys/hci0/hci0:21/input32'. This CL will look at the
|
||||
suffixes to determine if there is a match.
|
||||
|
||||
BUG=chromium-os:33813
|
||||
TEST=Reproduced error on ZGB. Saw log message appear and mouse
|
||||
function.
|
||||
---
|
||||
config/config.c | 39 +++++++++++++++++++++++++++++++++++++--
|
||||
1 files changed, 37 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/config/config.c b/config/config.c
|
||||
index 0dae3ad..636abb8 100644
|
||||
--- a/config/config.c
|
||||
+++ b/config/config.c
|
||||
@@ -90,6 +90,41 @@ remove_device(const char *backend, DeviceIntPtr dev)
|
||||
OsReleaseSignals();
|
||||
}
|
||||
|
||||
+/**
|
||||
+ * This is a workaround for
|
||||
+ * http://code.google.com/p/chromium-os/issues/detail?id=33813 .
|
||||
+ * We strip a prefix from the two strings we get, and if input_dev
|
||||
+ * is a suffix of existing_dev, we consider it a match.
|
||||
+ */
|
||||
+static Bool
|
||||
+dev_same_suffix(const char* existing_dev, const char* input_dev)
|
||||
+{
|
||||
+ const char PREFIX[] = "udev:/sys/";
|
||||
+ const size_t PREFIX_LEN = strlen(PREFIX);
|
||||
+ size_t existing_len, input_len;
|
||||
+
|
||||
+ if (strcmp(existing_dev, input_dev) == 0)
|
||||
+ return TRUE;
|
||||
+ /* If either doesn't have the magic prefix, abort */
|
||||
+ if (strncmp(existing_dev, PREFIX, PREFIX_LEN) != 0 ||
|
||||
+ strncmp(input_dev, PREFIX, PREFIX_LEN) != 0)
|
||||
+ return FALSE;
|
||||
+ existing_dev += PREFIX_LEN;
|
||||
+ input_dev += PREFIX_LEN;
|
||||
+ /* If input_dev is the suffix of existing_dev, return TRUE, else FALSE. */
|
||||
+ existing_len = strlen(existing_dev);
|
||||
+ input_len = strlen(input_dev);
|
||||
+ if (input_len > existing_len)
|
||||
+ return FALSE;
|
||||
+ if (strcmp(existing_dev + existing_len - input_len, input_dev) == 0) {
|
||||
+ LogMessage(X_INFO,
|
||||
+ "devices_same_suffix: matching %s with existing device %s\n",
|
||||
+ input_dev, existing_dev);
|
||||
+ return TRUE;
|
||||
+ }
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
void
|
||||
remove_devices(const char *backend, const char *config_info)
|
||||
{
|
||||
@@ -97,12 +132,12 @@ remove_devices(const char *backend, const char *config_info)
|
||||
|
||||
for (dev = inputInfo.devices; dev; dev = next) {
|
||||
next = dev->next;
|
||||
- if (dev->config_info && strcmp(dev->config_info, config_info) == 0)
|
||||
+ if (dev->config_info && dev_same_suffix(dev->config_info, config_info))
|
||||
remove_device(backend, dev);
|
||||
}
|
||||
for (dev = inputInfo.off_devices; dev; dev = next) {
|
||||
next = dev->next;
|
||||
- if (dev->config_info && strcmp(dev->config_info, config_info) == 0)
|
||||
+ if (dev->config_info && dev_same_suffix(dev->config_info, config_info))
|
||||
remove_device(backend, dev);
|
||||
}
|
||||
}
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From 5b8cafec54186ffc038874102e53419c2339130b Mon Sep 17 00:00:00 2001
|
||||
From: Chris Wolfe <cwolfe@chromium.org>
|
||||
Date: Mon, 23 Jul 2012 15:54:47 -0400
|
||||
Subject: [PATCH] fixes: Prevent the cursor from leaking at corners
|
||||
|
||||
This is a quick fix to prevent the cursor from leaking through between
|
||||
xfixes boundaries at corners. Previously the barrier_is_blocking_direction
|
||||
would consider e.g. a +X barrier to block -Y movement, so the second check
|
||||
in CursorConstrainCursorHarder would repeat the same barrier in some
|
||||
configurations.
|
||||
---
|
||||
xfixes/cursor.c | 10 +++++++++-
|
||||
1 files changed, 9 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
|
||||
index 7c46269..b9d5c4b 100644
|
||||
--- a/xfixes/cursor.c
|
||||
+++ b/xfixes/cursor.c
|
||||
@@ -1055,7 +1055,15 @@ barrier_is_blocking_direction(const struct PointerBarrier * barrier,
|
||||
int direction)
|
||||
{
|
||||
/* Barriers define which way is ok, not which way is blocking */
|
||||
- return (barrier->directions & direction) != direction;
|
||||
+ int blocks;
|
||||
+ if (barrier_is_vertical(barrier)) {
|
||||
+ blocks = BarrierNegativeX | BarrierPositiveX;
|
||||
+ } else {
|
||||
+ blocks = BarrierNegativeY | BarrierPositiveY;
|
||||
+ }
|
||||
+ blocks &= ~barrier->directions;
|
||||
+
|
||||
+ return (blocks & direction) != 0;
|
||||
}
|
||||
|
||||
/**
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,168 +0,0 @@
|
||||
From 5dfb771f6e690b0a2f558f1b2c9d0787bc885587 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Kurtz <djkurtz@chromium.org>
|
||||
Date: Mon, 12 Nov 2012 14:39:33 +0800
|
||||
Subject: [PATCH] Per Randr CRTC pointer scaling
|
||||
|
||||
Scale pointer motion based on the pixel density of the current "RandR" crtc
|
||||
and whether or not it's internal.
|
||||
|
||||
This implementation is very hacky since it directly accesses XRandR methods
|
||||
and datastructures from within the X server proper. I'm not sure what
|
||||
the proper way to solve this is.
|
||||
|
||||
BUG=chromium-os:30822
|
||||
TEST=Tested on Link, Lucas w/ external display that pointer scaled
|
||||
properly in each.
|
||||
---
|
||||
dix/getevents.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 files changed, 114 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dix/getevents.c b/dix/getevents.c
|
||||
index 7454cb4..5f00584 100644
|
||||
--- a/dix/getevents.c
|
||||
+++ b/dix/getevents.c
|
||||
@@ -51,6 +51,7 @@
|
||||
#include "inpututils.h"
|
||||
#include "mi.h"
|
||||
#include "windowstr.h"
|
||||
+#include "randrstr.h"
|
||||
|
||||
#include <X11/extensions/XKBproto.h>
|
||||
#include "xkbsrv.h"
|
||||
@@ -72,6 +73,8 @@
|
||||
/* Number of motion history events to store. */
|
||||
#define MOTION_HISTORY_SIZE 256
|
||||
|
||||
+#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
|
||||
+
|
||||
/**
|
||||
* InputEventList is the storage for input events generated by
|
||||
* QueuePointerEvents, QueueKeyboardEvents, and QueueProximityEvents.
|
||||
@@ -1262,6 +1265,115 @@ QueuePointerEvents(DeviceIntPtr device, int type,
|
||||
queueEventList(device, InputEventList, nevents);
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * Return TRUE if (x, y) is within the bounds of the given X RandR CRTC.
|
||||
+ * If so, it also returns whether the display is high DPI and/or internal.
|
||||
+ */
|
||||
+static Bool
|
||||
+RRCrtcContainsPosition(RRCrtcPtr crtc, int x, int y,
|
||||
+ int *isHighDPI, int *isInternal)
|
||||
+{
|
||||
+ int i;
|
||||
+ int width, height;
|
||||
+ const float maxLowDPmm = 160.0 / 25.4; /* 160 DPI / 25.4 mm/inch */
|
||||
+ const char * const integratedPrefixes[] = { "LVDS", "eDP" };
|
||||
+
|
||||
+ if (!crtc->mode)
|
||||
+ return FALSE;
|
||||
+
|
||||
+ RRCrtcGetScanoutSize(crtc, &width, &height);
|
||||
+
|
||||
+ if (crtc->x <= x && x < crtc->x + width &&
|
||||
+ crtc->y <= y && y < crtc->y + height) {
|
||||
+ /* Use the first output for extra return values */
|
||||
+ if (crtc->numOutputs) {
|
||||
+ RROutputPtr output = crtc->outputs[0];
|
||||
+ /* Only consider HighDPI if the output has a mmWidth. */
|
||||
+ *isHighDPI = output->mmWidth &&
|
||||
+ width > maxLowDPmm * output->mmWidth;
|
||||
+ *isInternal = FALSE;
|
||||
+ for (i = 0; i < ARRAY_SIZE(integratedPrefixes); i++) {
|
||||
+ if (!strncmp(integratedPrefixes[i], output->name,
|
||||
+ strlen(integratedPrefixes[i]))) {
|
||||
+ *isInternal = TRUE;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ return TRUE;
|
||||
+ }
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * Find the X RandR CRTC (ie display) which contains desktop coordinate (x,y),
|
||||
+ * and return whether it's high DPI and/or internal.
|
||||
+ *
|
||||
+ * Returns FALSE if (x, y) is not on any known X RandR CRTC.
|
||||
+ */
|
||||
+static Bool
|
||||
+RRGetContainingCrtcInfo(ScreenPtr pScreen, int x, int y,
|
||||
+ int *isHighDPI, int *isInternal)
|
||||
+{
|
||||
+ rrScrPrivPtr rrScrPriv = rrGetScrPriv(pScreen);
|
||||
+ RRCrtcPtr crtc = rrScrPriv->pointerCrtc;
|
||||
+ int i;
|
||||
+
|
||||
+ /* Check last known CRTC */
|
||||
+ if (crtc && RRCrtcContainsPosition(crtc, x, y, isHighDPI, isInternal)) {
|
||||
+ return TRUE;
|
||||
+ }
|
||||
+
|
||||
+ /* Check all CRTCs */
|
||||
+ for (i = 0; i < rrScrPriv->numCrtcs; i++) {
|
||||
+ crtc = rrScrPriv->crtcs[i];
|
||||
+ if (RRCrtcContainsPosition(crtc, x, y, isHighDPI, isInternal)) {
|
||||
+ rrScrPriv->pointerCrtc = crtc;
|
||||
+ return TRUE;
|
||||
+ }
|
||||
+ }
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * Scale the motion vector in mask valuators 0 & 1
|
||||
+ *
|
||||
+ * Find the RandR CRTC for the current pointer position for this device, and
|
||||
+ * use its pixel density and whether or not it's integrated to scale pointer
|
||||
+ * motion. Specifically: double all motion on High-DPI displays, add 20% more
|
||||
+ * motion on non-integrated displays.
|
||||
+ */
|
||||
+static void
|
||||
+scaleMotionPerRRCrtc(DeviceIntPtr dev, ValuatorMask *mask)
|
||||
+{
|
||||
+ ScreenPtr pScreen = miPointerGetScreen(dev);
|
||||
+ double x, y, dx, dy, scale;
|
||||
+ int isHighDPI = FALSE;
|
||||
+ int isInternal = FALSE;
|
||||
+
|
||||
+ x = dev->last.valuators[0];
|
||||
+ y = dev->last.valuators[1];
|
||||
+
|
||||
+ /* Find Size of RandR CRTC containing the current pointer (x, y) */
|
||||
+ if (!RRGetContainingCrtcInfo(pScreen, x, y, &isHighDPI, &isInternal))
|
||||
+ return;
|
||||
+
|
||||
+ scale = 1.0;
|
||||
+ if (isHighDPI)
|
||||
+ scale *= 2.0;
|
||||
+ if (!isInternal)
|
||||
+ scale *= 1.2;
|
||||
+
|
||||
+ if (scale != 1.0) {
|
||||
+ if (valuator_mask_fetch_double(mask, 0, &dx))
|
||||
+ valuator_mask_set_double(mask, 0, dx * scale);
|
||||
+
|
||||
+ if (valuator_mask_fetch_double(mask, 1, &dy))
|
||||
+ valuator_mask_set_double(mask, 1, dy * scale);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+
|
||||
/**
|
||||
* Helper function for GetPointerEvents, which only generates motion and
|
||||
* raw motion events for the slave device: does not update the master device.
|
||||
@@ -1368,6 +1480,8 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
|
||||
if ((flags & POINTER_NORAW) == 0)
|
||||
set_raw_valuators(raw, &mask, raw->valuators.data);
|
||||
|
||||
+ scaleMotionPerRRCrtc(pDev, &mask);
|
||||
+
|
||||
moveRelative(pDev, &mask);
|
||||
}
|
||||
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,93 +0,0 @@
|
||||
From e2e273e135bcdadde22c48cf2d70cbd22f268120 Mon Sep 17 00:00:00 2001
|
||||
From: Yuly Novikov <ynovikov@chromium.org>
|
||||
Date: Mon, 19 Nov 2012 21:04:57 -0500
|
||||
Subject: [PATCH] dix: Save touchpoint last coordinates before transform.
|
||||
#49347
|
||||
|
||||
DDXTouchPointInfoRec.valuators used to store axis values after transform.
|
||||
This resulted in Coordinate Transformation Matrix
|
||||
being applied multiple times to the last coordinates,
|
||||
in the case when only pressure changes in the last touch event.
|
||||
|
||||
Changed DDXTouchPointInfoRec.valuators to store values before transform.
|
||||
|
||||
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=49347
|
||||
|
||||
BUG=chromium-os:36115
|
||||
TEST=Follow the expected output in the bug desription.
|
||||
|
||||
Signed-off-by: Yuly Novikov <ynovikov@chromium.org>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
(cherry picked from commit 3b9f1c701787965246638c1a6fd99fb2b6078114)
|
||||
|
||||
Conflicts:
|
||||
|
||||
dix/getevents.c
|
||||
---
|
||||
dix/getevents.c | 22 +++++++++-------------
|
||||
include/inputstr.h | 2 +-
|
||||
2 files changed, 10 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/dix/getevents.c b/dix/getevents.c
|
||||
index 7454cb4..f1e7491 100644
|
||||
--- a/dix/getevents.c
|
||||
+++ b/dix/getevents.c
|
||||
@@ -1895,32 +1895,28 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
- if (t->mode == XIDirectTouch && !(flags & TOUCH_CLIENT_ID)) {
|
||||
- if (!valuator_mask_isset(&mask, 0))
|
||||
- valuator_mask_set_double(&mask, 0,
|
||||
- valuator_mask_get_double(touchpoint.ti->
|
||||
- valuators, 0));
|
||||
- if (!valuator_mask_isset(&mask, 1))
|
||||
- valuator_mask_set_double(&mask, 1,
|
||||
- valuator_mask_get_double(touchpoint.ti->
|
||||
- valuators, 1));
|
||||
- }
|
||||
|
||||
/* Get our screen event co-ordinates (root_x/root_y/event_x/event_y):
|
||||
* these come from the touchpoint in Absolute mode, or the sprite in
|
||||
* Relative. */
|
||||
if (t->mode == XIDirectTouch) {
|
||||
- transformAbsolute(dev, &mask);
|
||||
-
|
||||
if (!(flags & TOUCH_CLIENT_ID)) {
|
||||
- for (i = 0; i < valuator_mask_size(&mask); i++) {
|
||||
+ for (i = 0; i < max(valuator_mask_size(&mask), 2); i++) {
|
||||
double val;
|
||||
|
||||
if (valuator_mask_fetch_double(&mask, i, &val))
|
||||
valuator_mask_set_double(touchpoint.ti->valuators, i, val);
|
||||
+ /* If the device doesn't post new X and Y axis values,
|
||||
+ * use the last values posted.
|
||||
+ */
|
||||
+ else if (i < 2 &&
|
||||
+ valuator_mask_fetch_double(touchpoint.ti->valuators, i,
|
||||
+ &val))
|
||||
+ valuator_mask_set_double(&mask, i, val);
|
||||
}
|
||||
}
|
||||
|
||||
+ transformAbsolute(dev, &mask);
|
||||
clipAbsolute(dev, &mask);
|
||||
}
|
||||
else {
|
||||
diff --git a/include/inputstr.h b/include/inputstr.h
|
||||
index 841e805..bce46cb 100644
|
||||
--- a/include/inputstr.h
|
||||
+++ b/include/inputstr.h
|
||||
@@ -331,7 +331,7 @@ typedef struct _DDXTouchPointInfo {
|
||||
uint32_t ddx_id; /* touch ID given by the DDX */
|
||||
Bool emulate_pointer;
|
||||
|
||||
- ValuatorMask *valuators; /* last recorded axis values */
|
||||
+ ValuatorMask *valuators; /* last axis values as posted, pre-transform */
|
||||
} DDXTouchPointInfoRec;
|
||||
|
||||
typedef struct _TouchClassRec {
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
diff -aur xorg-server-1.12.4/hw/xfree86/modes/xf86Crtc.c xorg-server-1.12.4.work/hw/xfree86/modes/xf86Crtc.c
|
||||
--- xorg-server-1.12.4/hw/xfree86/modes/xf86Crtc.c 2012-08-26 22:11:00.000000000 -0700
|
||||
+++ xorg-server-1.12.4.work/hw/xfree86/modes/xf86Crtc.c 2012-10-26 16:34:34.316834000 -0700
|
||||
@@ -2208,6 +2208,53 @@
|
||||
}
|
||||
|
||||
static Bool
|
||||
+xf86TargetChromeOS(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
|
||||
+ DisplayModePtr *modes, Bool *enabled,
|
||||
+ int width, int height)
|
||||
+{
|
||||
+ int o, p;
|
||||
+ DisplayModePtr main_output_mode;
|
||||
+ xf86OutputPtr main_output = NULL;
|
||||
+ Bool found = FALSE;
|
||||
+
|
||||
+ /* Find the main output */
|
||||
+ for (o = -1; nextEnabledOutput(config, enabled, &o); )
|
||||
+ {
|
||||
+ if ( !strncmp(config->output[o]->name, "LVDS", 4) ||
|
||||
+ !strncmp(config->output[o]->name, "eDP", 3) )
|
||||
+ {
|
||||
+ main_output = config->output[o];
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* If we didn't find anything, grab the first enabled output */
|
||||
+ if (!main_output) {
|
||||
+ o = -1;
|
||||
+ nextEnabledOutput(config, enabled, &o);
|
||||
+ main_output = config->output[o];
|
||||
+ }
|
||||
+
|
||||
+ if (!main_output)
|
||||
+ return FALSE;
|
||||
+
|
||||
+ if (!(main_output_mode = xf86OutputHasPreferredMode(main_output,
|
||||
+ width, height)))
|
||||
+ return FALSE;
|
||||
+
|
||||
+ /* Actually do the modesetting: turn off all non-main monitors */
|
||||
+ for (o = -1; nextEnabledOutput(config, enabled, &o); )
|
||||
+ {
|
||||
+ if (config->output[o] == main_output)
|
||||
+ modes[o] = main_output_mode;
|
||||
+ else
|
||||
+ (*config->output[o]->funcs->dpms)(config->output[o], DPMSModeOff);
|
||||
+ }
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
+static Bool
|
||||
xf86CrtcSetInitialGamma(xf86CrtcPtr crtc, float gamma_red, float gamma_green,
|
||||
float gamma_blue)
|
||||
{
|
||||
@@ -2369,6 +2416,8 @@
|
||||
else {
|
||||
if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
|
||||
xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
|
||||
+ else if (xf86TargetChromeOS(scrn, config, modes, enabled, width, height))
|
||||
+ xf86DrvMsg(i, X_INFO, "Using ChromeOS mode for initial modes\n");
|
||||
else if (xf86TargetPreferred
|
||||
(scrn, config, modes, enabled, width, height))
|
||||
xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
|
||||
@ -1,90 +0,0 @@
|
||||
Subject: [PATCH] no default cursor
|
||||
|
||||
Revive the Xserver's null-root-cursor option.
|
||||
---
|
||||
configure.ac | 7 +++++++
|
||||
dix/cursor.c | 17 +++++++++++++++++
|
||||
include/dix-config.h.in | 3 +++
|
||||
3 files changed, 27 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 03beb36..e4d0163 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -566,6 +566,9 @@ AC_ARG_ENABLE(install-libxf86config,
|
||||
[Install libxf86config (default: disabled)]),
|
||||
[INSTALL_LIBXF86CONFIG=$enableval],
|
||||
[INSTALL_LIBXF86CONFIG=no])
|
||||
+AC_ARG_ENABLE(null-root-cursor, AS_HELP_STRING([--enable-null-root-cursor], [Use an empty root cursor (default: use core cursor)]),
|
||||
+ [NULL_ROOT_CURSOR=$enableval],
|
||||
+ [NULL_ROOT_CURSOR=no])
|
||||
AC_ARG_ENABLE(visibility, AC_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]),
|
||||
[SYMBOL_VISIBILITY=$enableval],
|
||||
[SYMBOL_VISIBILITY=auto])
|
||||
@@ -1239,6 +1242,10 @@ XKB_LIB='$(top_builddir)/xkb/libxkb.la'
|
||||
XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
|
||||
REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
|
||||
|
||||
+if test "x$NULL_ROOT_CURSOR" = xyes; then
|
||||
+ AC_DEFINE(NULL_ROOT_CURSOR, 1, [Use an empty root cursor])
|
||||
+fi
|
||||
+
|
||||
PKG_CHECK_MODULES([XDMCP], [xdmcp], [have_libxdmcp="yes"], [have_libxdmcp="no"])
|
||||
if test "x$have_libxdmcp" = xyes; then
|
||||
AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS])
|
||||
diff --git a/dix/cursor.c b/dix/cursor.c
|
||||
index 6bff447..8771abf 100644
|
||||
--- a/dix/cursor.c
|
||||
+++ b/dix/cursor.c
|
||||
@@ -455,10 +455,26 @@ CursorPtr
|
||||
CreateRootCursor(char *unused1, unsigned int unused2)
|
||||
{
|
||||
CursorPtr curs;
|
||||
+#ifdef NULL_ROOT_CURSOR
|
||||
+ CursorMetricRec cm;
|
||||
+#else
|
||||
FontPtr cursorfont;
|
||||
int err;
|
||||
XID fontID;
|
||||
+#endif
|
||||
+
|
||||
+#ifdef NULL_ROOT_CURSOR
|
||||
+ cm.width = 0;
|
||||
+ cm.height = 0;
|
||||
+ cm.xhot = 0;
|
||||
+ cm.yhot = 0;
|
||||
|
||||
+ AllocARGBCursor(NULL, NULL, NULL, &cm, 0, 0, 0, 0, 0, 0,
|
||||
+ &curs, serverClient, (XID)0);
|
||||
+
|
||||
+ if (curs == NullCursor)
|
||||
+ return NullCursor;
|
||||
+#else
|
||||
fontID = FakeClientID(0);
|
||||
err = OpenFont(serverClient, fontID, FontLoadAll | FontOpenSync,
|
||||
(unsigned) strlen(defaultCursorFont), defaultCursorFont);
|
||||
@@ -472,6 +488,7 @@ CreateRootCursor(char *unused1, unsigned int unused2)
|
||||
if (AllocGlyphCursor(fontID, 0, fontID, 1, 0, 0, 0, ~0, ~0, ~0,
|
||||
&curs, serverClient, (XID) 0) != Success)
|
||||
return NullCursor;
|
||||
+#endif
|
||||
|
||||
if (!AddResource(FakeClientID(0), RT_CURSOR, (pointer) curs))
|
||||
return NullCursor;
|
||||
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
|
||||
index 3fb6413..d9871d4 100644
|
||||
--- a/include/dix-config.h.in
|
||||
+++ b/include/dix-config.h.in
|
||||
@@ -402,6 +402,9 @@
|
||||
/* Support HAL for hotplug */
|
||||
#undef CONFIG_HAL
|
||||
|
||||
+/* Use an empty root cursor */
|
||||
+#undef NULL_ROOT_CURSOR
|
||||
+
|
||||
/* Have a monotonic clock from clock_gettime() */
|
||||
#undef MONOTONIC_CLOCK
|
||||
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm-setup.initd-1,v 1.1 2010/04/13 10:07:39 scarabeus Exp $
|
||||
|
||||
depend() {
|
||||
need localmount
|
||||
}
|
||||
|
||||
start() {
|
||||
if get_bootparam "nox" ; then
|
||||
touch /etc/.noxdm
|
||||
fi
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
# We always try and start X on a static VT. The various DMs normally default
|
||||
# to using VT7. If you wish to use the xdm init script, then you should ensure
|
||||
# that the VT checked is the same VT your DM wants to use. We do this check to
|
||||
# ensure that you haven't accidentally configured something to run on the VT
|
||||
# in your /etc/inittab file so that you don't get a dead keyboard.
|
||||
CHECKVT=7
|
||||
|
||||
# What display manager do you use ? [ xdm | gdm | kdm | gpe | entrance ]
|
||||
# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
|
||||
DISPLAYMANAGER="xdm"
|
||||
@ -1,216 +0,0 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License, v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-8,v 1.1 2012/05/01 22:08:46 chithanh Exp $
|
||||
|
||||
# This is here to serve as a note to myself, and future developers.
|
||||
#
|
||||
# Any Display manager (gdm,kdm,xdm) has the following problem: if
|
||||
# it is started before any getty, and no vt is specified, it will
|
||||
# usually run on vt2. When the getty on vt2 then starts, and the
|
||||
# DM is already started, the getty will take control of the keyboard,
|
||||
# leaving us with a "dead" keyboard.
|
||||
#
|
||||
# Resolution: add the following line to /etc/inittab
|
||||
#
|
||||
# x:a:once:/etc/X11/startDM.sh
|
||||
#
|
||||
# and have /etc/X11/startDM.sh start the DM in daemon mode if
|
||||
# a lock is present (with the info of what DM should be started),
|
||||
# else just fall through.
|
||||
#
|
||||
# How this basically works, is the "a" runlevel is a additional
|
||||
# runlevel that you can use to fork processes with init, but the
|
||||
# runlevel never gets changed to this runlevel. Along with the "a"
|
||||
# runlevel, the "once" key word means that startDM.sh will only be
|
||||
# run when we specify it to run, thus eliminating respawning
|
||||
# startDM.sh when "xdm" is not added to the default runlevel, as was
|
||||
# done previously.
|
||||
#
|
||||
# This script then just calls "telinit a", and init will run
|
||||
# /etc/X11/startDM.sh after the current runlevel completes (this
|
||||
# script should only be added to the actual runlevel the user is
|
||||
# using).
|
||||
#
|
||||
# Martin Schlemmer
|
||||
# aka Azarah
|
||||
# 04 March 2002
|
||||
|
||||
depend() {
|
||||
need localmount xdm-setup
|
||||
|
||||
# this should start as early as possible
|
||||
# we can't do 'before *' as that breaks it
|
||||
# (#139824) Start after ypbind and autofs for network authentication
|
||||
# (#145219 #180163) Could use lirc mouse as input device
|
||||
# (#70689 comment #92) Start after consolefont to avoid display corruption
|
||||
# (#291269) Start after quota, since some dm need readable home
|
||||
# (#390609) gdm-3 will fail when dbus is not running
|
||||
# (#366753) starting keymaps after X causes problems
|
||||
after bootmisc consolefont modules netmount
|
||||
after readahead-list ypbind autofs openvpn gpm lircmd
|
||||
after quota keymaps
|
||||
before alsasound
|
||||
|
||||
# Start before X
|
||||
use consolekit dbus xfs
|
||||
}
|
||||
|
||||
setup_dm() {
|
||||
local MY_XDM
|
||||
|
||||
MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
|
||||
|
||||
# Load our root path from profile.env
|
||||
# Needed for kdm
|
||||
PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
|
||||
|
||||
NAME=
|
||||
case "${MY_XDM}" in
|
||||
kdm|kde)
|
||||
EXE=/usr/bin/kdm
|
||||
PIDFILE=/var/run/kdm.pid
|
||||
;;
|
||||
entrance*)
|
||||
EXE=/usr/sbin/entranced
|
||||
PIDFILE=/var/lib/entranced.pid
|
||||
;;
|
||||
gdm|gnome)
|
||||
EXE=/usr/bin/gdm
|
||||
[ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
|
||||
PIDFILE=/var/run/gdm.pid
|
||||
;;
|
||||
wdm)
|
||||
EXE=/usr/bin/wdm
|
||||
PIDFILE=
|
||||
;;
|
||||
gpe)
|
||||
EXE=/usr/bin/gpe-dm
|
||||
PIDFILE=/var/run/gpe-dm.pid
|
||||
;;
|
||||
lxdm)
|
||||
EXE=/usr/sbin/lxdm-binary
|
||||
PIDFILE=/var/run/lxdm.pid
|
||||
START_STOP_ARGS="--background"
|
||||
;;
|
||||
lightdm)
|
||||
EXE=/usr/sbin/lightdm
|
||||
PIDFILE=/var/run/lightdm.pid
|
||||
START_STOP_ARGS="--background"
|
||||
;;
|
||||
*)
|
||||
# first find out if there is such executable
|
||||
EXE="$(command -v ${MY_XDM} 2>/dev/null)"
|
||||
PIDFILE="/var/run/${MY_XDM}.pid"
|
||||
|
||||
# warn user that he is doing sick things if the exe was not found
|
||||
if [ -z "${EXE}" ]; then
|
||||
echo "ERROR: Your XDM value is invalid."
|
||||
echo " No ${MY_XDM} executable could be found on your system."
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
if ! [ -x "${EXE}" ]; then
|
||||
EXE=/usr/bin/xdm
|
||||
PIDFILE=/var/run/xdm.pid
|
||||
if ! [ -x "/usr/bin/xdm" ]; then
|
||||
echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
|
||||
echo " or install x11-apps/xdm package"
|
||||
eend 255
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
# Check to see if something is defined on our VT
|
||||
vtstatic() {
|
||||
if [ -e /etc/inittab ] ; then
|
||||
grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
|
||||
elif [ -e /etc/ttys ] ; then
|
||||
grep -q "^ttyv$(($1 - 1))" /etc/ttys
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
start() {
|
||||
local EXE NAME PIDFILE
|
||||
setup_dm
|
||||
|
||||
if [ -f /etc/.noxdm ]; then
|
||||
einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."
|
||||
rm /etc/.noxdm
|
||||
return 0
|
||||
fi
|
||||
|
||||
ebegin "Setting up ${EXE##*/}"
|
||||
|
||||
# save the prefered DM
|
||||
save_options "service" "${EXE}"
|
||||
save_options "name" "${NAME}"
|
||||
save_options "pidfile" "${PIDFILE}"
|
||||
save_options "start_stop_args" "${START_STOP_ARGS}"
|
||||
|
||||
if [ -n "${CHECKVT-y}" ] ; then
|
||||
if vtstatic "${CHECKVT:-7}" ; then
|
||||
if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
|
||||
ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
|
||||
telinit a >/dev/null 2>&1
|
||||
return 0
|
||||
else
|
||||
eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
/etc/X11/startDM.sh
|
||||
eend 0
|
||||
}
|
||||
|
||||
stop() {
|
||||
local curvt retval
|
||||
|
||||
retval=0
|
||||
if [ -t 0 ]; then
|
||||
if type fgconsole >/dev/null 2>&1; then
|
||||
curvt=$(fgconsole 2>/dev/null)
|
||||
else
|
||||
curvt=$(tty)
|
||||
case "${curvt}" in
|
||||
/dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
|
||||
*) curvt= ;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
local myexe myname mypidfile myservice
|
||||
myexe=$(get_options "service")
|
||||
myname=$(get_options "name")
|
||||
mypidfile=$(get_options "pidfile")
|
||||
myservice=${myexe##*/}
|
||||
|
||||
[ -z "${myexe}" ] && return 0
|
||||
|
||||
ebegin "Stopping ${myservice}"
|
||||
|
||||
if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
|
||||
start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
|
||||
${mypidfile:+--pidfile} ${mypidfile} \
|
||||
${myname:+--name} ${myname}
|
||||
retval=${?}
|
||||
fi
|
||||
|
||||
# switch back to original vt
|
||||
if [ -n "${curvt}" ]; then
|
||||
if type chvt >/dev/null 2>&1; then
|
||||
chvt "${curvt}"
|
||||
else
|
||||
vidcontrol -s "$((curvt + 1))"
|
||||
fi
|
||||
fi
|
||||
|
||||
eend ${retval} "Error stopping ${myservice}"
|
||||
return ${retval}
|
||||
}
|
||||
|
||||
# vim: set ts=4 :
|
||||
@ -1,15 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 2693ce7..ac752fc 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then
|
||||
linux_alpha=yes
|
||||
;;
|
||||
i*86|amd64*|x86_64*|ia64*)
|
||||
- linux_acpi="yes"
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
# Rebuild all X11 modules (mostly useful after xorg-server ABI change).
|
||||
[x11-module-rebuild]
|
||||
class = portage.sets.dbapi.VariableSet
|
||||
world-candidate = false
|
||||
variable = CATEGORY
|
||||
includes = x11-drivers
|
||||
@ -1,335 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.2.ebuild,v 1.9 2012/07/22 12:54:50 chithanh Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
XORG_DOC=doc
|
||||
XORG_EAUTORECONF="yes"
|
||||
inherit flag-o-matic xorg-2 multilib versionator
|
||||
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
|
||||
|
||||
DESCRIPTION="X.Org X servers"
|
||||
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
|
||||
|
||||
IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
|
||||
# +suid needed because sparcs default off
|
||||
IUSE="${IUSE_SERVERS} broken_partialswaps -doc ipv6 minimal nptl selinux +suid tegra tslib +udev"
|
||||
|
||||
RDEPEND=">=app-admin/eselect-opengl-1.0.8
|
||||
dev-libs/openssl
|
||||
media-libs/freetype
|
||||
>=x11-apps/iceauth-1.0.2
|
||||
>=x11-apps/rgb-1.0.3
|
||||
>=x11-apps/xauth-1.0.3
|
||||
x11-apps/xkbcomp
|
||||
>=x11-libs/libpciaccess-0.12.901
|
||||
>=x11-libs/libXau-1.0.4
|
||||
>=x11-libs/libXdmcp-1.0.2
|
||||
>=x11-libs/libXfont-1.4.2
|
||||
>=x11-libs/libxkbfile-1.0.4
|
||||
>=x11-libs/pixman-0.21.8
|
||||
>=x11-libs/xtrans-1.2.2
|
||||
>=x11-misc/xbitmaps-1.0.1
|
||||
>=x11-misc/xkeyboard-config-2.4.1-r3
|
||||
dmx? (
|
||||
x11-libs/libXt
|
||||
>=x11-libs/libdmx-1.0.99.1
|
||||
>=x11-libs/libX11-1.1.5
|
||||
>=x11-libs/libXaw-1.0.4
|
||||
>=x11-libs/libXext-1.0.99.4
|
||||
>=x11-libs/libXfixes-5.0
|
||||
>=x11-libs/libXi-1.2.99.1
|
||||
>=x11-libs/libXmu-1.0.3
|
||||
x11-libs/libXrender
|
||||
>=x11-libs/libXres-1.0.3
|
||||
>=x11-libs/libXtst-1.0.99.2
|
||||
)
|
||||
kdrive? (
|
||||
>=x11-libs/libXext-1.0.5
|
||||
x11-libs/libXv
|
||||
)
|
||||
!minimal? (
|
||||
>=x11-libs/libX11-1.1.5
|
||||
>=x11-libs/libXext-1.0.5
|
||||
>=media-libs/mesa-7.8_rc[nptl=]
|
||||
)
|
||||
tslib? ( >=x11-libs/tslib-1.0 )
|
||||
udev? ( >=sys-fs/udev-150 )
|
||||
>=x11-apps/xinit-1.3
|
||||
selinux? ( sec-policy/selinux-xserver )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/flex
|
||||
>=x11-proto/bigreqsproto-1.1.0
|
||||
>=x11-proto/compositeproto-0.4
|
||||
>=x11-proto/damageproto-1.1
|
||||
>=x11-proto/fixesproto-5.0
|
||||
>=x11-proto/fontsproto-2.0.2
|
||||
>=x11-proto/glproto-1.4.14
|
||||
>=x11-proto/inputproto-2.1.99.3
|
||||
>=x11-proto/kbproto-1.0.3
|
||||
>=x11-proto/randrproto-1.2.99.3
|
||||
>=x11-proto/recordproto-1.13.99.1
|
||||
>=x11-proto/renderproto-0.11
|
||||
>=x11-proto/resourceproto-1.0.2
|
||||
>=x11-proto/scrnsaverproto-1.1
|
||||
>=x11-proto/trapproto-3.4.3
|
||||
>=x11-proto/videoproto-2.2.2
|
||||
>=x11-proto/xcmiscproto-1.2.0
|
||||
>=x11-proto/xextproto-7.1.99
|
||||
>=x11-proto/xf86dgaproto-2.0.99.1
|
||||
>=x11-proto/xf86rushproto-1.1.2
|
||||
>=x11-proto/xf86vidmodeproto-2.2.99.1
|
||||
>=x11-proto/xineramaproto-1.1.3
|
||||
>=x11-proto/xproto-7.0.22
|
||||
dmx? (
|
||||
>=x11-proto/dmxproto-2.2.99.1
|
||||
doc? (
|
||||
|| (
|
||||
www-client/links
|
||||
www-client/lynx
|
||||
www-client/w3m
|
||||
)
|
||||
)
|
||||
)
|
||||
!minimal? (
|
||||
>=x11-proto/xf86driproto-2.1.0
|
||||
>=x11-proto/dri2proto-2.6
|
||||
>=x11-libs/libdrm-2.4.20
|
||||
)"
|
||||
|
||||
PDEPEND="
|
||||
xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
|
||||
|
||||
REQUIRED_USE="!minimal? (
|
||||
|| ( ${IUSE_SERVERS} )
|
||||
)"
|
||||
|
||||
#UPSTREAMED_PATCHES=(
|
||||
# "${WORKDIR}/patches/"
|
||||
#)
|
||||
|
||||
PATCHES=(
|
||||
"${UPSTREAMED_PATCHES[@]}"
|
||||
"${FILESDIR}"/${PN}-1.12-disable-acpi.patch
|
||||
|
||||
# Allow usage of monotonic clock while cross-compiling.
|
||||
"${FILESDIR}/1.11.99.902-monotonic-clock-fix.patch"
|
||||
"${FILESDIR}/1.11.99.902-cache-xkbcomp-for-fast-start-up.patch"
|
||||
# Match the behaviour of monitor_reconfigure at X.Org startup time.
|
||||
"${FILESDIR}/1.9.3-chromeos-mode.patch"
|
||||
# Allow setting the root window background to nothing to further reduce
|
||||
# flicker when showing and hiding the composite overlay window.
|
||||
"${FILESDIR}/1.11.99.902-allow-root-none.patch"
|
||||
# Refcount glxdrawables to avoid crashes on double free()
|
||||
"${FILESDIR}/1.11.99.902-refcnt-glxdrawable.patch"
|
||||
|
||||
"${FILESDIR}/1.11.99.902-chromium-mouse-accel-profile.patch"
|
||||
|
||||
"${FILESDIR}/1.11.99.902-xserver-bg-none-root.patch"
|
||||
# Dont load a default X cursor.
|
||||
"${FILESDIR}/1.9.3-no-default-cursor.patch"
|
||||
# Ability to run without root privs
|
||||
"${FILESDIR}/1.11.99.902-nohwaccess.patch"
|
||||
# Don't attend clients which are already gone, race condition in dri2
|
||||
"${FILESDIR}/1.12.0-do-not-attend-gone-clients.patch"
|
||||
# crosbug.com/p/11408
|
||||
"${FILESDIR}/1.12.0-fix-scale-to-desktop-for-edge-ABS-events.patch"
|
||||
# Fix for xfixes pointer barriers
|
||||
"${FILESDIR}/1.12.0-xfixes-safer-barriers.patch"
|
||||
# crosbug.com/33813
|
||||
"${FILESDIR}/1.12.0-suffix-match-udev-paths.patch"
|
||||
# crosbug.com/31570
|
||||
"${FILESDIR}/1.12.0-os-block-signals-when-accessing-global-timer-list.patch"
|
||||
# Fix for crash with floating touchscreen (http://crosbug.com/27529)
|
||||
"${FILESDIR}/1.12.0-mi-don-t-check-for-core-events-in-miPointerSetPositi.patch"
|
||||
# Add the flag to specify the maximum VT the user can switch to
|
||||
"${FILESDIR}/1.12.0-add-maxvt-flag.patch"
|
||||
# Save touchpoint last coordinates before transform
|
||||
"${FILESDIR}/1.13.0-dix-Save-touchpoint-last-coordinates-before-transform.patch"
|
||||
# crbug.com/30822
|
||||
"${FILESDIR}/1.12.4-Per-Randr-CRTC-pointer-scaling.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
# Partial flips
|
||||
if use broken_partialswaps; then
|
||||
PATCHES+=(
|
||||
"${FILESDIR}/1.12.0-emulate-partial-flips.patch"
|
||||
)
|
||||
fi
|
||||
xorg-2_src_prepare
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
# older gcc is not supported
|
||||
[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
|
||||
die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
xorg-2_pkg_setup
|
||||
|
||||
# localstatedir is used for the log location; we need to override the default
|
||||
# from ebuild.sh
|
||||
# sysconfdir is used for the xorg.conf location; same applies
|
||||
# NOTE: fop is used for doc generating ; and i have no idea if gentoo
|
||||
# package it somewhere
|
||||
XORG_CONFIGURE_OPTIONS=(
|
||||
$(use_enable ipv6)
|
||||
$(use_enable dmx)
|
||||
$(use_enable kdrive)
|
||||
$(use_enable kdrive kdrive-kbd)
|
||||
$(use_enable kdrive kdrive-mouse)
|
||||
$(use_enable kdrive kdrive-evdev)
|
||||
$(use_enable tslib)
|
||||
$(use_enable !minimal record)
|
||||
$(use_enable !minimal xfree86-utils)
|
||||
$(use_enable !minimal install-libxf86config)
|
||||
$(use_enable !tegra dri)
|
||||
$(use_enable !tegra dri2)
|
||||
$(use_enable !arm glx)
|
||||
$(use_enable !arm vgahw)
|
||||
$(use_enable !arm vbe)
|
||||
$(use_enable xnest)
|
||||
$(use_enable xorg)
|
||||
$(use_enable xvfb)
|
||||
$(use_enable nptl glx-tls)
|
||||
$(use_enable udev config-udev)
|
||||
$(use_with doc doxygen)
|
||||
$(use_with doc xmlto)
|
||||
$(use_enable suid install-setuid)
|
||||
--sysconfdir=/etc/X11
|
||||
--localstatedir=/var
|
||||
--with-fontrootdir=/usr/share/fonts
|
||||
--with-xkb-output=/var/lib/xkb
|
||||
--disable-config-hal
|
||||
--without-dtrace
|
||||
--without-fop
|
||||
--with-os-vendor=Gentoo
|
||||
--with-sha1=libcrypto
|
||||
--disable-xvmc
|
||||
--disable-xdmcp
|
||||
--disable-screensaver
|
||||
--disable-xdm-auth-1
|
||||
--disable-dbe
|
||||
--disable-xinerama
|
||||
--disable-dga
|
||||
--disable-xace
|
||||
--disable-config-dbus
|
||||
--disable-config-hal
|
||||
--disable-clientids
|
||||
--disable-xf86vidmode
|
||||
--disable-registry
|
||||
--disable-xfake
|
||||
--disable-dmx
|
||||
--disable-xvfb
|
||||
--disable-xnest
|
||||
--enable-null-root-cursor
|
||||
--with-default-font-path=built-ins
|
||||
)
|
||||
|
||||
if use amd64 || use x86 ; then
|
||||
XORG_CONFIGURE_OPTIONS+=( --enable-xaa)
|
||||
else
|
||||
XORG_CONFIGURE_OPTIONS+=( --disable-xaa)
|
||||
fi
|
||||
|
||||
# Things we may want to remove later:
|
||||
# --disable-xaa (requires dropping all xaa drivers)
|
||||
# --disable-xv (requires fixing the drivers)
|
||||
# --disable-tcp-transport
|
||||
# --disable-ipv6
|
||||
# --disable-secure-rpc
|
||||
|
||||
# Xorg-server requires includes from OS mesa which are not visible for
|
||||
# users of binary drivers.
|
||||
mkdir -p "${T}/mesa-symlinks/GL"
|
||||
for i in gl glx glxmd glxproto glxtokens; do
|
||||
ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
|
||||
done
|
||||
for i in glext glxext; do
|
||||
ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
|
||||
done
|
||||
append-cppflags "-I${T}/mesa-symlinks"
|
||||
|
||||
# Make breakage less obvious, bug #402285.
|
||||
replace-flags -O3 -O2
|
||||
}
|
||||
|
||||
src_install() {
|
||||
xorg-2_src_install
|
||||
|
||||
dynamic_libgl_install
|
||||
|
||||
server_based_install
|
||||
|
||||
if ! use minimal && use xorg; then
|
||||
# Install xorg.conf.example into docs
|
||||
dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
|
||||
newinitd "${FILESDIR}"/xdm.initd-8 xdm
|
||||
newconfd "${FILESDIR}"/xdm.confd-4 xdm
|
||||
|
||||
# install the @x11-module-rebuild set for Portage
|
||||
insinto /usr/share/portage/config/sets
|
||||
newins "${FILESDIR}"/xorg-sets.conf xorg.conf
|
||||
|
||||
# crosbug.com/11553
|
||||
dosym /usr/bin/Xorg /usr/bin/X11/X || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
|
||||
eselect opengl set xorg-x11 --use-old
|
||||
|
||||
if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
|
||||
ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
|
||||
ewarn "because the ABI changed. If you cannot start X because"
|
||||
ewarn "of module version mismatch errors, this is your problem."
|
||||
|
||||
echo
|
||||
ewarn "You can generate a list of all installed packages in the x11-drivers"
|
||||
ewarn "category using this command:"
|
||||
ewarn " emerge portage-utils; qlist -I -C x11-drivers/"
|
||||
ewarn "or using sets from portage-2.2:"
|
||||
ewarn " emerge @x11-module-rebuild"
|
||||
fi
|
||||
|
||||
if use udev && has_version sys-fs/udev[-keymap]; then
|
||||
ewarn "sys-fs/udev was built without keymap support. This may cause input device"
|
||||
ewarn "autoconfiguration to fail."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
# Get rid of module dir to ensure opengl-update works properly
|
||||
if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
|
||||
rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
|
||||
fi
|
||||
}
|
||||
|
||||
dynamic_libgl_install() {
|
||||
# next section is to setup the dynamic libGL stuff
|
||||
ebegin "Moving GL files for dynamic switching"
|
||||
dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
|
||||
local x=""
|
||||
for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
|
||||
if [ -f ${x} -o -L ${x} ]; then
|
||||
mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
|
||||
fi
|
||||
done
|
||||
eend 0
|
||||
}
|
||||
|
||||
server_based_install() {
|
||||
if ! use xorg; then
|
||||
rm "${D}"/usr/share/man/man1/Xserver.1x \
|
||||
"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
|
||||
"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
|
||||
"${D}"/usr/share/man/man1/Xserver.1x
|
||||
fi
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user