From 126b50b99e052b5690b1f4ffa8b1bbecb57d2c0b Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sun, 7 Jul 2013 18:53:45 -0700 Subject: [PATCH] chore(x11-drivers): remove unneeded ebuilds --- .../md5-cache/x11-drivers/mali-rules-0.0.1 | 7 - .../md5-cache/x11-drivers/mali-rules-0.0.1-r0 | 7 - .../x11-drivers/nvidia-drivers-260.19.36 | 15 - .../md5-cache/x11-drivers/opengles-0.0.1-r14 | 12 - .../md5-cache/x11-drivers/opengles-9999 | 12 - .../x11-drivers/opengles-headers-0.0.1-r13 | 11 - .../x11-drivers/opengles-headers-9999 | 11 - .../x11-drivers/touchpad-tests-0.0.1-r9 | 11 - .../md5-cache/x11-drivers/touchpad-tests-9999 | 11 - .../x11-drivers/xf86-input-cmt-0.0.1-r101 | 11 - .../md5-cache/x11-drivers/xf86-input-cmt-9999 | 11 - .../x11-drivers/xf86-input-evdev-2.7.3 | 12 - .../x11-drivers/xf86-input-evdev-2.7.3-r13 | 12 - .../x11-drivers/xf86-video-armsoc-0.0.1-r91 | 13 - .../x11-drivers/xf86-video-armsoc-9999 | 12 - .../x11-drivers/xf86-video-intel-2.16.0-r9 | 13 - .../x11-drivers/xf86-video-vesa-2.3.0-r1 | 12 - .../mali-rules/files/50-mali.rules | 1 - .../mali-rules/mali-rules-0.0.1-r0.ebuild | 1 - .../mali-rules/mali-rules-0.0.1.ebuild | 24 - .../x11-drivers/nvidia-drivers/ChangeLog | 1512 ----------------- .../x11-drivers/nvidia-drivers/Manifest | 3 - .../x11-drivers/nvidia-drivers/files/09nvidia | 2 - .../files/195.30-unified-arch.patch | 30 - .../files/256.35-unified-arch.patch | 30 - .../files/NVIDIA_glx-defines.patch | 11 - .../files/NVIDIA_glx-glheader.patch | 13 - .../files/eblits/donvidia.eblit | 21 - .../files/eblits/mtrr_check.eblit | 19 - .../files/eblits/src_install-libs.eblit | 116 -- .../files/eblits/want_tls.eblit | 33 - .../nvidia-drivers/files/libGL.la-r2 | 32 - .../x11-drivers/nvidia-drivers/files/nvidia | 40 - .../nvidia-drivers/files/nvidia-169.07 | 14 - .../files/nvidia-drivers-190.53-2.6.33.patch | 92 - .../x11-drivers/nvidia-drivers/metadata.xml | 17 - .../nvidia-drivers-260.19.36.ebuild | 529 ------ .../opengles-headers-0.0.1-r13.ebuild | 40 - .../opengles-headers-9999.ebuild | 38 - .../opengles/opengles-0.0.1-r14.ebuild | 33 - .../x11-drivers/opengles/opengles-9999.ebuild | 31 - .../touchpad-tests-0.0.1-r9.ebuild | 45 - .../touchpad-tests/touchpad-tests-9999.ebuild | 43 - .../xf86-input-cmt-0.0.1-r101.ebuild | 36 - .../xf86-input-cmt/xf86-input-cmt-9999.ebuild | 34 - .../x11-drivers/xf86-input-evdev/Manifest | 1 - .../files/evdev-2.6.99-wheel-accel.patch | 374 ---- ...mestamps-for-input-events-if-availab.patch | 89 - ...vdev-2.7.0-add-block-reading-support.patch | 120 -- ...vdev-2.7.0-add-touch-event-timestamp.patch | 200 --- .../files/evdev-2.7.0-feedback-log.patch | 222 --- .../evdev-2.7.0-fix-emulated-wheel.patch | 163 -- ...evdev-2.7.3-Add-SYN_DROPPED-handling.patch | 537 ------ .../evdev-disable-smooth-scrolling.patch | 32 - .../xf86-input-evdev-2.7.3-r13.ebuild | 1 - .../xf86-input-evdev-2.7.3.ebuild | 30 - .../x11-drivers/xf86-video-armsoc/Manifest | 1 - .../xf86-video-armsoc-0.0.1-r91.ebuild | 26 - .../xf86-video-armsoc-9999.ebuild | 24 - .../x11-drivers/xf86-video-intel/Manifest | 1 - .../files/2.14.0-no-gamma.patch | 12 - .../xf86-video-intel/files/2.15.0-flips.patch | 41 - .../files/2.16.0-blt-hang.patch | 72 - .../files/2.16.0-copy-fb.patch | 156 -- .../files/2.16.0-fix-blt-damage.patch | 45 - .../files/2.16.0-no-backlight.patch | 22 - .../files/2.16.0-no-triple.patch | 12 - .../files/2.16.0-per-crtc-flip.patch | 1490 ---------------- .../xf86-video-intel-2.16.0-r9.ebuild | 76 - .../x11-drivers/xf86-video-vesa/Manifest | 1 - .../files/2.3.0-r1-domainiobase.patch | 12 - .../files/2.3.0-r1-xf86MapDomainMemory.patch | 55 - .../xf86-video-vesa/files/no-dga.patch | 202 --- .../xf86-video-vesa-2.3.0-r1.ebuild | 21 - 74 files changed, 7071 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1-r0 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/nvidia-drivers-260.19.36 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-0.0.1-r14 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-9999 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-headers-0.0.1-r13 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/opengles-headers-9999 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-0.0.1-r9 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-9999 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-0.0.1-r101 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-9999 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r13 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-0.0.1-r91 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-9999 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0-r9 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1 delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/files/50-mali.rules delete mode 120000 sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1-r0.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/ChangeLog delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/09nvidia delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/libGL.la-r2 delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-169.07 delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-0.0.1-r13.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-9999.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-0.0.1-r14.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-9999.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-0.0.1-r9.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-9999.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-0.0.1-r101.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-9999.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.6.99-wheel-accel.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-block-reading-support.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-touch-event-timestamp.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-feedback-log.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-fix-emulated-wheel.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.3-Add-SYN_DROPPED-handling.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-disable-smooth-scrolling.patch delete mode 120000 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3-r13.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.0.1-r91.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.14.0-no-gamma.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.15.0-flips.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-blt-hang.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-copy-fb.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-fix-blt-damage.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-backlight.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-triple.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-per-crtc-flip.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0-r9.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-domainiobase.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-xf86MapDomainMemory.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/no-dga.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1 deleted file mode 100644 index d7c55cc65e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1 +++ /dev/null @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1-r0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1-r0 deleted file mode 100644 index d7c55cc65e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/mali-rules-0.0.1-r0 +++ /dev/null @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/nvidia-drivers-260.19.36 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/nvidia-drivers-260.19.36 deleted file mode 100644 index b393638a07..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/nvidia-drivers-260.19.36 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack -DEPEND==sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) >=app-admin/eselect-opengl-1.0.9 !=x11-libs/libvdpau-0.3-r1 gtk? ( media-video/nvidia-settings ) -RDEPEND==sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) >=app-admin/eselect-opengl-1.0.9 !=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 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-9999 deleted file mode 100644 index 5e5eafb18d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/touchpad-tests-9999 +++ /dev/null @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-0.0.1-r101 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-0.0.1-r101 deleted file mode 100644 index 35f8c15ac9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-0.0.1-r101 +++ /dev/null @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-9999 deleted file mode 100644 index e21f0078bc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-cmt-9999 +++ /dev/null @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3 deleted file mode 100644 index 033c11a317..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3 +++ /dev/null @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r13 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r13 deleted file mode 100644 index 033c11a317..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3-r13 +++ /dev/null @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-0.0.1-r91 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-0.0.1-r91 deleted file mode 100644 index db0e1f8336..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-0.0.1-r91 +++ /dev/null @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-9999 deleted file mode 100644 index 031ac9cdbc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-armsoc-9999 +++ /dev/null @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0-r9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0-r9 deleted file mode 100644 index 968b108f5c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0-r9 +++ /dev/null @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1 deleted file mode 100644 index c4cf1388f5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1 +++ /dev/null @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/files/50-mali.rules b/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/files/50-mali.rules deleted file mode 100644 index 039a7f09c2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/files/50-mali.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="mali0", MODE="0660", GROUP="video" \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1-r0.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1-r0.ebuild deleted file mode 120000 index 59f248a330..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1-r0.ebuild +++ /dev/null @@ -1 +0,0 @@ -mali-rules-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1.ebuild deleted file mode 100644 index 09f6eacb53..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/mali-rules/mali-rules-0.0.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -DESCRIPTION="Rules for setting permissions right on /dev/mali0" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="arm" -IUSE="" - -# Because this ebuild has no source package, "${S}" doesn't get -# automatically created. The compile phase depends on "${S}" to -# exist, so we make sure "${S}" refers to a real directory. -# -# The problem is apparently an undocumented feature of EAPI 4; -# earlier versions of EAPI don't require this. -S="${WORKDIR}" - -src_install() { - insinto /etc/udev/rules.d - doins "${FILESDIR}"/50-mali.rules -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/ChangeLog b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/ChangeLog deleted file mode 100644 index f69d094d31..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/ChangeLog +++ /dev/null @@ -1,1512 +0,0 @@ -# ChangeLog for x11-drivers/nvidia-drivers -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.268 2011/01/24 18:13:43 cardoe Exp $ - -*nvidia-drivers-270.18 (24 Jan 2011) - - 24 Jan 2011; Doug Goldstein - +nvidia-drivers-270.18.ebuild: - Add new nvidia-drivers beta. Adds a new library and adds initial support for - X.org 1.10 - -*nvidia-drivers-260.19.36 (24 Jan 2011) - - 24 Jan 2011; Doug Goldstein - +nvidia-drivers-260.19.36.ebuild: - Version bump. Some minor fixes from upstream. - - 25 Dec 2010; Christian Faulhammer - nvidia-drivers-96.43.19.ebuild, nvidia-drivers-173.14.28.ebuild, - nvidia-drivers-260.19.29.ebuild: - stable x86, bug 348186 - - 24 Dec 2010; Samuli Suominen - nvidia-drivers-96.43.19.ebuild, nvidia-drivers-260.19.29.ebuild: - amd64 stable wrt #348186 - - 23 Dec 2010; Richard Freeman - nvidia-drivers-173.14.28.ebuild: - amd64 stable - 348186 - -*nvidia-drivers-260.19.29 (14 Dec 2010) - - 14 Dec 2010; Jeroen Roovers - +nvidia-drivers-260.19.29.ebuild: - Version bump (bug #347371). - -*nvidia-drivers-173.14.28 (06 Dec 2010) - - 06 Dec 2010; Jeroen Roovers - +nvidia-drivers-173.14.28.ebuild: - Version bump by radfoj (bug #342361). - -*nvidia-drivers-260.19.26 (01 Dec 2010) - - 01 Dec 2010; Michał Januszewski - +nvidia-drivers-260.19.26.ebuild: - Version bump. This is a beta version (and thus masked), but it is also the - first 260.x release that works with GF330M. - - 20 Nov 2010; Jeroen Roovers nvidia-drivers-96.43.19.ebuild: - Free xorg-server dependency (bug #345929). - -*nvidia-drivers-96.43.19 (19 Nov 2010) - - 19 Nov 2010; Jeroen Roovers +nvidia-drivers-96.43.19.ebuild: - Version bump by Miguel R. Caudevilla (bug #345929). - -*nvidia-drivers-260.19.21 (18 Nov 2010) - - 18 Nov 2010; Doug Goldstein - -nvidia-drivers-260.19.06.ebuild, -nvidia-drivers-260.19.12.ebuild, - +nvidia-drivers-260.19.21.ebuild: - Bump to the latest official release. Remove beta releases. - -*nvidia-drivers-260.19.12 (15 Oct 2010) - - 15 Oct 2010; Doug Goldstein - +nvidia-drivers-260.19.12.ebuild: - Version bump for new upstream release. Added a note about what USE=gtk - does when you disable it. - - 14 Oct 2010; Christian Faulhammer - nvidia-drivers-96.43.18.ebuild, nvidia-drivers-173.14.27.ebuild, - nvidia-drivers-195.36.31.ebuild: - stable x86, bug 332501 - - 21 Sep 2010; Markos Chandras - nvidia-drivers-96.43.18.ebuild, nvidia-drivers-173.14.27.ebuild, - nvidia-drivers-195.36.31.ebuild: - Stable on amd64. Bug #332501 - -*nvidia-drivers-260.19.06 (20 Sep 2010) - - 20 Sep 2010; Doug Goldstein - -nvidia-drivers-260.19.04.ebuild, +nvidia-drivers-260.19.06.ebuild: - beta version bump - - 11 Sep 2010; Tomáš Chvátal - -nvidia-drivers-185.18.36-r1.ebuild: - Remove version depending on deprecated xorg-server. - -*nvidia-drivers-260.19.04 (08 Sep 2010) - - 08 Sep 2010; Doug Goldstein - +nvidia-drivers-260.19.04.ebuild: - Version bump for latest beta release - -*nvidia-drivers-256.53 (31 Aug 2010) - - 31 Aug 2010; Doug Goldstein - +nvidia-drivers-256.53.ebuild: - version bump - - 30 Aug 2010; Doug Goldstein - nvidia-drivers-256.44-r1.ebuild, nvidia-drivers-256.52.ebuild: - fix up blocker with media-video/nvidia-settings - - 30 Aug 2010; Doug Goldstein - nvidia-drivers-256.44-r1.ebuild, nvidia-drivers-256.52.ebuild: - Implement installing nvidia-settings when USE=gtk is enabled as discussed - in bug #304255 - - 30 Aug 2010; Doug Goldstein - nvidia-drivers-256.52.ebuild: - Fix xorg-server depend to properly include the 1.9 series - - 30 Aug 2010; Doug Goldstein - -nvidia-drivers-96.43.14.ebuild, -nvidia-drivers-173.14.22.ebuild, - -nvidia-drivers-195.36.15.ebuild, -nvidia-drivers-256.35.ebuild: - Clear out some older versions that have been supplanted by newer stable - versions - - 30 Aug 2010; Doug Goldstein - -nvidia-drivers-71.86.11.ebuild: - Removee versions that rely on xorg-server-1.4 or older (which is no longer - in the tree). - -*nvidia-drivers-256.52 (30 Aug 2010) -*nvidia-drivers-256.44-r1 (30 Aug 2010) - - 30 Aug 2010; Doug Goldstein - +nvidia-drivers-256.44-r1.ebuild, +nvidia-drivers-256.52.ebuild: - version bump and several clean ups to bring the ebuild up to the state of - the current unmasked ebuilds - -*nvidia-drivers-256.44 (04 Aug 2010) - - 04 Aug 2010; Michał Januszewski - +nvidia-drivers-256.44.ebuild: - Version bump. - - 30 Jul 2010; Tomáš Chvátal - nvidia-drivers-71.86.11.ebuild, nvidia-drivers-96.43.14.ebuild, - nvidia-drivers-96.43.16.ebuild, nvidia-drivers-96.43.18.ebuild, - nvidia-drivers-173.14.22.ebuild, nvidia-drivers-173.14.25.ebuild, - nvidia-drivers-173.14.27.ebuild, nvidia-drivers-185.18.36-r1.ebuild, - nvidia-drivers-190.53-r1.ebuild, nvidia-drivers-195.36.15.ebuild, - nvidia-drivers-195.36.24.ebuild, nvidia-drivers-195.36.31.ebuild, - nvidia-drivers-256.35.ebuild: - Depend on proper emul lib to fix bug #330249. - - 27 Jul 2010; Michał Januszewski - nvidia-drivers-256.35.ebuild: - Add a dependency on x11-libs/libXvMC (bug #321061). - - 20 Jul 2010; Doug Goldstein - nvidia-drivers-173.14.27.ebuild: - Conditionally install CUDA support if it was found in the package. - Apparently 173.14.27 drops CUDA. fixes bug #328681 - - 17 Jul 2010; Christian Faulhammer - nvidia-drivers-173.14.25.ebuild: - stable x86, bug 327003 - - 16 Jul 2010; Maciej Mrozowski - nvidia-drivers-173.14.25.ebuild: - amd64 stable, bug 327003 - -*nvidia-drivers-173.14.27 (16 Jul 2010) -*nvidia-drivers-96.43.18 (16 Jul 2010) - - 16 Jul 2010; Doug Goldstein - +nvidia-drivers-96.43.18.ebuild, +nvidia-drivers-173.14.27.ebuild: - bump available legacy drivers. Added support for xorg-server-1.8 in - nvidia-drivers-173.14.27 - - 15 Jul 2010; Markos Chandras - nvidia-drivers-96.43.16.ebuild: - Stable on amd64 wrt bug #326323 - -*nvidia-drivers-195.36.31 (13 Jul 2010) - - 13 Jul 2010; Doug Goldstein - -nvidia-drivers-180.60.ebuild, -nvidia-drivers-190.42-r3.ebuild, - -nvidia-drivers-190.53.ebuild, -nvidia-drivers-195.30.ebuild, - +nvidia-drivers-195.36.31.ebuild: - Version bump to the latest 195.36.x. Remove older versions that will no - longer be supported. Fix bug #317049 while I'm at it - - 10 Jul 2010; Christian Faulhammer - nvidia-drivers-96.43.16.ebuild: - stable x86, bug 326323 - - 07 Jul 2010; Pawel Hajdan jr - nvidia-drivers-195.36.24.ebuild: - x86 stable wrt bug #325513 - - 30 Jun 2010; Jeroen Roovers metadata.xml: - Correct description. - - 26 Jun 2010; Samuli Suominen - nvidia-drivers-195.36.24.ebuild: - amd64 stable wrt #325513 - - 24 Jun 2010; Michał Januszewski - +files/256.35-unified-arch.patch, nvidia-drivers-256.35.ebuild: - Add a patch for the 'x86' unified kernel architecture. - -*nvidia-drivers-256.35 (24 Jun 2010) - - 24 Jun 2010; Michał Januszewski - +nvidia-drivers-256.35.ebuild: - Version bump. - -*nvidia-drivers-195.36.24 (25 Apr 2010) - - 25 Apr 2010; Justin Lecher - +nvidia-drivers-195.36.24.ebuild: - Version Bump on permission, #315141 - - 24 Mar 2010; Doug Goldstein - nvidia-drivers-195.36.15.ebuild: - clean up some QA warnings - - 24 Mar 2010; Doug Goldstein - nvidia-drivers-195.36.15.ebuild: - add missing nvidia.icd to fix bug #310277 - - 17 Mar 2010; Doug Goldstein - nvidia-drivers-173.14.20.ebuild: - still adding back 173.14.20, but repoman doesn't let me stable it right - away since the ebuild was stable when it was removed.. - - 17 Mar 2010; Doug Goldstein - +nvidia-drivers-173.14.20.ebuild: - add back 173.14.20 at the request of Giao Phan for bug - #294089 - -*nvidia-drivers-195.36.15 (17 Mar 2010) - - 17 Mar 2010; Doug Goldstein - +nvidia-drivers-195.36.15.ebuild: - add upstream's pre-release version of the 195.x.y series. Still needs to - be tested on further kernels and x86 before unmasking - - 10 Mar 2010; Doug Goldstein - -nvidia-drivers-71.86.09.ebuild, -nvidia-drivers-96.43.13.ebuild, - -nvidia-drivers-173.14.20.ebuild, -nvidia-drivers-173.14.20-r1.ebuild, - -nvidia-drivers-185.18.36.ebuild, -nvidia-drivers-190.29.ebuild: - spring cleaning - - 10 Mar 2010; Doug Goldstein - -nvidia-drivers-195.36.03.ebuild: - remove the broken drivers - - 28 Feb 2010; Fabio Erculiani - nvidia-drivers-190.53-r1.ebuild, - +files/nvidia-drivers-190.53-2.6.33.patch: - add 2.6.33 kernel support to 190.53 - -*nvidia-drivers-173.14.25 (27 Feb 2010) - - 27 Feb 2010; Maciej Mrozowski - +nvidia-drivers-173.14.25.ebuild: - Version bump, bug 305713 - -*nvidia-drivers-96.43.16 (15 Feb 2010) - - 15 Feb 2010; Jeroen Roovers - +nvidia-drivers-96.43.16.ebuild: - Version bump thanks to John Brendler (bug #304841). - - 09 Feb 2010; Pacho Ramos - nvidia-drivers-96.43.14.ebuild, nvidia-drivers-173.14.22.ebuild, - nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r3.ebuild: - amd64 stable, bug 299560 - -*nvidia-drivers-195.36.03 (08 Feb 2010) - - 08 Feb 2010; Michał Januszewski - +nvidia-drivers-195.36.03.ebuild: - Beta version bump (bug #303821). - - 07 Feb 2010; Michał Januszewski - +files/195.30-unified-arch.patch, nvidia-drivers-195.30.ebuild: - Add support for the unified 'x86' kernel architecture. - -*nvidia-drivers-195.30 (07 Feb 2010) - - 07 Feb 2010; Michał Januszewski - +nvidia-drivers-195.30.ebuild: - Add the latest beta drivers with support for CUDA 3.0. - - 01 Feb 2010; Christian Faulhammer - nvidia-drivers-96.43.14.ebuild, nvidia-drivers-173.14.22.ebuild, - nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r3.ebuild: - stable x86, bug 299560 - -*nvidia-drivers-190.53-r1 (04 Jan 2010) - - 04 Jan 2010; Doug Goldstein - +nvidia-drivers-190.53-r1.ebuild: - revert the change to install VDPAU drivers to /usr/lib/vdpau since - libvdpau's dlopen() usage is incorrect. Stop gap ebuild until the issue is - discussed further with upstream. - - 21 Dec 2009; Doug Goldstein - -nvidia-drivers-190.42-r2.ebuild: - remove old version - - 21 Dec 2009; Doug Goldstein - +nvidia-drivers-190.53.ebuild: - version bump - - 17 Dec 2009; Doug Goldstein - -nvidia-drivers-190.53.ebuild: - as stated in bug #296947, this breaks VDPAU, but apparently peper, who's - not a maintainer knows better. - -*nvidia-drivers-190.53 (16 Dec 2009) - - 16 Dec 2009; Piotr Jaroszyński - +nvidia-drivers-190.53.ebuild: - Add 190.53. - - 28 Nov 2009; Doug Goldstein - nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild: - fix bug #276815 - - 28 Nov 2009; Doug Goldstein - nvidia-drivers-185.18.36.ebuild, nvidia-drivers-185.18.36-r1.ebuild: - remove defunct compat_device_check. bug #294896 and bug #294623 - - 21 Nov 2009; Doug Goldstein - nvidia-drivers-185.18.36.ebuild: - stabilize for bug #290555 - - 21 Nov 2009; Doug Goldstein - nvidia-drivers-71.86.11.ebuild: - stabilize for bug #290561 - -*nvidia-drivers-96.43.14 (13 Nov 2009) - - 13 Nov 2009; Doug Goldstein - +nvidia-drivers-96.43.14.ebuild: - version bump for xorg-server 1.7 support. ebuild uses the refactored - ebuild as a base - -*nvidia-drivers-173.14.22 (13 Nov 2009) - - 13 Nov 2009; Doug Goldstein - +nvidia-drivers-173.14.22.ebuild: - version bump for xorg-server 1.7 support. ebuild uses the refactored - ebuild as a base - - 12 Nov 2009; Doug Goldstein - nvidia-drivers-190.42-r3.ebuild: - fix bash syntax error - -*nvidia-drivers-190.29 (09 Nov 2009) - - 09 Nov 2009; Doug Goldstein - +nvidia-drivers-190.29.ebuild: - add 190.29 series for OpenCL support - - 06 Nov 2009; Doug Goldstein - nvidia-drivers-190.42-r3.ebuild: - oops. fix issue where we might remove vdpau and cuda files - - 06 Nov 2009; Doug Goldstein - nvidia-drivers-190.42-r3.ebuild: - more FreeBSD fixes - -*nvidia-drivers-190.42-r3 (06 Nov 2009) - - 06 Nov 2009; Doug Goldstein - +nvidia-drivers-190.42-r3.ebuild: - remove generation of libGL.la since eselect-opengl-1.0.9 and newer no - longer uses it. refactor installation of libraries to fix FreeBSD issues - - 06 Nov 2009; Doug Goldstein - nvidia-drivers-190.42-r2.ebuild: - add NV_X11_DRV and NV_X11_EXT to deal with different location of files on - FreeBSD - - 03 Nov 2009; Doug Goldstein - nvidia-drivers-190.42-r2.ebuild: - clean up x86 QA_ settings - - 03 Nov 2009; Doug Goldstein - nvidia-drivers-185.18.36-r1.ebuild, -nvidia-drivers-190.42-r1.ebuild, - nvidia-drivers-190.42-r2.ebuild: - no longer need to block newer mesa since eselect-opengl has been updated. - remove older revision of 190.42 - - 01 Nov 2009; Michael Sterrett - nvidia-drivers-173.14.20.ebuild, nvidia-drivers-173.14.20-r1.ebuild, - nvidia-drivers-180.60.ebuild, nvidia-drivers-185.18.36.ebuild, - nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r1.ebuild, - nvidia-drivers-190.42-r2.ebuild: - fix typo in elog (bug #291397) - -*nvidia-drivers-190.42-r2 (31 Oct 2009) - - 31 Oct 2009; Doug Goldstein - +nvidia-drivers-190.42-r2.ebuild: - reworked the ebuild for an overall improvement. Should fix several obscure - issues people have with different profiles. remove usage of non-TLS - libraries since Gentoo has TLS glibc's. still a work in progress for other - clean ups. - - 29 Oct 2009; Doug Goldstein - nvidia-drivers-185.18.36.ebuild, nvidia-drivers-185.18.36-r1.ebuild: - Quadro NVS 140 support fixed in 185.18.36 - -*nvidia-drivers-173.14.20-r1 (29 Oct 2009) - - 29 Oct 2009; Doug Goldstein - +nvidia-drivers-173.14.20-r1.ebuild: - install nvidia-smi application and nvidia-xconfig man page - - 29 Oct 2009; Doug Goldstein - nvidia-drivers-185.18.36.ebuild, nvidia-drivers-185.18.36-r1.ebuild, - nvidia-drivers-190.42-r1.ebuild: - fix QA_EXECSTACKS issue with libXvMCNVIDIA as reported in bug #290258 - - 29 Oct 2009; Doug Goldstein - nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild, - nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.20.ebuild, - nvidia-drivers-180.60.ebuild, nvidia-drivers-185.18.36.ebuild, - nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r1.ebuild: - >=media-libs/mesa-7.6 makes changes to the libGL.la behavior with eselect - that will cause OpenGL to be broken - - 29 Oct 2009; Doug Goldstein - -nvidia-drivers-185.18.14.ebuild, -nvidia-drivers-185.18.29.ebuild, - -nvidia-drivers-185.18.31.ebuild, -nvidia-drivers-190.18.ebuild, - -nvidia-drivers-190.25.ebuild, -nvidia-drivers-190.32.ebuild, - -nvidia-drivers-190.36.ebuild, -nvidia-drivers-190.40.ebuild, - -nvidia-drivers-190.42.ebuild: - cull older version - - 29 Oct 2009; Doug Goldstein - nvidia-drivers-190.42.ebuild, nvidia-drivers-190.42-r1.ebuild: - fix xorg-server version dependency - - 27 Oct 2009; Samuli Suominen - nvidia-drivers-190.42.ebuild, nvidia-drivers-190.42-r1.ebuild: - Remove - -nvidia-drivers-96.43.09.ebuild, -nvidia-drivers-96.43.11.ebuild, - -nvidia-drivers-173.14.15.ebuild, -nvidia-drivers-173.14.18.ebuild, - -nvidia-drivers-180.29.ebuild: - Remove old 96, 173 and 180. - - 26 Oct 2009; Samuli Suominen - nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.20.ebuild: - amd64 stable wrt #281302 - - 22 Oct 2009; Doug Goldstein - nvidia-drivers-185.18.36-r1.ebuild, nvidia-drivers-190.42-r1.ebuild: - don't install the vdpau headers since libvdpau provides those now - -*nvidia-drivers-190.42-r1 (22 Oct 2009) -*nvidia-drivers-185.18.36-r1 (22 Oct 2009) - - 22 Oct 2009; Doug Goldstein - +nvidia-drivers-185.18.36-r1.ebuild, +nvidia-drivers-190.42-r1.ebuild: - Update to new way of shipping VDPAU wrapper in its own library from - Freedesktop after discussing distro packaging with NVIDIA. - -*nvidia-drivers-190.42 (22 Oct 2009) - - 22 Oct 2009; Piotr Jaroszyński - +nvidia-drivers-190.42.ebuild: - Add 190.42. - - 22 Oct 2009; Doug Goldstein - nvidia-drivers-185.18.31.ebuild, nvidia-drivers-185.18.36.ebuild, - nvidia-drivers-190.32.ebuild, nvidia-drivers-190.36.ebuild, - nvidia-drivers-190.40.ebuild: - add note about needing to add QA_LDFLAGS for nvidia-smi - -*nvidia-drivers-185.18.36 (21 Oct 2009) - - 21 Oct 2009; Jeroen Roovers - +nvidia-drivers-185.18.36.ebuild: - Version bump (bug #288591). - -*nvidia-drivers-190.40 (17 Oct 2009) - - 17 Oct 2009; Piotr Jaroszyński - +nvidia-drivers-190.40.ebuild: - Add 190.40. - - 06 Oct 2009; Jeroen Roovers - nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild, - nvidia-drivers-96.43.09.ebuild, nvidia-drivers-96.43.11.ebuild, - nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.15.ebuild, - nvidia-drivers-173.14.18.ebuild, nvidia-drivers-173.14.20.ebuild, - nvidia-drivers-180.29.ebuild, nvidia-drivers-180.60.ebuild, - nvidia-drivers-185.18.14.ebuild, nvidia-drivers-185.18.29.ebuild, - nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.18.ebuild, - nvidia-drivers-190.25.ebuild, nvidia-drivers-190.32.ebuild, - nvidia-drivers-190.36.ebuild: - Remove elibc_glibc dependency for now as it breaks horribly. - - 06 Oct 2009; Jeroen Roovers - nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild, - nvidia-drivers-96.43.09.ebuild, nvidia-drivers-96.43.11.ebuild, - nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.15.ebuild, - nvidia-drivers-173.14.18.ebuild, nvidia-drivers-173.14.20.ebuild, - nvidia-drivers-180.29.ebuild, nvidia-drivers-180.60.ebuild, - nvidia-drivers-185.18.14.ebuild, nvidia-drivers-185.18.29.ebuild, - nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.18.ebuild, - nvidia-drivers-190.25.ebuild, nvidia-drivers-190.32.ebuild, - nvidia-drivers-190.36.ebuild: - Replace built_with_use (bug #286961), go EAPI=2 compliant. - -*nvidia-drivers-190.36 (27 Sep 2009) - - 27 Sep 2009; Piotr Jaroszyński - +nvidia-drivers-190.36.ebuild: - Add 190.36. - - 26 Sep 2009; Michał Januszewski - nvidia-drivers-190.32.ebuild: - Fix bug #283572 (add a check for CONFIG_LOCKDEP). - - 26 Sep 2009; Michał Januszewski - nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.32.ebuild: - Fix bug #281895 (install manual pages). Also install the nvidia-smi tool - and prepare support for OpenCL (note that the current drivers do NOT - support OpenCL). - -*nvidia-drivers-190.32 (21 Sep 2009) - - 21 Sep 2009; Alex Alexander - +nvidia-drivers-190.32.ebuild: - version bump, beta 190.32 - - 19 Sep 2009; Tomáš Chvátal - -nvidia-drivers-71.86.07.ebuild: - Cleanup. Removal of old xorg versions. - -*nvidia-drivers-190.25 (02 Sep 2009) - - 02 Sep 2009; Piotr Jaroszyński - +nvidia-drivers-190.25.ebuild: - Add 190.25. - - 29 Aug 2009; Jeroen Roovers - nvidia-drivers-96.43.13.ebuild: - Stable for x86 (bug #273539). - - 27 Aug 2009; Raúl Porcel - nvidia-drivers-173.14.20.ebuild: - x86 stable - -*nvidia-drivers-71.86.11 (23 Aug 2009) - - 23 Aug 2009; Jeroen Roovers - +nvidia-drivers-71.86.11.ebuild: - Version bump (bug #280244). - - 03 Aug 2009; Michał Januszewski - nvidia-drivers-185.18.29.ebuild, nvidia-drivers-185.18.31.ebuild: - Add a device compatibility check (bug #280031, #279542). Users of graphics - cards known to be incompatible with a particular version of the drivers - will now be warned about the incompatibility when installing the package. - -*nvidia-drivers-173.14.20 (03 Aug 2009) - - 03 Aug 2009; Doug Goldstein - +nvidia-drivers-173.14.20.ebuild: - bump 173.x.y series to 173.14.20 - - 03 Aug 2009; Doug Goldstein metadata.xml: - update maintainer info - - 03 Aug 2009; Doug Goldstein - nvidia-drivers-180.29.ebuild, nvidia-drivers-180.60.ebuild, - nvidia-drivers-185.18.14.ebuild, nvidia-drivers-185.18.29.ebuild, - nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.18.ebuild, - -files/eblits/paravirt_check.eblit: - remove paravirt check again. bug #264375 again - - 02 Aug 2009; nvidia-drivers-71.86.09.ebuild, - nvidia-drivers-96.43.11.ebuild: - Completely unable to find testers with sufficiently old hardware on AMD64 - kit; doing a Nike on this in agreement with Jeremy "darkside" Olexa & - VQuicksilver. Closes bug #275495. - -*nvidia-drivers-185.18.31 (01 Aug 2009) - - 01 Aug 2009; Michał Januszewski - +nvidia-drivers-185.18.31.ebuild: - Version bump. - - 31 Jul 2009; nvidia-drivers-173.14.18.ebuild, - nvidia-drivers-180.60.ebuild: - Marked stable as requested by Doug Goldstein in bug - #275495. Testing by Víctor "VQuicksilver" Enríquez on a Club3D GeForce - 7600GS. - -*nvidia-drivers-185.18.29 (29 Jul 2009) - - 29 Jul 2009; Michał Januszewski - +nvidia-drivers-185.18.29.ebuild: - Version bump (bug #279542). - -*nvidia-drivers-190.18 (27 Jul 2009) - - 27 Jul 2009; Michał Januszewski - +nvidia-drivers-190.18.ebuild: - Add the latest beta version of the NVIDIA drivers. This is the first - version of the drivers in the tree to support CUDA 2.3. This ebuild should - remain masked. - -*nvidia-drivers-185.18.14 (25 Jul 2009) - - 25 Jul 2009; Michał Januszewski - +nvidia-drivers-185.18.14.ebuild: - Version bump (bug #265238). - - 22 Jul 2009; Michał Januszewski metadata.xml: - Add myself as a maintainer. - -*nvidia-drivers-96.43.13 (02 Jul 2009) - - 02 Jul 2009; Jeroen Roovers - +nvidia-drivers-96.43.13.ebuild: - Version bump. - - 29 Jun 2009; Christian Faulhammer - nvidia-drivers-71.86.09.ebuild, nvidia-drivers-96.43.11.ebuild, - nvidia-drivers-173.14.18.ebuild, nvidia-drivers-180.60.ebuild: - stable x86, bug 275495 - - 29 Jun 2009; Jeroen Roovers metadata.xml: - Add myself as maintainer. - - 24 Jun 2009; Doug Goldstein - nvidia-drivers-71.86.09.ebuild, nvidia-drivers-96.43.11.ebuild, - nvidia-drivers-173.14.18.ebuild: - update supported xorg-server version - - 14 Jun 2009; Mike Frysinger +files/nvidia-169.07: - Restore nvidia-169.07 as it is still in use by newer ebuilds. - - 12 Jun 2009; Doug Goldstein - -files/NVIDIA_i2c-hwmon.patch, nvidia-drivers-96.43.09.ebuild, - nvidia-drivers-96.43.11.ebuild, nvidia-drivers-173.14.15.ebuild, - nvidia-drivers-173.14.18.ebuild, nvidia-drivers-180.29.ebuild, - nvidia-drivers-180.60.ebuild: - remove NVIDIA_i2c-hwmon.patch as requested by NVIDIA as this isn't safe - with certain NVIDIA skus. - - 12 Jun 2009; Doug Goldstein - -files/nvidia-2.6.28.patch, -nvidia-drivers-71.86.06.ebuild, - -nvidia-drivers-71.86.08.ebuild, -nvidia-drivers-96.43.07.ebuild, - -nvidia-drivers-96.43.10.ebuild, -nvidia-drivers-100.14.19.ebuild, - -files/nvidia-169.07, -nvidia-drivers-173.14.09.ebuild, - -nvidia-drivers-173.14.12.ebuild, -nvidia-drivers-173.14.16.ebuild, - -nvidia-drivers-173.14.17.ebuild, -nvidia-drivers-177.80.ebuild, - -nvidia-drivers-177.82.ebuild, -nvidia-drivers-180.22.ebuild, - -nvidia-drivers-180.27.ebuild, -nvidia-drivers-180.37.ebuild, - -nvidia-drivers-180.41.ebuild, -nvidia-drivers-180.44.ebuild, - -nvidia-drivers-180.51.ebuild, -files/NVIDIA_glx-makefile.patch: - cull old versions - - 12 Jun 2009; Doug Goldstein - nvidia-drivers-180.22.ebuild, nvidia-drivers-180.27.ebuild, - nvidia-drivers-180.29.ebuild, nvidia-drivers-180.37.ebuild, - nvidia-drivers-180.41.ebuild, nvidia-drivers-180.44.ebuild, - nvidia-drivers-180.51.ebuild, nvidia-drivers-180.60.ebuild: - fix paravirt check. bug #261696 - -*nvidia-drivers-180.60 (27 May 2009) - - 27 May 2009; Doug Goldstein - +nvidia-drivers-180.60.ebuild: - version bump. fix QA checks - - 06 May 2009; Mike Frysinger - nvidia-drivers-71.86.06.ebuild, nvidia-drivers-71.86.07.ebuild, - nvidia-drivers-71.86.08.ebuild, nvidia-drivers-71.86.09.ebuild, - nvidia-drivers-96.43.07.ebuild, nvidia-drivers-96.43.09.ebuild, - nvidia-drivers-96.43.10.ebuild, nvidia-drivers-96.43.11.ebuild, - nvidia-drivers-100.14.19.ebuild, nvidia-drivers-173.14.09.ebuild, - nvidia-drivers-173.14.12.ebuild, nvidia-drivers-173.14.15.ebuild, - nvidia-drivers-173.14.16.ebuild, nvidia-drivers-173.14.17.ebuild, - nvidia-drivers-173.14.18.ebuild, nvidia-drivers-177.80.ebuild, - nvidia-drivers-177.82.ebuild, nvidia-drivers-180.22.ebuild, - nvidia-drivers-180.27.ebuild, nvidia-drivers-180.29.ebuild, - nvidia-drivers-180.37.ebuild, nvidia-drivers-180.41.ebuild, - nvidia-drivers-180.44.ebuild, nvidia-drivers-180.51.ebuild: - Install modprobe.d file as nvidia.conf. - -*nvidia-drivers-180.51 (19 Apr 2009) - - 19 Apr 2009; Doug Goldstein - +nvidia-drivers-180.51.ebuild: - version bump - -*nvidia-drivers-180.44 (30 Mar 2009) - - 30 Mar 2009; Doug Goldstein - +nvidia-drivers-180.44.ebuild: - add latest driver release - -*nvidia-drivers-173.14.18 (23 Mar 2009) -*nvidia-drivers-71.86.09 (23 Mar 2009) - - 23 Mar 2009; +nvidia-drivers-71.86.09.ebuild, - +nvidia-drivers-173.14.18.ebuild: - Version bumps. - -*nvidia-drivers-180.41 (23 Mar 2009) - - 23 Mar 2009; +nvidia-drivers-180.41.ebuild: - Version bump. See http://www.nvnews.net/vbulletin/showthread.php?p=1963540 - -*nvidia-drivers-173.14.17 (17 Mar 2009) -*nvidia-drivers-96.43.11 (17 Mar 2009) - - 17 Mar 2009; Doug Goldstein - +nvidia-drivers-96.43.11.ebuild, +nvidia-drivers-173.14.17.ebuild: - version bumps - - 17 Mar 2009; Doug Goldstein - nvidia-drivers-180.29.ebuild: - mark 180.29 stable - -*nvidia-drivers-180.37 (09 Mar 2009) - - 09 Mar 2009; Doug Goldstein - -nvidia-drivers-180.35.ebuild, +nvidia-drivers-180.37.ebuild: - version bump for several bugs including errors with signal handling. - remove broken version - - 28 Feb 2009; Markus Meier metadata.xml: - custom-cflags is a global USE-flag - -*nvidia-drivers-180.35 (25 Feb 2009) - - 25 Feb 2009; Doug Goldstein - +nvidia-drivers-180.35.ebuild: - newer version. adds GPU support. fixes OpenGL 3.0 and VDPAU issues. - -*nvidia-drivers-180.29 (11 Feb 2009) - - 11 Feb 2009; Doug Goldstein - +nvidia-drivers-180.29.ebuild: - version bump - -*nvidia-drivers-173.14.16 (04 Feb 2009) - - 04 Feb 2009; Ricardo Mendoza - +nvidia-drivers-173.14.16.ebuild: - Version bump. See http://www.nvnews.net/vbulletin/showthread.php?t=126937 - -*nvidia-drivers-71.86.08 (03 Feb 2009) - - 03 Feb 2009; Ricardo Mendoza - +nvidia-drivers-71.86.08.ebuild: - Version bump. See http://www.nvnews.net/vbulletin/showthread.php?t=126955 - -*nvidia-drivers-96.43.10 (03 Feb 2009) - - 03 Feb 2009; Ricardo Mendoza - +nvidia-drivers-96.43.10.ebuild: - Version bump. See http://www.nvnews.net/vbulletin/showthread.php?t=126954 - - 31 Jan 2009; Alexis Ballier - nvidia-drivers-96.43.09.ebuild: - Backport the missing bits from the 100. ebuild for x86-fbsd and keyword it - since this is apparently the version I need for my GeForce2 MX 400 - -*nvidia-drivers-180.27 (30 Jan 2009) - - 30 Jan 2009; Daniel Gryniewicz - +nvidia-drivers-180.27.ebuild: - Proxy bump to nvidia-drivers-180.27 for cardoe - - 20 Jan 2009; Peter Alfredsen - nvidia-drivers-96.43.09.ebuild: - Non-maintainer commit: Changing - +nvidia-drivers-180.22.ebuild: - add new version. add vdpau support - - 25 Dec 2008; Markus Meier - nvidia-drivers-71.86.07.ebuild, nvidia-drivers-96.43.09.ebuild, - nvidia-drivers-173.14.15.ebuild, nvidia-drivers-177.82.ebuild: - x86 stable, bug #252482 - - 25 Dec 2008; Thomas Anderson - nvidia-drivers-71.86.07.ebuild, nvidia-drivers-96.43.09.ebuild, - nvidia-drivers-173.14.15.ebuild, nvidia-drivers-177.82.ebuild: - stable amd64, bug 252482. Stable for linux 2.6.27 stabilization - - 25 Dec 2008; Mike Frysinger - +files/nvidia-2.6.28.patch, nvidia-drivers-177.82.ebuild: - Add patch from upstream for linux 2.6.28 support. - -*nvidia-drivers-173.14.15 (19 Dec 2008) - - 19 Dec 2008; +nvidia-drivers-173.14.15.ebuild: - Version bump. Fixes compilation issues with newer kernels. - -*nvidia-drivers-96.43.09 (18 Dec 2008) - - 18 Dec 2008; Doug Goldstein - +nvidia-drivers-96.43.09.ebuild: - add beta version of 96.x.y legacy drivers for kernel 2.6.27 support. Fixes - bug #242476 - - 18 Dec 2008; Doug Goldstein - -files/NVIDIA_kernel-169.12-2286310.diff, - -files/NVIDIA_kernel-173.08-2404825.diff, - -files/NVIDIA_kernel-173.14.05-2419292.diff: - remove files that went along with removed versions - - 18 Dec 2008; Doug Goldstein - nvidia-drivers-177.80.ebuild, nvidia-drivers-177.82.ebuild: - Fix incorrectly not replacing CFLAGS when requested. bug #241800 - - 18 Dec 2008; Doug Goldstein - -nvidia-drivers-100.14.09.ebuild, -nvidia-drivers-100.14.11.ebuild, - -nvidia-drivers-100.14.23.ebuild, -nvidia-drivers-169.07.ebuild, - -nvidia-drivers-169.09.ebuild, -nvidia-drivers-169.09-r1.ebuild, - -nvidia-drivers-169.12.ebuild, -nvidia-drivers-173.08.ebuild, - -nvidia-drivers-173.14.05.ebuild, -nvidia-drivers-177.13.ebuild, - -nvidia-drivers-177.67.ebuild, -nvidia-drivers-177.68.ebuild, - -nvidia-drivers-177.70.ebuild: - remove outdated releases that no longer have support - - 18 Dec 2008; Doug Goldstein - +files/eblits/donvidia.eblit, +files/eblits/mtrr_check.eblit, - +files/eblits/paravirt_check.eblit, +files/eblits/src_install-libs.eblit, - +files/eblits/want_tls.eblit: - Add eblits in the same fashion as sys-libs/glibc that contain commonly - used code between all the different versions of nvidia-drivers - -*nvidia-drivers-71.86.07 (17 Dec 2008) - - 17 Dec 2008; Doug Goldstein - +nvidia-drivers-71.86.07.ebuild: - add 71.86.07 to the tree for 2.6.27 kernel support. This ebuild is - refactored like my past refactoring of the ebuilds. More changes to come. - Please report issues if you spot them in the ebuild, or suggest - improvements. - - 13 Dec 2008; Doug Goldstein - nvidia-drivers-71.86.06.ebuild, nvidia-drivers-96.43.07.ebuild, - nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild, - nvidia-drivers-169.07.ebuild, nvidia-drivers-169.09.ebuild, - nvidia-drivers-169.09-r1.ebuild, nvidia-drivers-169.12.ebuild, - nvidia-drivers-173.08.ebuild, nvidia-drivers-173.14.05.ebuild, - nvidia-drivers-173.14.09.ebuild, nvidia-drivers-173.14.12.ebuild, - nvidia-drivers-177.13.ebuild, nvidia-drivers-177.67.ebuild, - nvidia-drivers-177.68.ebuild, nvidia-drivers-177.70.ebuild, - nvidia-drivers-177.80.ebuild, nvidia-drivers-177.82.ebuild: - update all versions to specify the exact xorg-server versions they're - compatible with - - 06 Dec 2008; Mike Frysinger - nvidia-drivers-177.80.ebuild, nvidia-drivers-177.82.ebuild: - Use unpack_makeself rather than executing the script. - -*nvidia-drivers-177.82 (03 Dec 2008) - - 03 Dec 2008; Doug Goldstein - +nvidia-drivers-177.82.ebuild: - driver version bump. fixes known issues with firefox 3 image corruption. - mobile GPU resume from S3 issues. mobile GPU hotkey issues. - -*nvidia-drivers-177.80 (13 Oct 2008) - - 13 Oct 2008; Ricardo Mendoza - +nvidia-drivers-177.80.ebuild: - Version bump for new stable release as per bug #238969. Release notes can be - found at http://www.nvnews.net/vbulletin/showthread.php?t=120679 - -*nvidia-drivers-177.70 (28 Aug 2008) - - 28 Aug 2008; Ricardo Mendoza - +nvidia-drivers-177.70.ebuild: - Version bump for masked beta. Release highlights at - http://www.nvnews.net/vbulletin/showthread.php?p=1759793 - -*nvidia-drivers-177.68 (27 Aug 2008) - - 27 Aug 2008; Ricardo Mendoza - +nvidia-drivers-177.68.ebuild: - Version bump for masked beta per bug #235851. Also changed SRC_URI to the - generic URL due to being unable to find the file in the US mirror - -*nvidia-drivers-177.67 (20 Aug 2008) - - 20 Aug 2008; Ricardo Mendoza - +nvidia-drivers-177.67.ebuild: - Version bump for masked beta per bug #235231. Release highlights at - http://www.nvnews.net/vbulletin/showthread.php?t=118085 - - 18 Aug 2008; Ricardo Mendoza metadata.xml: - Change maintainer - - 05 Aug 2008; Doug Goldstein metadata.xml: - add GLEP 56 USE flag desc from use.local.desc - -*nvidia-drivers-173.14.12 (31 Jul 2008) - - 31 Jul 2008; nvidia-drivers-173.14.09.ebuild, - +nvidia-drivers-173.14.12.ebuild: - Version bump as requested by Wyatt Epp in bug #233418. - Ensure SYSVIPC is enabled as per cucu ionut in bug - #213157. Patch to respect custom CFLAGS by boris64 - closes bug #230273. Paravirt exports now usable, delete unnecessary check - as per Patrizio Bassi in bug #232883. - - 22 Jul 2008; - -files/NVIDIA_kernel-71.86.04-2305230.diff, - -files/NVIDIA_kernel-96.43.05-2290218.diff, - -nvidia-drivers-71.86.01.ebuild, -nvidia-drivers-71.86.04.ebuild, - nvidia-drivers-71.86.06.ebuild, -nvidia-drivers-96.43.01.ebuild, - -nvidia-drivers-96.43.05.ebuild, nvidia-drivers-96.43.07.ebuild: - X86 following the AMD64 lead in fasttrack stable for 71 & 96 branch - drivers. Arch testing by hoffie, permission granted by tsunam. Closes bug - #232624 by Mike Hammill . Cleaned up old ebuilds. - - 17 Jul 2008; nvidia-drivers-71.86.06.ebuild, - nvidia-drivers-96.43.07.ebuild: - Fasttrack AMD64 stable for 2.6.26-capable drivers in the 71 & 96 branches - that owners of older GeForces are stuck with. Compile & QA tested by - CCIEChad. - -*nvidia-drivers-96.43.07 (17 Jul 2008) -*nvidia-drivers-71.86.06 (17 Jul 2008) - - 17 Jul 2008; +nvidia-drivers-71.86.06.ebuild, - +nvidia-drivers-96.43.07.ebuild: - New upstream releases, both fix secondary TV output sometimes being black - & white on some GPUs and are compatible with the newly released 2.6.26 - kernel. Install modprobe control file to /etc/modprobe.d instead of the - deprecated /etc/modules.d location, closes bug #213878. - - 08 Jul 2008; Christian Faulhammer - nvidia-drivers-173.14.09.ebuild: - stable x86, bug 230369, thanks to all the testers - - 01 Jul 2008; Thomas Anderson - nvidia-drivers-173.14.09.ebuild: - stable amd64, bug 230369 - -*nvidia-drivers-177.13 (19 Jun 2008) - - 19 Jun 2008; +nvidia-drivers-177.13.ebuild: - Masked beta driver 177.13; unsupported by nVidia. Adds support for GeForce - GTX 260 & 280 products. Upstream release announcement at - http://www.nvnews.net/vbulletin/showthread.php?t=114955 - -*nvidia-drivers-173.14.09 (17 Jun 2008) - - 17 Jun 2008; +nvidia-drivers-173.14.09.ebuild: - Version bump, closes bug #224109. With thanks to Ludovic F. - for drawing my attention to this bugfix release. - -*nvidia-drivers-173.14.05 (28 May 2008) - - 28 May 2008; - +files/NVIDIA_kernel-173.14.05-2419292.diff, - +nvidia-drivers-173.14.05.ebuild: - Version bump. Supported release, upstream release highlights are at - http://www.nvnews.net/vbulletin/showthread.php?t=113919. - - 21 May 2008; - +files/NVIDIA_kernel-71.86.04-2305230.diff, - nvidia-drivers-71.86.04.ebuild: - Add patch to allow building on 2.6.25 kernels; thanks to Andreas - . No revision bump, the module didnt build - for affected users. Closes bug #223047. - - 09 May 2008; Mark Loeser - nvidia-drivers-173.08.ebuild: - Works on x86 for me, marking ~x86 - - 08 May 2008; - files/NVIDIA_kernel-173.08-2404825.diff: - Upstream corrected the patch after the fact, update it. No revision bump - as the package is masked. - - 07 May 2008; - nvidia-drivers-71.86.01.ebuild, nvidia-drivers-71.86.04.ebuild, - nvidia-drivers-96.43.01.ebuild, nvidia-drivers-96.43.05.ebuild, - nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild, - nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild: - Quote variables where appropriate. - -*nvidia-drivers-173.08 (07 May 2008) - - 07 May 2008; - +files/NVIDIA_kernel-173.08-2404825.diff, +nvidia-drivers-173.08.ebuild: - Masked beta driver 173.08 with upstream patch from Zander ( - http://www.nvnews.net/vbulletin/showpost.php?p=1648357&postcount=35 ) for - >=2.6.26-rc1 compatibility. Dropped keywords as this has only been tested - on 2.6.26-rc1-00166-gc0a1811 SMP x86_64 so far. Now installs module - control file in modprobe.d where it belongs. Upstream advises to use PAT - over MTRR. Some reports of low performance and 2D corruption, tread - carefully. - - 18 Apr 2008; Mike Frysinger - +files/NVIDIA_kernel-96.43.05-2290218.diff, - nvidia-drivers-96.43.05.ebuild: - Add fix from upstream for building with linux-2.6.25 #218178. - - 18 Apr 2008; Mike Frysinger - +files/NVIDIA_kernel-169.12-2286310.diff, nvidia-drivers-169.12.ebuild: - Add fix from upstream for building with linux-2.6.25 #218178. - - 10 Apr 2008; Doug Goldstein - nvidia-drivers-169.09-r1.ebuild: - revert previous commit due to it breaking the stable tree. it also flies - in the face of nvidia-drivers maintenance policies. - - 10 Apr 2008; William L. Thomson Jr. - nvidia-drivers-169.09-r1.ebuild: - De-stablizing package, lost 3+ hours debugging why a stable machine X was - at 99% for any 2d operation, thunderbird etc. - - 19 Mar 2008; Raúl Porcel - nvidia-drivers-96.43.05.ebuild: - x86 stable - - 05 Mar 2008; Christian Faulhammer - nvidia-drivers-169.09-r1.ebuild: - stable x86, bug 212290 - - 04 Mar 2008; Olivier Crête - nvidia-drivers-169.09-r1.ebuild: - Stable on amd64, bug #212290 - -*nvidia-drivers-169.12 (28 Feb 2008) - - 28 Feb 2008; Doug Goldstein +nvidia-drivers-169.12.ebuild: - version bump - - 18 Feb 2008; Doug Goldstein - nvidia-drivers-169.09-r1.ebuild: - revert libwfb.so change requested in bug #202978 - -*nvidia-drivers-169.09-r1 (15 Feb 2008) - - 15 Feb 2008; Doug Goldstein - +nvidia-drivers-169.09-r1.ebuild: - new ebuild that should fix bug #207298, #207299, #167413, #184593, #188552, - and #187149. and #202978, depending on the results of the discussion and - added work around for bug #137000 - -*nvidia-drivers-96.43.05 (04 Feb 2008) -*nvidia-drivers-71.86.04 (04 Feb 2008) - - 04 Feb 2008; Doug Goldstein - +nvidia-drivers-71.86.04.ebuild, +nvidia-drivers-96.43.05.ebuild: - new legacy driver releases for newer kernels and X.org servers - -*nvidia-drivers-169.09 (22 Jan 2008) - - 22 Jan 2008; Doug Goldstein nvidia-drivers-169.07.ebuild, - +nvidia-drivers-169.09.ebuild: - QA_WX_LOAD addition. new nvidia-drivers version - - 22 Jan 2008; Doug Goldstein +files/nvidia-169.07, - nvidia-drivers-169.07.ebuild: - provide newer /etc/modules.d file - -*nvidia-drivers-169.07 (16 Jan 2008) - - 16 Jan 2008; Doug Goldstein +nvidia-drivers-169.07.ebuild: - starting to rewrite the ebuild a bit. commiting masked so people can tinker - - 26 Dec 2007; Doug Goldstein - nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild: - fix patch to nvidia-xconfig on FreeBSD. bug #199761 - - 21 Dec 2007; Doug Goldstein - -nvidia-drivers-1.0.7185.ebuild, -nvidia-drivers-1.0.9639.ebuild: - remove old versions - - 21 Dec 2007; Doug Goldstein - nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild: - apply patch only when linux. bug #199759 - - 20 Nov 2007; Christian Faulhammer - nvidia-drivers-71.86.01.ebuild: - stable x86, bug 186490 - - 14 Nov 2007; Steve Dibb - nvidia-drivers-71.86.01.ebuild, nvidia-drivers-96.43.01.ebuild: - amd64 stable, bug 186490 - - 12 Nov 2007; Peter Weller - nvidia-drivers-100.14.19.ebuild: - Stable on amd64 wrt bug 186490 - -*nvidia-drivers-100.14.23 (01 Nov 2007) - - 01 Nov 2007; Doug Goldstein - +nvidia-drivers-100.14.23.ebuild: - adding beta NVIDIA driver for user demand. bug #196679 - - 31 Oct 2007; Raúl Porcel - nvidia-drivers-96.43.01.ebuild: - x86 stable - - 29 Oct 2007; Markus Ullmann - nvidia-drivers-100.14.19.ebuild: - Stable on x86 - - 29 Oct 2007; Doug Goldstein - nvidia-drivers-100.14.19.ebuild: - add x86-fbsd support for 100.14.19 since it's been released now - - 07 Oct 2007; Doug Goldstein - nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild, - nvidia-drivers-71.86.01.ebuild, nvidia-drivers-96.43.01.ebuild, - nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild, - nvidia-drivers-100.14.19.ebuild: - Quote some old $ROOT usage - - 07 Oct 2007; Doug Goldstein - nvidia-drivers-71.86.01.ebuild, nvidia-drivers-96.43.01.ebuild, - nvidia-drivers-100.14.19.ebuild: - nvidia-driver uses ACPI if it's installed. Add USE based dep on it. - - 01 Oct 2007; Doug Goldstein - nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild: - mark the depends as not supporting xorg-server 1.4 - -*nvidia-drivers-96.43.01 (27 Sep 2007) -*nvidia-drivers-71.86.01 (27 Sep 2007) - - 27 Sep 2007; Doug Goldstein - +nvidia-drivers-71.86.01.ebuild, +nvidia-drivers-96.43.01.ebuild, - nvidia-drivers-100.14.19.ebuild: - bump both nvidia legacy drivers to their latest revisions. Remove hack since - it's no longer needed. - - 20 Sep 2007; Chris Gianelloni -files/nvidia-2, - -files/NVIDIA_kernel-2.6.19.patch, files/nvidia, - nvidia-drivers-1.0.7185.ebuild, -nvidia-drivers-1.0.8776-r1.ebuild, - -nvidia-drivers-1.0.9631-r1.ebuild, nvidia-drivers-1.0.9639.ebuild, - -nvidia-drivers-1.0.9746-r1.ebuild, -nvidia-drivers-1.0.9755-r1.ebuild, - nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild, - nvidia-drivers-100.14.19.ebuild: - Removing older ebuilds where newer ebuilds in the same class have the same - KEYWORDS or better, moving nvidia-2 to nvidia, since nothing uses the old - file anymore, simplified sed by changing ${PACKAGE} to PACKAGE, and changed - a newins to doins, since we were not renaming anything. - -*nvidia-drivers-100.14.19 (18 Sep 2007) - - 18 Sep 2007; Doug Goldstein - +nvidia-drivers-100.14.19.ebuild: - new drivers from nVidia. no FreeBSD support. - - 26 Aug 2007; Anant Narayanan Manifest: - Fix Manifest - - 30 Jul 2007; Donnie Berkholz ; - nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.8776-r1.ebuild, - nvidia-drivers-1.0.9631-r1.ebuild, nvidia-drivers-1.0.9639.ebuild, - nvidia-drivers-1.0.9746-r1.ebuild, nvidia-drivers-1.0.9755-r1.ebuild, - nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild: - Move eselect-opengl into DEPEND only, so it can be uninstalled later. - - 28 Jul 2007; Steve Dibb - nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild, - nvidia-drivers-100.14.09.ebuild: - amd64 stable, bug 183567 - - 20 Jul 2007; Doug Goldstein - nvidia-drivers-1.0.7185.ebuild: - remove i2c-hwmon, libnvidia-cfg, nvidia-xconfig, and README.txt from 7185 - since they don't exist - - 19 Jul 2007; Raúl Porcel - nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild, - nvidia-drivers-100.14.09.ebuild - x86 stable wrt security #183567 - - 19 Jul 2007; Doug Goldstein - +nvidia-drivers-100.14.09.ebuild: - adding back 100.14.09 based off 100.14.11 ebuild - - 18 Jul 2007; Doug Goldstein - nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild, - nvidia-drivers-100.14.11.ebuild: - QA EXECSTACK handling - -*nvidia-drivers-1.0.7185 (14 Jul 2007) - - 14 Jul 2007; Doug Goldstein - +nvidia-drivers-1.0.7185.ebuild: - add 1.0.7185 drivers - -*nvidia-drivers-1.0.9639 (14 Jul 2007) - - 14 Jul 2007; Doug Goldstein - -files/nvidia-settings.desktop, -files/nvidia-settings.png, - +nvidia-drivers-1.0.9639.ebuild, -nvidia-drivers-100.14.09.ebuild, - nvidia-drivers-100.14.11.ebuild: - add ebuild for 1.0.9639 drivers. Merge in updates from 100.14.11 drivers. - Removed old 100.14.09 drivers. No longer build nvidia-settings part of the - drivers but PDEPEND on it via gtk USE flag. Other misc cleanups. - - 13 Jul 2007; Doug Goldstein - nvidia-drivers-100.14.11.ebuild: - fix bug #185171 - - 12 Jul 2007; Doug Goldstein - nvidia-drivers-100.14.11.ebuild: - Fixes #177231, #182622, #184432, #184795 - - 07 Jul 2007; Doug Goldstein +files/nvidia-2, - +files/NVIDIA_i2c-hwmon.patch, +files/nvidia-settings.desktop, - +files/nvidia-settings.png, nvidia-drivers-100.14.11.ebuild: - work in progress. fixes bug #183567, #169740, #182933, #184432. More will be - fixed before unmask - - 05 Jul 2007; Mike Frysinger - nvidia-drivers-1.0.8776-r1.ebuild, nvidia-drivers-1.0.9631-r1.ebuild, - nvidia-drivers-1.0.9746-r1.ebuild, nvidia-drivers-1.0.9755-r1.ebuild, - nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild: - If glibc does not have IUSE=nptl, assume it is enabled as newer versions - only support nptl. - -*nvidia-drivers-100.14.11 (04 Jul 2007) - - 04 Jul 2007; Christian Parpart - +nvidia-drivers-100.14.11.ebuild: - version bump to 100.14.11 - - 02 Jul 2007; Piotr Jaroszyński - nvidia-drivers-1.0.8776-r1.ebuild, nvidia-drivers-1.0.9631-r1.ebuild: - (QA) RESTRICT clean up. - - 01 Jul 2007; Piotr Jaroszyński - nvidia-drivers-1.0.8776-r1.ebuild, nvidia-drivers-1.0.9631-r1.ebuild, - nvidia-drivers-1.0.9746-r1.ebuild, nvidia-drivers-1.0.9755-r1.ebuild, - nvidia-drivers-100.14.09.ebuild: - (QA) RESTRICT="multilib-pkg-force" -> EMULTILIB_PKG="true" - -*nvidia-drivers-100.14.09 (19 Jun 2007) - - 19 Jun 2007; Christian Parpart - +nvidia-drivers-100.14.09.ebuild: - version bump. wrt bug #176135 and bug #175674 - - 13 Apr 2007; Chris Gianelloni - -nvidia-drivers-1.0.8776.ebuild, nvidia-drivers-1.0.8776-r1.ebuild: - Stable on amd64/x86 wrt bug #114893. - -*nvidia-drivers-1.0.9755-r1 (13 Mar 2007) -*nvidia-drivers-1.0.9746-r1 (13 Mar 2007) -*nvidia-drivers-1.0.9631-r1 (13 Mar 2007) -*nvidia-drivers-1.0.8776-r1 (13 Mar 2007) - - 13 Mar 2007; Jeremy Huddleston - +nvidia-drivers-1.0.8776-r1.ebuild, -nvidia-drivers-1.0.9631.ebuild, - +nvidia-drivers-1.0.9631-r1.ebuild, -nvidia-drivers-1.0.9746.ebuild, - +nvidia-drivers-1.0.9746-r1.ebuild, -nvidia-drivers-1.0.9755.ebuild, - +nvidia-drivers-1.0.9755-r1.ebuild: - Install libnvidia-cfg.so. Fixes bug #114893. - -*nvidia-drivers-1.0.9755 (07 Mar 2007) - - 07 Mar 2007; Chris Gianelloni - +nvidia-drivers-1.0.9755.ebuild: - Version bump to latest version of the drivers. - - 19 Feb 2007; Chris Gianelloni - nvidia-drivers-1.0.8776.ebuild, nvidia-drivers-1.0.9631.ebuild, - nvidia-drivers-1.0.9746.ebuild: - Removing dlloader USE flag wrt bug #166759. - - 07 Feb 2007; Chris Gianelloni - nvidia-drivers-1.0.8776.ebuild, nvidia-drivers-1.0.9631.ebuild, - nvidia-drivers-1.0.9746.ebuild: - Fixed the executable stack warnings with a patch from Vlastimil Babka - and closing bug #114894. - - 07 Feb 2007; Chris Gianelloni - -nvidia-drivers-1.0.8774.ebuild, -nvidia-drivers-1.0.9742.ebuild: - Cleaning up some older versions. - -*nvidia-drivers-1.0.9746 (28 Dec 2006) - - 28 Dec 2006; Chris Gianelloni - +nvidia-drivers-1.0.9746.ebuild: - Added version 9746 and closing bug #158889. - - 26 Dec 2006; Mike Frysinger - nvidia-drivers-1.0.9742.ebuild: - Style touchups and create relative symlinks in /usr/lib. - - 12 Dec 2006; Chris Gianelloni - nvidia-drivers-1.0.9631.ebuild, nvidia-drivers-1.0.9742.ebuild: - Update Gentoo/FreeBSD support with a patch from Timothy Redaelli - . Closing bug #157625. - - 06 Dec 2006; Chris Gianelloni - -nvidia-drivers-1.0.9629.ebuild, nvidia-drivers-1.0.9742.ebuild: - Added patch from Joshua Napoli to install - libnvidia-wfb and closing bug #155532. Removing 9629, as it has problems - with NV2x cards. - - 05 Dec 2006; Chris Gianelloni - files/NVIDIA_kernel-2.6.19.patch: - Updated the NVIDIA_kernel-2.6.19.patch and closing bug #156978. - -*nvidia-drivers-1.0.9631 (05 Dec 2006) - - 05 Dec 2006; Chris Gianelloni - +nvidia-drivers-1.0.9631.ebuild: - Version bump to 1.0.9631 for bug #157194. This should also close bug - #105656, bug #150080, bug #154739, and bug #156886. - - 05 Dec 2006; Chris Gianelloni files/nvidia: - Updated the nvidia file which installs to /etc/modules.d for bug #139756. - - 04 Dec 2006; Chris Gianelloni - nvidia-drivers-1.0.8774.ebuild, nvidia-drivers-1.0.8776.ebuild, - nvidia-drivers-1.0.9629.ebuild, nvidia-drivers-1.0.9742.ebuild: - Fixing up executable stacks and closing bug #114894. - - 10 Nov 2006; Chris Gianelloni - -files/1.0.9626/NVIDIA-1.0.9626-i2c.diff, -nvidia-drivers-1.0.9626.ebuild: - Removing the 1.0-9626 driver, since it has been known to cause a black - screen at X startup and is superceded by the 9629 driver. - -*nvidia-drivers-1.0.9742 (09 Nov 2006) -*nvidia-drivers-1.0.9629 (09 Nov 2006) - - 09 Nov 2006; Kristopher Kersey - +nvidia-drivers-1.0.9629.ebuild, +nvidia-drivers-1.0.9742.ebuild: - Added new stable driver 1.0.9629 and unstable driver 1.0.9742. - - 24 Oct 2006; Simon Stelling - nvidia-drivers-1.0.8776.ebuild: - stable on amd64 - - 24 Oct 2006; Joshua Jackson - nvidia-drivers-1.0.8776.ebuild: - Stable x86; bug #151635 - - 20 Oct 2006; Chris Gianelloni - nvidia-drivers-1.0.8774.ebuild, nvidia-drivers-1.0.8776.ebuild, - nvidia-drivers-1.0.9626.ebuild: - Added fix for bug #145968. - -*nvidia-drivers-1.0.8776 (20 Oct 2006) - - 20 Oct 2006; Chris Gianelloni - -files/1.0.8178/NVIDIA-1.0.8178-1423627.diff, - -files/1.0.8178/NVIDIA-1.0.8178-1427453.diff, - -files/1.0.8178/NVIDIA-1.0.8178-1435131.diff, - -files/1.0.8178/NVIDIA-1.0.8178-1450608.diff, - -files/1.0.8178/NVIDIA-1.0.8178-1453708.diff, - -files/1.0.8178/NVIDIA-1.0.8178-U012206.diff, - -nvidia-drivers-1.0.8178.ebuild, +nvidia-drivers-1.0.8776.ebuild: - Added 8776 for bug #151635 and removing 8178, since it is vulnerable. - - 18 Oct 2006; Chris Gianelloni - nvidia-drivers-1.0.8178.ebuild, nvidia-drivers-1.0.8774.ebuild, - nvidia-drivers-1.0.9626.ebuild: - Use pkg2 for AMD64 since the other ones don't ship the 32-bit libraries. How - lame is that? Closing bug #151759. - - 17 Oct 2006; Chris Gianelloni - -files/1.0.9625/NVIDIA-1.0.9625-i2c.diff, - +files/1.0.9626/NVIDIA-1.0.9626-i2c.diff, nvidia-drivers-1.0.8178.ebuild, - nvidia-drivers-1.0.8774.ebuild, -nvidia-drivers-1.0.9625.ebuild, - nvidia-drivers-1.0.9626.ebuild: - Changed pkg1 and pkg2 to pkg0 for bug #146182. - - 17 Oct 2006; Olivier Crête - nvidia-drivers-1.0.9626.ebuild: - Patch version is 1.0.9625 - - 16 Oct 2006; Chris Gianelloni - nvidia-drivers-1.0.9626.ebuild: - It looks like the i2c patch is still needed. - -*nvidia-drivers-1.0.9626 (16 Oct 2006) - - 16 Oct 2006; Chris Gianelloni - +nvidia-drivers-1.0.9626.ebuild: - Updated to 1.0.9626, which adds support for NVIDIA Quadro Plex configurations. - - 13 Oct 2006; Chris Gianelloni - +files/NVIDIA_kernel-2.6.19.patch: - Added patch from Daniel Drake for compiling on 2.6.19 and - closing bug #151177. - - 12 Oct 2006; Chris Gianelloni - +files/1.0.8178/NVIDIA-1.0.8178-1423627.diff, - +files/1.0.8178/NVIDIA-1.0.8178-1427453.diff, - +files/1.0.8178/NVIDIA-1.0.8178-1435131.diff, - +files/1.0.8178/NVIDIA-1.0.8178-1450608.diff, - +files/1.0.8178/NVIDIA-1.0.8178-1453708.diff, - +files/1.0.8178/NVIDIA-1.0.8178-U012206.diff, - ,files/1.0.8762/NVIDIA-1.0.8762-U062606.diff: - Added patches from nvnews.net for 8178, removing 8762, and adding a notice - to 9625 about AddARGBGLXVisuals for compiz. - - 09 Oct 2006; Chris Gianelloni - nvidia-drivers-1.0.8178.ebuild, -nvidia-drivers-1.0.8762.ebuild, - nvidia-drivers-1.0.8762-r1.ebuild, nvidia-drivers-1.0.8774.ebuild, - nvidia-drivers-1.0.9625.ebuild: - Removed virtual/x11 from dependencies, removed blocker on nvidia-kernel and - nvidia-glx, since they're no longer in the tree, changed nostrip to strip, - and added QA variables for TEXTRELS and EXECSTACK for amd64 and x86. Closing - bug #114894. - - 04 Oct 2006; Chris Gianelloni - nvidia-drivers-1.0.8178.ebuild, nvidia-drivers-1.0.8762.ebuild, - nvidia-drivers-1.0.8762-r1.ebuild, nvidia-drivers-1.0.8774.ebuild, - nvidia-drivers-1.0.9625.ebuild: - Removed PROVIDE=virtual/opengl since opengl is a new-style virtual. - - 04 Oct 2006; Chris Gianelloni - nvidia-drivers-1.0.8774.ebuild: - Stable on amd64/x86 for bug #144549. - - 04 Oct 2006; Chris Gianelloni - nvidia-drivers-1.0.8178.ebuild: - Stable on amd64/x86 for bug #143814. - - 25 Sep 2006; Chris Gianelloni - +files/1.0.9625/NVIDIA-1.0.9625-i2c.diff, nvidia-drivers-1.0.9625.ebuild: - Added patch from Zander to remove i2c functionality from the drivers until - it is fixed upstream. - - 25 Sep 2006; Chris Gianelloni - nvidia-drivers-1.0.8178.ebuild, nvidia-drivers-1.0.8762.ebuild, - nvidia-drivers-1.0.8762-r1.ebuild, nvidia-drivers-1.0.8774.ebuild, - nvidia-drivers-1.0.9625.ebuild: - Commented out the Makefile patch. - -*nvidia-drivers-1.0.9625 (25 Sep 2006) -*nvidia-drivers-1.0.8178 (25 Sep 2006) - - 25 Sep 2006; Chris Gianelloni - +files/NVIDIA_glx-makefile.patch, +nvidia-drivers-1.0.8178.ebuild, - nvidia-drivers-1.0.8762.ebuild, nvidia-drivers-1.0.8762-r1.ebuild, - nvidia-drivers-1.0.8774.ebuild, +nvidia-drivers-1.0.9625.ebuild: - Added 8178 ebuild for bug #143814. Also added a (masked) 9625 beta ebuild. - - 27 Aug 2006; Hanno Boeck files/libGL.la-r2: - Fix libdir in libGL.la (bug #140982). - - 27 Aug 2006; Donnie Berkholz - nvidia-drivers-1.0.8774.ebuild: - Remove blocker on xorg-server 1.1. - - 25 Aug 2006; Donnie Berkholz +metadata.xml: - Someone forgot to add metadata. - -*nvidia-drivers-1.0.8774 (25 Aug 2006) - - 25 Aug 2006; Kristopher Kersey - +nvidia-drivers-1.0.8774.ebuild: - Added ebuild for NVIDIA driver release 1.0-8774. - - 08 Aug 2006; Joshua Jackson - nvidia-drivers-1.0.8762-r1.ebuild: - Stable x86; bug #140922 - - 06 Aug 2006; Simon Stelling - nvidia-drivers-1.0.8762-r1.ebuild: - stable on amd64 - -*nvidia-drivers-1.0.8762-r1 (07 Jul 2006) - - 07 Jul 2006; Kristopher Kersey - +files/1.0.8762/NVIDIA-1.0.8762-U062606.diff, - +nvidia-drivers-1.0.8762-r1.ebuild: - Added Zander's patch to allow building with latest kernels (>= - 2.6.17-rc4-mm1, >= 2.6.17-git7). - - 06 Jul 2006; Kristopher Kersey - nvidia-drivers-1.0.8762.ebuild: - Quick fix to close bug #133138. - -*nvidia-drivers-1.0.8762 (06 Jul 2006) - - 06 Jul 2006; Kristopher Kersey +files/09nvidia, - +files/NVIDIA_glx-defines.patch, +files/NVIDIA_glx-glheader.patch, - +files/libGL.la-r2, +files/nvidia, +nvidia-drivers-1.0.8762.ebuild: - Initial import of x11-drivers/nvidia-drivers that will take the place of - media-video/nvidia-kernel and media-video/nvidia-glx. - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/Manifest deleted file mode 100644 index 5d3e9f8d20..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST NVIDIA-FreeBSD-x86-260.19.36.tar.gz 27282754 SHA256 03e41a19ad93668034efa8306983b57b69fcca1e328a5a70c9295096fb9675d5 SHA512 0ae75d616202bd054c820ef0dd1cfa16fe0aa7dc73e7abc502aeb2a4c28f3469dc3d089e6e6f4b27c6002c79ab6ca96f8bca52da362f5b088210869f3da60961 WHIRLPOOL 26cc49ff77ef5f324fa73c4c856bdde7f5ce8b1eadc97680adf725eb64c048da829561c481549557855f45e4c54a248fd45c69104e3c1a45a66c6b440d5a5c5a -DIST NVIDIA-Linux-x86-260.19.36.run 28558478 SHA256 6cfbb7cbfdb8ca5399303d43204e73ca3aad5bbc03c938f11ce5e154ec76cc6d SHA512 56e51ba75a0f82fb81701550a74d318f2693220327bceb551b37f90cd9f754d9f237624941ea3ce3f571c62b486df690410d1b7f211f6919a25c7a5bb73e25b4 WHIRLPOOL 698738d3b1df6b70d010f1cf57a0683ed71e28fde58da2e13a70eefbf2ce9b4fc103b8598edc0d3ae6d77eddff31a9a19079b1cb99d71a1d3035b68681309b5d -DIST NVIDIA-Linux-x86_64-260.19.36.run 48081798 SHA256 35a8769585e1f9b426c9c21b5f5898c06251a642ed73e9fb9eea9ab87ef91067 SHA512 4f008c90296f22ba944b30d40138af865c82c17721b17368f6497d9b0c7dab50a8320eff90e6da3a5a592b9b8f9741284bbd6589754ae95d80fd489be9b2d126 WHIRLPOOL e0d399f72aba94c3f242e8c1929dd3174fc8a51aa91349b6bc9694922062dbebca6e077a1f7c382caed22fd0aa8c70754792414cfd5380368be2c75ceaeb3bd1 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/09nvidia b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/09nvidia deleted file mode 100644 index 1fcbef41fc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/09nvidia +++ /dev/null @@ -1,2 +0,0 @@ -# Has to precede X11's own libraries! -LDPATH=/opt/nvidia/lib diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch deleted file mode 100644 index eff06a50d0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naurp NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh ---- NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh 2010-02-07 22:53:38.000000000 +0100 -+++ NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh 2010-02-07 22:57:10.000000000 +0100 -@@ -82,7 +82,7 @@ build_cflags() { - - if [ "$OUTPUT" != "$SOURCES" ]; then - MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -91,7 +91,7 @@ build_cflags() { - fi - else - MACH_CFLAGS="-I$HEADERS/asm/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -102,7 +102,7 @@ build_cflags() { - - CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS" - -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" - fi - if [ -n "$BUILD_PARAMS" ]; then diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch deleted file mode 100644 index da92b8f080..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -NuarpbB NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh NVIDIA-Linux-x86-256.25/kernel/conftest.sh ---- NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh 2010-05-19 05:38:57.000000000 +0200 -+++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh 2010-05-22 02:13:56.000000000 +0200 -@@ -101,7 +101,7 @@ build_cflags() { - - if [ "$OUTPUT" != "$SOURCES" ]; then - MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -110,7 +110,7 @@ build_cflags() { - fi - else - MACH_CFLAGS="-I$HEADERS/asm/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -121,7 +121,7 @@ build_cflags() { - - CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" - -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" - fi - if [ -n "$BUILD_PARAMS" ]; then diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch deleted file mode 100644 index da9933f633..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h ---- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h 2002-12-09 21:26:55.000000000 +0100 -+++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h 2003-01-30 18:20:23.000000000 +0100 -@@ -39,6 +39,7 @@ - typedef XID GLXPixmap; - typedef XID GLXDrawable; - typedef XID GLXPbuffer; -+typedef XID GLXPbufferSGIX; - typedef XID GLXWindow; - typedef XID GLXFBConfigID; - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch deleted file mode 100644 index e0393e1b9a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- usr/include/GL/gl.g.orig 2004-07-17 19:56:59.789410584 +1000 -+++ usr/include/GL/gl.h 2004-07-17 19:59:08.844791184 +1000 -@@ -66,6 +66,10 @@ - typedef double GLclampd; - typedef void GLvoid; - -+/* Patching for some better defines in the global system */ -+#ifndef GL_GLEXT_LEGACY -+#include -+#endif - - /*************************************************************/ - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit deleted file mode 100644 index 75b39cfbd9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ - -# Install nvidia library: -# the first parameter is the place where to install it -# the second parameter is the base name of the library -# the third parameter is the provided soversion -donvidia() { - dodir $1 - exeinto $1 - - libname=$(basename $2) - - # libnvidia-cfg.so is no longer supplied in lib32; step over it gracefully - if [ -e $2.$3 ] ; then - doexe $2.$3 - dosym ${libname}.$3 $1/${libname} - [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit deleted file mode 100644 index b14df34b10..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ - -mtrr_check() { - ebegin "Checking for MTRR support" - linux_chkconfig_present MTRR - eend $? - - if [[ $? -ne 0 ]] ; then - eerror "Please enable MTRR support in your kernel config, found at:" - eerror - eerror " Processor type and features" - eerror " [*] MTRR (Memory Type Range Register) support" - eerror - eerror "and recompile your kernel ..." - die "MTRR support not detected!" - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit deleted file mode 100644 index e48d11ce96..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distribnuted under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ -# -src_install-libs() { - local pkglibdir=lib - local inslibdir=$(get_libdir) - - if [[ ${#} -eq 2 ]] ; then - pkglibdir=${1} - inslibdir=${2} - elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then - pkglibdir=lib32 - fi - - local usrpkglibdir=usr/${pkglibdir} - local libdir=usr/X11R6/${pkglibdir} - local drvdir=${libdir}/modules/drivers - local extdir=${libdir}/modules/extensions - local incdir=usr/include/GL - local sover=${PV} - local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" - local NO_TLS_ROOT="${NV_ROOT}/no-tls" - local TLS_ROOT="${NV_ROOT}/tls" - local X11_LIB_DIR="/usr/${inslibdir}/xorg" - - if use x86-fbsd; then - # on FreeBSD everything is on obj/ - pkglibdir=obj - usrpkglibdir=obj - x11pkglibdir=obj - drvdir=obj - extdir=obj - - # don't ask me why the headers are there.. glxext.h is missing - incdir=doc - - # on FreeBSD it has just .1 suffix - sover=1 - fi - - # The GLX libraries - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover} - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover} - - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libnvidia-cfg.so ${sover} - - dodir ${NO_TLS_ROOT} - donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover} - - if ! use x86-fbsd; then - donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover} - fi - - if want_tls ; then - dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib - dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib - dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib - else - dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib - dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib - dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib - fi - - if ! use x86-fbsd; then - # Install the .la file for libtool, to prevent e.g. bug #176423 - [ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR" - local ver1=$(get_version_component_range 1) - local ver2=$(get_version_component_range 2) - local ver3=$(get_version_component_range 3) - sed -e "s:\${PV}:${PV}:" \ - -e "s:\${ver1}:${ver1}:" \ - -e "s:\${ver2}:${ver2}:" \ - -e "s:\${ver3}:${ver3}:" \ - -e "s:\${libdir}:${inslibdir}:" \ - "${FILESDIR}"/libGL.la-r2 > "${D}"/${NV_ROOT}/lib/libGL.la - fi - - exeinto ${X11_LIB_DIR}/modules/drivers - - [[ -f ${drvdir}/nvidia_drv.so ]] && \ - doexe ${drvdir}/nvidia_drv.so - - insinto /usr/${inslibdir} - [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \ - doins ${libdir}/libXvMCNVIDIA.a - exeinto /usr/${inslibdir} - # fix Bug 131315 - [[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \ - doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \ - dosym libXvMCNVIDIA.so.${PV} \ - /usr/${inslibdir}/libXvMCNVIDIA.so - - exeinto ${NV_ROOT}/extensions - [[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \ - newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so - [[ -f ${extdir}/libglx.so.${sover} ]] && \ - newexe ${extdir}/libglx.so.${sover} libglx.so - - # Includes - insinto ${NV_ROOT}/include - doins ${incdir}/*.h - - #cuda - if [[ -f usr/include/cuda/cuda.h ]]; then - dodir /usr/include/cuda - insinto /usr/include/cuda - doins usr/include/cuda/*.h - - if [[ -f usr/${pkglibdir}/libcuda.so.${PV} ]]; then - dolib.so usr/${pkglibdir}/libcuda.so.${PV} - dosym libcuda.so.${PV} /usr/${inslibdir}/libcuda.so.1 - dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so - fi - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit deleted file mode 100644 index 4debb85d3a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ - -want_tls() { - # For uclibc or anything non glibc, return false - has_version sys-libs/glibc || return 1 - - # Old versions of glibc were lt/no-tls only - has_version '=sys-libs/glibc-2.3.5' ; then - case ${CHOST/-*} in - i486|i586) return 1 ;; - esac - fi - - # These versions built linuxthreads version to support tls, too - has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0 - - return 1 -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/libGL.la-r2 b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/libGL.la-r2 deleted file mode 100644 index 863d184419..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/libGL.la-r2 +++ /dev/null @@ -1,32 +0,0 @@ -# libGL.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGL.so.1' - -# Names of this library. -library_names='libGL.so.${PV} libGL.so.1 libGL.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs='-L/usr/${libdir} -lm -lX11 -lXext -ldl' - -# Version information for libGL. -current=${ver1} -age=${ver2} -revision=${ver3} - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/${libdir}' diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia deleted file mode 100644 index 7cf0f7c078..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia +++ /dev/null @@ -1,40 +0,0 @@ -# Nvidia drivers support -alias char-major-195 nvidia -alias /dev/nvidiactl char-major-195 - -# To tweak the driver the following options can be used, note that -# you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/PACKAGE/README -# -# To enable Side Band Adressing: NVreg_EnableAGPSBA=1 -# -# To enable Fast Writes: NVreg_EnableAGPFW=1 -# -# To enable both for instance, uncomment following line: -# -#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1 -# If you have a mobile chip, you may need to enable this option -# if you have hard lockups when starting X. -# -# See: Appendix I. Configuring your laptop -# In /usr/share/doc/PACKAGE/README for full details -# -# Choose the appropriate value for NVreg_Mobile from the table: -# Value Meaning -# ---------- -------------------------------------------------- -# 0xFFFFFFFF let the kernel module autodetect the correct value -# 1 Dell laptops -# 2 non-Compal Toshiba laptops -# 3 all other laptops -# 4 Compal Toshiba laptops -# 5 Gateway laptops -# -#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3 - - -# !!! SECURITY WARNING !!! -# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW -# WHAT YOU ARE DOING. -# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, -# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. -options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-169.07 deleted file mode 100644 index a96b0cd1e4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-169.07 +++ /dev/null @@ -1,14 +0,0 @@ -# Nvidia drivers support -alias char-major-195 nvidia -alias /dev/nvidiactl char-major-195 - -# To tweak the driver the following options can be used, note that -# you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/PACKAGE/README -# -# !!! SECURITY WARNING !!! -# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW -# WHAT YOU ARE DOING. -# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, -# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. -options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch deleted file mode 100644 index 75daad33ec..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch +++ /dev/null @@ -1,92 +0,0 @@ -Index: usr/src/nv/conftest.sh -=================================================================== ---- usr/src/nv/conftest.sh -+++ usr/src/nv/conftest.sh 2010-01-06 12:10:56.000000000 +0530 -@@ -32,14 +32,14 @@ - # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats - # the kernel as a stand-alone kernel. - # -- FILE="linux/autoconf.h" -+ FILE="generated/autoconf.h" - - if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then - # - # We are looking at a configured source tree; verify - # that it's not a Xen kernel. - # -- echo "#include -+ echo "#include - #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT) - #error CONFIG_XEN defined! - #endif -@@ -111,7 +111,12 @@ - fi - } - --CONFTEST_PREAMBLE="#include -+CONFTEST_PREAMBLE="#include -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+ #include -+ #else -+ #include -+ #endif - #if defined(CONFIG_XEN) && \ - defined(CONFIG_XEN_INTERFACE_VERSION) && !defined(__XEN_INTERFACE_VERSION__) - #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION -@@ -1294,7 +1299,7 @@ - echo ""; - fi - fi -- exit $RET -+# exit $RET - ;; - - get_uname) -@@ -1316,11 +1321,11 @@ - # tree or at headers shipped for a specific kernel. - # Determine the kernel version using a compile check. - # -- FILE="linux/utsrelease.h" -+ FILE="generated/utsrelease.h" - - if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then - echo "$CONFTEST_PREAMBLE -- #include -+ #include - int main() { - printf(\"%s\", UTS_RELEASE); - return 0; -@@ -1375,7 +1380,7 @@ - # - RET=1 - VERBOSE=$6 -- FILE="linux/autoconf.h" -+ FILE="generated/autoconf.h" - - if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then - # -@@ -1429,7 +1434,7 @@ - # - RET=1 - VERBOSE=$6 -- FILE="linux/autoconf.h" -+ FILE="generated/autoconf.h" - - if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then - # -Index: usr/src/nv/nvacpi.c -=================================================================== ---- usr/src/nv/nvacpi.c -+++ usr/src/nv/nvacpi.c 2010-01-06 12:10:56.000000000 +0530 -@@ -49,6 +49,10 @@ - }; - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) -+#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL) -+#endif -+ - static struct acpi_driver *nv_acpi_driver; - static acpi_handle nvif_handle = NULL; - static acpi_handle dsm_handle = NULL; - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/metadata.xml b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/metadata.xml deleted file mode 100644 index 843e746128..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - -no-herd - - cardoe@gentoo.org - General maintainer and POC with NVIDIA - - - jer@gentoo.org - - - spock@gentoo.org - Focused on CUDA and new kernel support - -NVIDIA X11 driver and GLX libraries - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild deleted file mode 100644 index 97e8a6a943..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild +++ /dev/null @@ -1,529 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-260.19.36.ebuild,v 1.1 2011/01/24 15:39:30 cardoe Exp $ - -EAPI="2" - -inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver - -X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}" -AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" -X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}" - -DESCRIPTION="NVIDIA X11 driver and GLX libraries" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run ) - amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run ) - x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )" - -LICENSE="NVIDIA" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -IUSE="acpi custom-cflags gtk multilib kernel_linux" -RESTRICT="strip" -EMULTILIB_PKG="true" - -COMMON="=sys-libs/glibc-2.6.1 ) - multilib? ( app-emulation/emul-linux-x86-xlibs ) - >=app-admin/eselect-opengl-1.0.9 - !" - eerror " [ ] Lock debugging: detect incorrect freeing of live locks" - eerror " [ ] Lock debugging: prove locking correctness" - eerror " [ ] Lock usage statistics" - eerror "in 'menuconfig'" - die "LOCKDEP enabled" - fi -} - -pkg_setup() { - # try to turn off distcc and ccache for people that have a problem with it - export DISTCC_DISABLE=1 - export CCACHE_DISABLE=1 - - if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then - eerror "This ebuild doesn't currently support changing your default abi." - die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" - fi - - if use kernel_linux; then - linux-mod_pkg_setup - MODULE_NAMES="nvidia(video:${S}/kernel)" - BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ - SYSOUT=${KV_OUT_DIR} HOST_CC=$(tc-getBUILD_CC)" - mtrr_check - lockdep_check - fi - - # On BSD userland it wants real make command - use userland_BSD && MAKE="$(get_bmake)" - - export _POSIX2_VERSION="199209" - - # Since Nvidia ships 3 different series of drivers, we need to give the user - # some kind of guidance as to what version they should install. This tries - # to point the user in the right direction but can't be perfect. check - # nvidia-driver.eclass - nvidia-driver-check-warning - - # set variables to where files are in the package structure - if use kernel_FreeBSD; then - NV_DOC="${S}/doc" - NV_EXEC="${S}/obj" - NV_LIB="${S}/obj" - NV_SRC="${S}/src" - NV_MAN="${S}/x11/man" - NV_X11="${S}/obj" - NV_X11_DRV="${NV_X11}" - NV_X11_EXT="${NV_X11}" - NV_SOVER=1 - elif use kernel_linux; then - NV_DOC="${S}" - NV_EXEC="${S}" - NV_LIB="${S}" - NV_SRC="${S}/kernel" - NV_MAN="${S}" - NV_X11="${S}" - NV_X11_DRV="${NV_X11}" - NV_X11_EXT="${NV_X11}" - NV_SOVER=${PV} - else - die "Could not determine proper NVIDIA package" - fi -} - -src_unpack() { - if use kernel_linux && kernel_is lt 2 6 7; then - echo - ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" - ewarn "This is not officially supported for ${P}. It is likely you" - ewarn "will not be able to compile or use the kernel module." - ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7" - echo - ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored." - fi - - if ! use x86-fbsd; then - cd "${S}" - unpack_makeself - else - unpack ${A} - fi -} - -src_prepare() { - # Please add a brief description for every added patch - use x86-fbsd && cd doc - - if use kernel_linux; then - # Quiet down warnings the user does not need to see - sed -i \ - -e 's:-Wsign-compare::g' \ - "${NV_SRC}"/Makefile.kbuild - - # Add support for the 'x86' unified kernel arch in conftest.sh - epatch "${FILESDIR}"/256.35-unified-arch.patch - - # If you set this then it's your own fault when stuff breaks :) - use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.* - - # If greater than 2.6.5 use M= instead of SUBDIR= - convert_to_m "${NV_SRC}"/Makefile.kbuild - fi -} - -src_compile() { - # This is already the default on Linux, as there's no toplevel Makefile, but - # on FreeBSD there's one and triggers the kernel module build, as we install - # it by itself, pass this. - - cd "${NV_SRC}" - if use x86-fbsd; then - MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \ - LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die - elif use kernel_linux; then - linux-mod_src_compile - fi -} - -src_install() { - if use kernel_linux; then - linux-mod_src_install - - VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)" - if [ -z "$VIDEOGROUP" ]; then - eerror "Failed to determine the video group gid." - die "Failed to determine the video group gid." - fi - - # Add the aliases - [ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR" - sed -e 's:PACKAGE:'${PF}':g' \ - -e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \ - "${WORKDIR}"/nvidia - insinto /etc/modprobe.d - newins "${WORKDIR}"/nvidia nvidia.conf || die - elif use x86-fbsd; then - insinto /boot/modules - doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die - - exeinto /boot/modules - doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die - fi - - # NVIDIA kernel <-> userspace driver config lib - dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \ - die "failed to install libnvidia-cfg" - dosym /usr/$(get_libdir)/libnvidia-cfg.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvidia-cfg.so || \ - die "failed to create libnvidia-cfg.so symlink" - - # NVIDIA video decode <-> CUDA - dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \ - die "failed to install libnvcuvid.so" - dosym /usr/$(get_libdir)/libnvcuvid.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvcuvid.so || \ - die "failed to create libnvcuvid.so symlink" - - # Xorg DDX driver - insinto /usr/$(get_libdir)/xorg/modules/drivers - doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so" - - # Xorg GLX driver - insinto /usr/$(get_libdir)/opengl/nvidia/extensions - doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \ - die "failed to install libglx.so" - dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \ - /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \ - die "failed to create libglx.so symlink" - - # XvMC driver - dolib.a ${NV_X11}/libXvMCNVIDIA.a || \ - die "failed to install libXvMCNVIDIA.so" - dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \ - die "failed to install libXvMCNVIDIA.so" - dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so || \ - die "failed to create libXvMCNVIDIA.so symlink" - - # OpenCL ICD for NVIDIA - if use kernel_linux; then - dodir /etc/OpenCL/vendors - insinto /etc/OpenCL/vendors - doins nvidia.icd - fi - - # Documentation - dohtml ${NV_DOC}/html/* - if use x86-fbsd; then - dodoc "${NV_DOC}/README" - doman "${NV_MAN}/nvidia-xconfig.1" - use gtk && doman "${NV_MAN}/nvidia-settings.1" - else - # Docs - newdoc "${NV_DOC}/README.txt" README - dodoc "${NV_DOC}/NVIDIA_Changelog" - doman "${NV_MAN}/nvidia-smi.1.gz" - doman "${NV_MAN}/nvidia-xconfig.1.gz" - use gtk && doman "${NV_MAN}/nvidia-settings.1.gz" - fi - - # Helper Apps - dobin ${NV_EXEC}/nvidia-xconfig || die - if use gtk; then - dobin ${NV_EXEC}/nvidia-settings || die - fi - dobin ${NV_EXEC}/nvidia-bug-report.sh || die - if use kernel_linux; then - dobin ${NV_EXEC}/nvidia-smi || die - fi - - # Desktop entries for nvidia-settings - if use gtk; then - sed -e 's:__UTILS_PATH__:/usr/bin:' \ - -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \ - -i "${NV_EXEC}/nvidia-settings.desktop" - domenu ${NV_EXEC}/nvidia-settings.desktop - - doicon ${NV_EXEC}/nvidia-settings.png - fi - - if has_multilib_profile ; then - local OABI=${ABI} - for ABI in $(get_install_abis) ; do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs - fi - - is_final_abi || die "failed to iterate through all ABIs" -} - -# Install nvidia library: -# the first parameter is the place where to install it -# the second parameter is the base name of the library -# the third parameter is the provided soversion -donvidia() { - dodir $1 - exeinto $1 - - libname=$(basename $2) - - doexe $2.$3 || die "failed to install $2" - dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2" - [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 -} - -src_install-libs() { - local inslibdir=$(get_libdir) - local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" - local libdir= sover= - - if use kernel_linux; then - if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then - libdir=32 - else - libdir=. - fi - sover=${PV} - else - libdir=obj - # on FreeBSD it has just .1 suffix - sover=1 - fi - - # The GLX libraries - donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover} - donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover} - if use x86-fbsd; then - donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover} - else - donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover} - fi - - # VDPAU - donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover} - - # CUDA & OpenCL - if use kernel_linux; then - donvidia /usr/${inslibdir} ${libdir}/libcuda.so ${sover} - donvidia /usr/${inslibdir} ${libdir}/libnvidia-compiler.so ${sover} - donvidia /usr/${inslibdir} ${libdir}/libOpenCL.so 1.0.0 - dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so - fi -} - -pkg_preinst() { - if use kernel_linux; then - linux-mod_pkg_postinst - fi - - # Clean the dynamic libGL stuff's home to ensure - # we dont have stale libs floating around - if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then - rm -rf "${ROOT}"/usr/lib/opengl/nvidia/* - fi - # Make sure we nuke the old nvidia-glx's env.d file - if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then - rm -f "${ROOT}"/etc/env.d/09nvidia - fi -} - -pkg_postinst() { - if use kernel_linux; then - linux-mod_pkg_postinst - fi - - # Switch to the nvidia implementation - eselect opengl set --use-old nvidia - - echo - elog "You must be in the video group to use the NVIDIA device" - elog "For more info, read the docs at" - elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6" - elog - - elog "This ebuild installs a kernel module and X driver. Both must" - elog "match explicitly in their version. This means, if you restart" - elog "X, you must modprobe -r nvidia before starting it back up" - elog - - elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\"" - elog - elog "NVIDIA has requested that any bug reports submitted have the" - elog "output of /usr/bin/nvidia-bug-report.sh included." - elog - elog "To work with compiz, you must enable the AddARGBGLXVisuals option." - elog - elog "If you are having resolution problems, try disabling DynamicTwinView." - elog - - if ! use gtk; then - elog "USE=gtk controls whether the nvidia-settings application" - elog "is installed. If you would like to use it, enable that" - elog "flag and re-emerge this ebuild. media-video/nvidia-settings" - elog "no longer installs nvidia-settings but only installs the" - elog "associated user space libraries." - fi -} - -pkg_postrm() { - if use kernel_linux; then - linux-mod_pkg_postrm - fi - eselect opengl set --use-old xorg-x11 -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-0.0.1-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-0.0.1-r13.ebuild deleted file mode 100644 index 823713d10e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-0.0.1-r13.ebuild +++ /dev/null @@ -1,40 +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 -CROS_WORKON_COMMIT="6db8cf26b1abd41f0465aa345fb12ddbcde404eb" -CROS_WORKON_TREE="1a5966915f51a670b1f1bd4fda10ec670b40244b" -CROS_WORKON_PROJECT="chromiumos/third_party/khronos" - -inherit cros-workon - -DESCRIPTION="OpenGL|ES headers." -HOMEPAGE="http://www.khronos.org/opengles/2_X/" -SRC_URI="" -LICENSE="SGI-B-2.0" -SLOT="0" -KEYWORDS="x86 arm" -IUSE="" - -RDEPEND="" -DEPEND="" - -CROS_WORKON_LOCALNAME="khronos" - -src_install() { - # headers - insinto /usr/include/EGL - doins "${S}/include/EGL/egl.h" - doins "${S}/include/EGL/eglplatform.h" - doins "${S}/include/EGL/eglext.h" - insinto /usr/include/KHR - doins "${S}/include/KHR/khrplatform.h" - insinto /usr/include/GLES - doins "${S}/include/GLES/gl.h" - doins "${S}/include/GLES/glext.h" - doins "${S}/include/GLES/glplatform.h" - insinto /usr/include/GLES2 - doins "${S}/include/GLES2/gl2.h" - doins "${S}/include/GLES2/gl2ext.h" - doins "${S}/include/GLES2/gl2platform.h" -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-9999.ebuild deleted file mode 100644 index 99a5beb18b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles-headers/opengles-headers-9999.ebuild +++ /dev/null @@ -1,38 +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 -CROS_WORKON_PROJECT="chromiumos/third_party/khronos" - -inherit cros-workon - -DESCRIPTION="OpenGL|ES headers." -HOMEPAGE="http://www.khronos.org/opengles/2_X/" -SRC_URI="" -LICENSE="SGI-B-2.0" -SLOT="0" -KEYWORDS="~x86 ~arm" -IUSE="" - -RDEPEND="" -DEPEND="" - -CROS_WORKON_LOCALNAME="khronos" - -src_install() { - # headers - insinto /usr/include/EGL - doins "${S}/include/EGL/egl.h" - doins "${S}/include/EGL/eglplatform.h" - doins "${S}/include/EGL/eglext.h" - insinto /usr/include/KHR - doins "${S}/include/KHR/khrplatform.h" - insinto /usr/include/GLES - doins "${S}/include/GLES/gl.h" - doins "${S}/include/GLES/glext.h" - doins "${S}/include/GLES/glplatform.h" - insinto /usr/include/GLES2 - doins "${S}/include/GLES2/gl2.h" - doins "${S}/include/GLES2/gl2ext.h" - doins "${S}/include/GLES2/gl2platform.h" -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-0.0.1-r14.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-0.0.1-r14.ebuild deleted file mode 100644 index 51fbaf71df..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-0.0.1-r14.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -CROS_WORKON_COMMIT="6db8cf26b1abd41f0465aa345fb12ddbcde404eb" -CROS_WORKON_TREE="1a5966915f51a670b1f1bd4fda10ec670b40244b" -CROS_WORKON_PROJECT="chromiumos/third_party/khronos" - -inherit toolchain-funcs cros-workon - -DESCRIPTION="OpenGL|ES mock library" -HOMEPAGE="http://www.khronos.org/opengles/2_X/" -SRC_URI="" - -LICENSE="SGI-B-2.0" -SLOT="0" -KEYWORDS="arm x86" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-drivers/opengles-headers" -DEPEND="${RDEPEND}" - -CROS_WORKON_LOCALNAME="khronos" - -src_compile() { - tc-export AR CC CXX LD NM RANLIB - scons || die -} - -src_install() { - dolib libEGL.so libGLESv2.so -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-9999.ebuild deleted file mode 100644 index e6a1b4792a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/opengles/opengles-9999.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -CROS_WORKON_PROJECT="chromiumos/third_party/khronos" - -inherit toolchain-funcs cros-workon - -DESCRIPTION="OpenGL|ES mock library" -HOMEPAGE="http://www.khronos.org/opengles/2_X/" -SRC_URI="" - -LICENSE="SGI-B-2.0" -SLOT="0" -KEYWORDS="~arm ~x86" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-drivers/opengles-headers" -DEPEND="${RDEPEND}" - -CROS_WORKON_LOCALNAME="khronos" - -src_compile() { - tc-export AR CC CXX LD NM RANLIB - scons || die -} - -src_install() { - dolib libEGL.so libGLESv2.so -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-0.0.1-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-0.0.1-r9.ebuild deleted file mode 100644 index 5920fc414b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-0.0.1-r9.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (c) 2013 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -CROS_WORKON_COMMIT="d15b481e374f58ad82812b5ec9193307a937cfbe" -CROS_WORKON_TREE="7d097ae9d618817e2c9a274a07c3ec207a631583" -CROS_WORKON_PROJECT="chromiumos/platform/touchpad-tests" - -XORG_EAUTORECONF="yes" -BASE_INDIVIDUAL_URI="" -inherit autotools-utils cros-workon - -DESCRIPTION="Chromium OS multitouch driver regression tests." -CROS_WORKON_LOCALNAME="../platform/touchpad-tests" - -KEYWORDS="arm amd64 x86" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="chromeos-base/gestures - chromeos-base/libevdev - app-misc/utouch-evemu - x11-proto/inputproto" - -DEPEND=${RDEPEND} - -DOCS="" - -src_prepare() { - cros-workon_src_prepare -} - -src_configure() { - cros-workon_src_configure -} - -src_compile() { - emake all -} - -src_install() { - # install to autotest deps directory for dependency - emake DESTDIR="${D}/usr/local/autotest/client/deps/touchpad-tests" install -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-9999.ebuild deleted file mode 100644 index 34583147b9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/touchpad-tests/touchpad-tests-9999.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright (c) 2013 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/touchpad-tests" - -XORG_EAUTORECONF="yes" -BASE_INDIVIDUAL_URI="" -inherit autotools-utils cros-workon - -DESCRIPTION="Chromium OS multitouch driver regression tests." -CROS_WORKON_LOCALNAME="../platform/touchpad-tests" - -KEYWORDS="~arm amd64 ~x86" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="chromeos-base/gestures - chromeos-base/libevdev - app-misc/utouch-evemu - x11-proto/inputproto" - -DEPEND=${RDEPEND} - -DOCS="" - -src_prepare() { - cros-workon_src_prepare -} - -src_configure() { - cros-workon_src_configure -} - -src_compile() { - emake all -} - -src_install() { - # install to autotest deps directory for dependency - emake DESTDIR="${D}/usr/local/autotest/client/deps/touchpad-tests" install -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-0.0.1-r101.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-0.0.1-r101.ebuild deleted file mode 100644 index 94286cb0bf..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-0.0.1-r101.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -CROS_WORKON_COMMIT="43e047f66e76514f6ff153724482440bc45a09d2" -CROS_WORKON_TREE="3b26ecfe0fc8246a9771a6b1539572d0d70e3ad1" -CROS_WORKON_PROJECT="chromiumos/platform/xf86-input-cmt" - -XORG_EAUTORECONF="yes" -BASE_INDIVIDUAL_URI="" -inherit autotools-utils cros-workon - -DESCRIPTION="Chromium OS multitouch input driver for Xorg X server." -CROS_WORKON_LOCALNAME="../platform/xf86-input-cmt" - -KEYWORDS="arm amd64 x86" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="chromeos-base/gestures - chromeos-base/libevdev - x11-base/xorg-server" -DEPEND="${RDEPEND} - x11-proto/inputproto" - -DOCS="README" - -src_prepare() { - eautoreconf -} - -src_install() { - autotools-utils_src_install - remove_libtool_files all -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-9999.ebuild deleted file mode 100644 index 08a7f1a165..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-cmt/xf86-input-cmt-9999.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (c) 2012 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/xf86-input-cmt" - -XORG_EAUTORECONF="yes" -BASE_INDIVIDUAL_URI="" -inherit autotools-utils cros-workon - -DESCRIPTION="Chromium OS multitouch input driver for Xorg X server." -CROS_WORKON_LOCALNAME="../platform/xf86-input-cmt" - -KEYWORDS="~arm ~amd64 ~x86" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="chromeos-base/gestures - chromeos-base/libevdev - x11-base/xorg-server" -DEPEND="${RDEPEND} - x11-proto/inputproto" - -DOCS="README" - -src_prepare() { - eautoreconf -} - -src_install() { - autotools-utils_src_install - remove_libtool_files all -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/Manifest deleted file mode 100644 index 1ad2d203e1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xf86-input-evdev-2.7.3.tar.bz2 364819 SHA256 eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504 SHA512 edd5691bc6878bb491d7ffb04b35ab60cd70853ae702883c672c53c9f6cb8e81817f94cc03feaaca4e4a02a2a436f1417bd1e1e5f52a151a416fd04306159879 WHIRLPOOL 750605a0efabcb078e65d08b7ea610fdfc4cab49b73a2676247f95f50fcf7d17e80ab2186ef103830865a564dc695f035739f1b88e28f68c981fc703e26610a6 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.6.99-wheel-accel.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.6.99-wheel-accel.patch deleted file mode 100644 index 5c1bb2a846..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.6.99-wheel-accel.patch +++ /dev/null @@ -1,374 +0,0 @@ -From: Ang Pan -Date: Thu, 15 Nov 2012 15:38:44 +0800 -Subject: [PATCH] Accelerate wheel scrolling - ---- - include/evdev-properties.h | 4 + - src/evdev.c | 198 +++++++++++++++++++++++++++++++++++++++---- - src/evdev.h | 13 +++ - 3 files changed, 196 insertions(+), 19 deletions(-) - -diff --git a/include/evdev-properties.h b/include/evdev-properties.h ---- a/include/evdev-properties.h -+++ b/include/evdev-properties.h -@@ -87,4 +87,8 @@ - */ - #define EVDEV_PROP_FUNCTION_KEYS "Evdev Function Keys" - -+/* Mouse scroll wheel axes acceleration. */ -+/* BOOL */ -+#define EVDEV_PROP_WHEEL_ACCEL_AXES "Evdev Wheel Axes Acceleration" -+ - #endif -diff --git a/src/evdev.c b/src/evdev.c ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -99,6 +99,9 @@ - #define ABS_MT_TRACKING_ID 0x39 - #endif - -+#define AXIS_LABEL_PROP_ABS_DBL_START_TIME "Abs Dbl Start Timestamp" -+#define AXIS_LABEL_PROP_ABS_DBL_END_TIME "Abs Dbl End Timestamp" -+ - static const char *evdevDefaults[] = { - "XkbRules", "evdev", - "XkbModel", "evdev", -@@ -156,12 +159,17 @@ static Atom prop_axis_label; - static Atom prop_btn_label; - static Atom prop_device; - static Atom prop_virtual; -+static Atom prop_wheel_accel_axes; - - /* All devices the evdev driver has allocated and knows about. - * MAXDEVICES is safe as null-terminated array, as two devices (VCP and VCK) - * cannot be used by evdev, leaving us with a space of 2 at the end. */ - static EvdevPtr evdev_devices[MAXDEVICES] = {NULL}; - -+static double TimevalToDouble(const struct timeval* tv) { -+ return (double)(tv->tv_sec) + (double)(tv->tv_usec) / 1000000.0; -+} -+ - static int EvdevSwitchMode(ClientPtr client, DeviceIntPtr device, int mode) - { - InputInfoPtr pInfo; -@@ -702,6 +710,103 @@ EvdevProcessButtonEvent(InputInfoPtr pInfo, struct input_event *ev) - EvdevQueueKbdEvent(pInfo, ev, value); - } - -+#ifndef HAVE_SMOOTH_SCROLLING -+/** -+ * Normal CDF seems like a good curve to simulate scroll wheel acceleration -+ * curve. Use following methods to generate the coefficients of a degree-4 -+ * polynomial regression for a specific normal cdf in matlab. -+ * -+ * Note: x for click_speed, y for scroll pixels. -+ * In reality, x ranges from 1 to 120+ for an Apple Mighty Mouse, use range -+ * greater than that to minimize approximation error at the end points. -+ * In our case, the range is [-50, 200]. -+ * -+ * matlab code to generate accel_params below: -+ * x=[-50:200]; -+ * y=600*normcdf(x,77,40); -+ * a=polyfit(x,y,4); -+ */ -+static const double accel_params[] = { -+ -9.528484576366295e-08, -+ -1.515738095456648e-04, -+ 3.940238948978762e-02, -+ 1.732410732791920, -+ 4.412651786252371, -+}; -+ -+/* when x is 155, the polinomial curve gives 600, the max pixels to scroll */ -+static const double max_allowed_click_speed = 155; -+ -+/** -+ * Get the number of pixels to scroll, used for axes_scroll. -+ */ -+static double -+EvdevGetPixelsToScroll(double click_speed) -+{ -+ double pixels = 0; -+ double term = 1; -+ double allowed_click_speed = fabs(click_speed); -+ if (allowed_click_speed > max_allowed_click_speed) -+ allowed_click_speed = max_allowed_click_speed; -+ int i; -+ for (i = 1; i <= ArrayLength(accel_params); i++) -+ { -+ pixels += term * accel_params[ArrayLength(accel_params) - i]; -+ term *= allowed_click_speed; -+ } -+ if (click_speed < 0) -+ pixels *= -1; -+ return pixels; -+} -+ -+/** -+ * Mouse scroll acceleration. -+ */ -+static void -+EvdevAccelWheel(InputInfoPtr pInfo, struct input_event *ev) -+{ -+ double pixels; -+ double dt; /* seconds */ -+ double click_speed; /* clicks / second */ -+ EvdevPtr pEvdev = pInfo->private; -+ double start_time; -+ double end_time = TimevalToDouble(&ev->time); -+ int map; -+ EvdevRelWheelPtr wheel = (ev->code == REL_WHEEL) ? &pEvdev->wheel : -+ &pEvdev->hwheel; -+ -+ /* Check if this scroll is in same direction as previous scroll event */ -+ if ((wheel->value < 0 && ev->value < 0) || -+ (wheel->value > 0 && ev->value > 0)) { -+ start_time = wheel->time; -+ } else { -+ start_time = end_time; -+ } -+ -+ /* If start_time == end_time, compute click_speed using dt = 1 second */ -+ dt = (end_time - start_time) ?: 1.0; -+ click_speed = ev->value / dt; -+ -+ wheel->value = ev->value; -+ wheel->time = end_time; -+ -+ pixels = EvdevGetPixelsToScroll(click_speed); -+ /* For historical reasons the vertical wheel (REL_WHEEL) is inverted */ -+ pixels *= (ev->code == REL_WHEEL) ? -1 : 1; -+ -+ valuator_mask_zero(pEvdev->vals); -+ map = pEvdev->axis_map[ev->code]; -+ valuator_mask_set_double(pEvdev->vals, map, pixels); -+ if (pEvdev->start_time_valuator_index >= 0) -+ valuator_mask_set_double(pEvdev->vals, -+ pEvdev->start_time_valuator_index, start_time); -+ if (pEvdev->end_time_valuator_index >= 0) -+ valuator_mask_set_double(pEvdev->vals, -+ pEvdev->end_time_valuator_index, end_time); -+ xf86PostMotionEventM(pInfo->dev, TRUE, pEvdev->vals); -+} -+#endif -+ - /** - * Take the relative motion input event and process it accordingly. - */ -@@ -712,6 +817,14 @@ EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, struct input_event *ev) - EvdevPtr pEvdev = pInfo->private; - int map; - -+#ifndef HAVE_SMOOTH_SCROLLING -+ if (pEvdev->scroll_axes && (ev->code == REL_WHEEL || -+ ev->code == REL_HWHEEL)) { -+ EvdevAccelWheel(pInfo, ev); -+ return; -+ } -+#endif -+ - /* Get the signed value, earlier kernels had this as unsigned */ - value = ev->value; - -@@ -1894,12 +2007,6 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) - goto out; - - #ifndef HAVE_SMOOTH_SCROLLING -- /* Wheels are special, we post them as button events. So let's ignore them -- * in the axes list too */ -- if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_WHEEL)) -- num_axes--; -- if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_HWHEEL)) -- num_axes--; - if (EvdevBitIsSet(pEvdev->rel_bitmask, REL_DIAL)) - num_axes--; - -@@ -1907,17 +2014,20 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) - goto out; - #endif - -- if (num_axes > MAX_VALUATORS) { -- xf86IDrvMsg(pInfo, X_WARNING, "found %d axes, limiting to %d.\n", num_axes, MAX_VALUATORS); -- num_axes = MAX_VALUATORS; -+ /* -2 to leave room for start and end timestamps */ -+ if (num_axes > MAX_VALUATORS - 2) { -+ xf86IDrvMsg(pInfo, X_WARNING, "found %d axes, limiting to %d.\n", num_axes, MAX_VALUATORS - 2); -+ num_axes = MAX_VALUATORS - 2; - } - -- pEvdev->num_vals = num_axes; -- if (num_axes > 0) { -- pEvdev->vals = valuator_mask_new(num_axes); -- if (!pEvdev->vals) -- goto out; -- } -+ pEvdev->start_time_valuator_index = num_axes; -+ pEvdev->end_time_valuator_index = num_axes + 1; -+ -+ /* +2 for timestamp valuators */ -+ pEvdev->num_vals = num_axes + 2; -+ pEvdev->vals = valuator_mask_new(pEvdev->num_vals); -+ if (!pEvdev->vals) -+ goto out; - atoms = malloc(pEvdev->num_vals * sizeof(Atom)); - - for (axis = REL_X; i < MAX_VALUATORS && axis <= REL_MAX; axis++) -@@ -1925,7 +2035,7 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) - pEvdev->axis_map[axis] = -1; - #ifndef HAVE_SMOOTH_SCROLLING - /* We don't post wheel events, so ignore them here too */ -- if (axis == REL_WHEEL || axis == REL_HWHEEL || axis == REL_DIAL) -+ if (axis == REL_DIAL) - continue; - #endif - if (!EvdevBitIsSet(pEvdev->rel_bitmask, axis)) -@@ -1934,9 +2044,20 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) - i++; - } - -- EvdevInitAxesLabels(pEvdev, Relative, pEvdev->num_vals, atoms); -+ /* Initialize all axis label atoms except Start & End Timestamps */ -+ EvdevInitAxesLabels(pEvdev, Relative, num_axes, atoms); -+ -+ /* Create atoms for Start & End Timestamps */ -+ atoms[pEvdev->start_time_valuator_index] = -+ MakeAtom(AXIS_LABEL_PROP_ABS_DBL_START_TIME, -+ strlen(AXIS_LABEL_PROP_ABS_DBL_START_TIME), -+ TRUE); -+ atoms[pEvdev->end_time_valuator_index] = -+ MakeAtom(AXIS_LABEL_PROP_ABS_DBL_END_TIME, -+ strlen(AXIS_LABEL_PROP_ABS_DBL_END_TIME), -+ TRUE); - -- if (!InitValuatorClassDeviceStruct(device, num_axes, atoms, -+ if (!InitValuatorClassDeviceStruct(device, pEvdev->num_vals, atoms, - GetMotionHistorySize(), Relative)) { - xf86IDrvMsg(pInfo, X_ERROR, "failed to initialize valuator class device.\n"); - goto out; -@@ -1951,11 +2072,18 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) - for (axis = REL_X; axis <= REL_MAX; axis++) - { - int axnum = pEvdev->axis_map[axis]; -+ int mode = Relative; - - if (axnum == -1) - continue; -+ -+#ifndef HAVE_SMOOTH_SCROLLING -+ if (axis == REL_WHEEL || axis == REL_HWHEEL) -+ mode = Absolute; -+#endif -+ - xf86InitValuatorAxisStruct(device, axnum, atoms[axnum], -1, -1, 1, 0, 1, -- Relative); -+ mode); - xf86InitValuatorDefaults(device, axnum); - #ifdef HAVE_SMOOTH_SCROLLING - if (axis == REL_WHEEL) -@@ -1967,6 +2095,17 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) - #endif - } - -+#ifndef HAVE_SMOOTH_SCROLLING -+ /* Initialize valuators for scroll wheel Start & End Timestamps */ -+ xf86InitValuatorAxisStruct(device, pEvdev->start_time_valuator_index, -+ atoms[pEvdev->start_time_valuator_index], -+ 0, INT_MAX, 1, 0, 1, Absolute); -+ -+ xf86InitValuatorAxisStruct(device, pEvdev->end_time_valuator_index, -+ atoms[pEvdev->end_time_valuator_index], -+ 0, INT_MAX, 1, 0, 1, Absolute); -+#endif -+ - free(atoms); - - return Success; -@@ -2128,6 +2267,9 @@ EvdevInit(DeviceIntPtr device) - for(i = 0; i < max(ABS_CNT,REL_CNT); i++) - pEvdev->axis_map[i]=-1; - -+ pEvdev->start_time_valuator_index = -1; -+ pEvdev->end_time_valuator_index = -1; -+ - if (pEvdev->flags & EVDEV_KEYBOARD_EVENTS) - EvdevAddKeyClass(device); - if (pEvdev->flags & EVDEV_BUTTON_EVENTS) -@@ -3218,6 +3360,7 @@ EvdevInitProperty(DeviceIntPtr dev) - if (pEvdev->flags & (EVDEV_RELATIVE_EVENTS | EVDEV_ABSOLUTE_EVENTS)) - { - BOOL invert[2]; -+ int axis_accel_conf_val; - invert[0] = pEvdev->invert_x; - invert[1] = pEvdev->invert_y; - -@@ -3264,6 +3407,16 @@ EvdevInitProperty(DeviceIntPtr dev) - - XISetDevicePropertyDeletable(dev, prop_swap, FALSE); - -+ prop_wheel_accel_axes = MakeAtom(EVDEV_PROP_WHEEL_ACCEL_AXES, -+ strlen(EVDEV_PROP_WHEEL_ACCEL_AXES), TRUE); -+ axis_accel_conf_val = xf86SetBoolOption(pInfo->options, EVDEV_PROP_WHEEL_ACCEL_AXES, 0); -+ pEvdev->scroll_axes = axis_accel_conf_val != 0; -+ rc = XIChangeDeviceProperty(dev, prop_wheel_accel_axes, XA_INTEGER, 8, -+ PropModeReplace, 1, &pEvdev->scroll_axes, FALSE); -+ if (rc != Success) -+ return; -+ -+ XISetDevicePropertyDeletable(dev, prop_wheel_accel_axes, FALSE); - /* Axis labelling */ - if ((pEvdev->num_vals > 0) && (prop_axis_label = XIGetKnownProperty(AXIS_LABEL_PROP))) - { -@@ -3333,6 +3486,13 @@ EvdevSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val, - - if (!checkonly) - pEvdev->swap_axes = *((BOOL*)val->data); -+ } else if (atom == prop_wheel_accel_axes) -+ { -+ if (val->format != 8 || val->type != XA_INTEGER || val->size != 1) -+ return BadMatch; -+ -+ if (!checkonly) -+ pEvdev->scroll_axes = *((BOOL*)val->data); - } else if (atom == prop_axis_label || atom == prop_btn_label || - atom == prop_product_id || atom == prop_device || - atom == prop_virtual) -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -155,6 +155,12 @@ typedef struct { - #endif - } EventQueueRec, *EventQueuePtr; - -+/* Mouse scroll wheel state for one axis (REL_WHEEL or REL_WHEEL) */ -+typedef struct { -+ int value; /* last scroll wheel value */ -+ double time; /* evdev timestamp of last scroll event */ -+} EvdevRelWheelRec, *EvdevRelWheelPtr; -+ - typedef struct { - unsigned short id_vendor; - unsigned short id_product; -@@ -252,6 +258,9 @@ typedef struct { - unsigned long led_bitmask[NLONGS(LED_CNT)]; - struct input_absinfo absinfo[ABS_CNT]; - -+ int start_time_valuator_index; -+ int end_time_valuator_index; -+ - /* minor/major number */ - dev_t min_maj; - -@@ -266,6 +275,10 @@ typedef struct { - struct timeval before_sync_time; - struct timeval after_sync_time; - int32_t cached_tid[MAX_SLOT_COUNT]; -+ -+ BOOL scroll_axes; -+ EvdevRelWheelRec wheel; /* scroll state for REL_WHEEL */ -+ EvdevRelWheelRec hwheel; /* scroll state for REL_HWHEEL */ - } EvdevRec, *EvdevPtr; - - typedef struct { --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch deleted file mode 100644 index 083a6fecef..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch +++ /dev/null @@ -1,89 +0,0 @@ -From: Yufeng Shen -Date: Mon, 20 Aug 2012 14:55:57 -0400 -Subject: [PATCH] x11-drivers/xf86-input-evdev: Use monotonic timestamps for - input events - -This patch adds the support for xf86-input-evdev to turn on monotonic -timestamps if kernel supports it. - -The clock source is set in EvdevOn() instead of EvdevCache() because the -latter is only called once when X registers the input device fd with kernel, -and if later X closes and reopens the input device fd (e.g. when the -system goes through suspend/resume cycle), the clock source setting -will be lost. EvdevOn() is the right place to set clock source since -it is called whenever X wants to open the input device and use it. - -BUG=chrome-os-partner:12187 -TEST=On Link, grep "time stamps" /var/log/Xorg.0.log - Make sure monotonic timestamp is used for evdev - Run "xinput test-xi2" and move fingers on touch device - Note that valuator 4 (Touch Timestamp) is using - monotonic timestamp. - Suspend and resume the device and make sure the timestamp - does not change back to real world timestamp. ---- - src/evdev.c | 16 ++++++++++++++++ - src/evdev.h | 1 + - 2 files changed, 17 insertions(+), 0 deletions(-) - -diff --git a/src/evdev.c b/src/evdev.c ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -61,6 +62,11 @@ - #define XI_PROP_VIRTUAL_DEVICE "Virtual Device" - #endif - -+/* Set clockid to be used for timestamps */ -+#ifndef EVIOCSCLOCKID -+#define EVIOCSCLOCKID _IOW('E', 0xa0, int) -+#endif -+ - /* removed from server, purge when dropping support for server 1.10 */ - #define XI86_SEND_DRAG_EVENTS 0x08 - -@@ -1809,6 +1815,12 @@ EvdevInit(DeviceIntPtr device) - return Success; - } - -+static int -+EvdevEnableMonotonic(InputInfoPtr pInfo) { -+ unsigned int clk = CLOCK_MONOTONIC; -+ return (ioctl(pInfo->fd, EVIOCSCLOCKID, &clk) == 0) ? Success : !Success; -+} -+ - /** - * Init all extras (wheel emulation, etc.) and grab the device. - */ -@@ -1826,6 +1838,10 @@ EvdevOn(DeviceIntPtr device) - if (rc != Success) - return rc; - -+ pEvdev->is_monotonic = (EvdevEnableMonotonic(pInfo) == Success); -+ xf86IDrvMsg(pInfo, X_PROBED, "Using %s input event time stamps\n", -+ pEvdev->is_monotonic ? "monotonic" : "realtime"); -+ - EvdevGrabDevice(pInfo, 1, 0); - - xf86FlushInput(pInfo->fd); -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -173,6 +173,7 @@ typedef struct { - BOOL swap_axes; - BOOL invert_x; - BOOL invert_y; -+ BOOL is_monotonic; - - int delta[REL_CNT]; - unsigned int abs_queued, rel_queued, prox_queued; --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-block-reading-support.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-block-reading-support.patch deleted file mode 100644 index 36100440c8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-block-reading-support.patch +++ /dev/null @@ -1,120 +0,0 @@ -From: Chung-yih Wang -Date: Thu, 6 Dec 2012 17:43:04 +0800 -Subject: [PATCH] Add block reading support - - This patch adds a new xinput property "Block Event Reading" that blocks - event reading by skipping read() calls in ReadInput() in order to - generate the SYN_DROPPED event for testing the SYN_DROPPED handling. ---- - src/debug.c | 37 +++++++++++++++++++++++++++++++++++++ - src/evdev.c | 6 +++++- - src/evdev.h | 6 ++++++ - 3 files changed, 48 insertions(+), 1 deletions(-) - -diff --git a/src/debug.c b/src/debug.c ---- a/src/debug.c -+++ b/src/debug.c -@@ -19,10 +19,12 @@ - #include - #include - -+#define XI_PROP_BLOCK_READ_INPUT "Block Event Reading" - #define XI_PROP_DUMP_DEBUG_LOG "Dump Debug Log" - - #define INPUT_EVENTS_LOG_FILE "/var/log/evdev_input_events.dat" - -+static Atom block_read_prop; - static Atom dump_debug_log_prop; - - static void -@@ -112,3 +114,38 @@ EvdevDebugInitProperty(DeviceIntPtr dev) - XIRegisterPropertyHandler(dev, EvdevDebugSetProperty, - EvdevDebugGetProperty, NULL); - } -+ -+static int -+EvdevBlockSetProperty(DeviceIntPtr dev, Atom atom, -+ XIPropertyValuePtr val, BOOL checkonly) -+{ -+ InputInfoPtr pInfo = dev->public.devicePrivate; -+ EvdevPtr pEvdev = pInfo->private; -+ -+ if (atom == block_read_prop) { -+ if (val->type != XA_INTEGER || val->format != 8 || val->size != 1) -+ return BadMatch; -+ -+ if (!checkonly) -+ pEvdev->block_input = *(BOOL *)val->data; -+ } -+ return Success; -+} -+ -+void -+EvdevBlockInitProperty(DeviceIntPtr dev) -+{ -+ InputInfoPtr pInfo = dev->public.devicePrivate; -+ EvdevPtr pEvdev = pInfo->private; -+ -+ block_read_prop = MakeAtom(XI_PROP_BLOCK_READ_INPUT, -+ strlen(XI_PROP_BLOCK_READ_INPUT), TRUE); -+ -+ pEvdev->block_input = FALSE; -+ -+ XIChangeDeviceProperty(dev, block_read_prop, XA_INTEGER, -+ /* format */ 8, PropModeReplace, /* size */ 1, -+ &pEvdev->block_input, FALSE); -+ XISetDevicePropertyDeletable(dev, block_read_prop, FALSE); -+ XIRegisterPropertyHandler(dev, EvdevBlockSetProperty, NULL, NULL); -+} -diff --git a/src/evdev.c b/src/evdev.c ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -1569,11 +1569,14 @@ EvdevReadInput(InputInfoPtr pInfo) - struct input_event ev[NUM_EVENTS]; - int i, len = sizeof(ev); - BOOL sync_evdev_state = FALSE; -+ EvdevPtr pEvdev = pInfo->private; -+ -+ if (pEvdev->block_input) -+ return; - - while (len == sizeof(ev)) - { - #ifdef MULTITOUCH -- EvdevPtr pEvdev = pInfo->private; - - if (pEvdev->mtdev) - len = mtdev_get(pEvdev->mtdev, pInfo->fd, ev, NUM_EVENTS) * -@@ -2361,6 +2364,7 @@ EvdevInit(DeviceIntPtr device) - EvdevDragLockInitProperty(device); - EvdevAppleInitProperty(device); - EvdevDebugInitProperty(device); -+ EvdevBlockInitProperty(device); - - return Success; - } -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -291,6 +291,8 @@ typedef struct { - BOOL scroll_axes; - EvdevRelWheelRec wheel; /* scroll state for REL_WHEEL */ - EvdevRelWheelRec hwheel; /* scroll state for REL_HWHEEL */ -+ -+ BOOL block_input; /* block read for SYN_DROPPED test */ - } EvdevRec, *EvdevPtr; - - typedef struct { -@@ -352,5 +354,9 @@ void Evdev3BEmuInitProperty(DeviceIntPtr); - void EvdevWheelEmuInitProperty(DeviceIntPtr); - void EvdevDragLockInitProperty(DeviceIntPtr); - void EvdevAppleInitProperty(DeviceIntPtr); -+ -+/* For debugging and testing */ - void EvdevDebugInitProperty(DeviceIntPtr); -+void EvdevBlockInitProperty(DeviceIntPtr); -+ - #endif --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-touch-event-timestamp.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-touch-event-timestamp.patch deleted file mode 100644 index cb652196c0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-add-touch-event-timestamp.patch +++ /dev/null @@ -1,200 +0,0 @@ -From: Yufeng Shen -Date: Wed, 7 Mar 2012 20:39:09 +1000 -Subject: [PATCH] x11-drivers/xf86-input-evdev: Add kernel timestamp to touch - events - -This CL passes kernel timestamp for touch events to X (hence Chrome) -as a valuator named "Touch Timestamp". The timestamp for all the X -touch events generated within one evdev sync report is set to be the -same as the last EV_SYN event's timestamp. - -BUG=chrome-os-partner:12187 -TEST=Run "xinput list 12" on Link and see something like - Class originated from: 12. Type: XIValuatorClass - Detail for Valuator 4: - Label: Touch Timestamp - Range: 0.000000 - 2147483647.000000 - Resolution: 1 units/m - Mode: absolute - Current value: 0.000000 -TEST=Run "xinput test-xi2" on Link and check that for each - touch event there is timestamp at the correct valuator: - EVENT type 6 (Motion) - device: 12 (12) - detail: 0 - flags: emulated - ... - valuators: - 0: 135.95 - 1: 116.93 - 2: 18.00 - 3: 100.00 - 4: 1348803480.46 <- Touch Timestamp - EVENT type 18 (TouchBegin) - device: 12 (12) - detail: 1 - valuators: - 0: 135.95 - 1: 116.93 - 2: 18.00 - 3: 100.00 - 4: 1348803480.46 <- Touch Timestamp -TEST=Run "xinput test-xi2" on Link and check that for non-touch events - (ie USB mouse) there is no Touch Timestamp: - EVENT type 6 (Motion) - device: 2 (13) - ... - valuators: - 0: 1.19 ---- - src/evdev.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- - src/evdev.h | 4 ++++ - 2 files changed, 46 insertions(+), 5 deletions(-) - -diff --git a/src/evdev.c b/src/evdev.c ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -102,6 +102,8 @@ - #define AXIS_LABEL_PROP_ABS_DBL_START_TIME "Abs Dbl Start Timestamp" - #define AXIS_LABEL_PROP_ABS_DBL_END_TIME "Abs Dbl End Timestamp" - -+#define AXIS_LABEL_PROP_TOUCH_TIME "Touch Timestamp" -+ - static const char *evdevDefaults[] = { - "XkbRules", "evdev", - "XkbModel", "evdev", -@@ -1097,7 +1099,7 @@ EvdevPostProximityEvents(InputInfoPtr pInfo, int which, int num_v, int first_v, - * Post the queued key/button events. - */ - static void EvdevPostQueuedEvents(InputInfoPtr pInfo, int num_v, int first_v, -- int v[MAX_VALUATORS]) -+ int v[MAX_VALUATORS], struct input_event *ev) - { - int i; - EvdevPtr pEvdev = pInfo->private; -@@ -1127,6 +1129,10 @@ static void EvdevPostQueuedEvents(InputInfoPtr pInfo, int num_v, int first_v, - break; - #ifdef MULTITOUCH - case EV_QUEUE_TOUCH: -+ if (pEvdev->touch_time_valuator_index >= 0) -+ valuator_mask_set_double(pEvdev->queue[i].touchMask, -+ pEvdev->touch_time_valuator_index, -+ TimevalToDouble(&ev->time)); - xf86PostTouchEvent(pInfo->dev, pEvdev->queue[i].detail.touch, - pEvdev->queue[i].val, 0, - pEvdev->queue[i].touchMask); -@@ -1161,7 +1167,7 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev) - EvdevPostProximityEvents(pInfo, TRUE, num_v, first_v, v); - EvdevPostRelativeMotionEvents(pInfo, num_v, first_v, v); - EvdevPostAbsoluteMotionEvents(pInfo, num_v, first_v, v); -- EvdevPostQueuedEvents(pInfo, num_v, first_v, v); -+ EvdevPostQueuedEvents(pInfo, num_v, first_v, v, ev); - EvdevPostProximityEvents(pInfo, FALSE, num_v, first_v, v); - - memset(pEvdev->delta, 0, sizeof(pEvdev->delta)); -@@ -1723,6 +1729,8 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) - int num_mt_axes = 0, /* number of MT-only axes */ - num_mt_axes_total = 0; /* total number of MT axes, including - double-counted ones, excluding blacklisted */ -+ int num_ts_vals = 0; /* number of Timestamp valuators */ -+ int num_valuators; - Atom *atoms; - - pInfo = device->public.devicePrivate; -@@ -1785,6 +1793,9 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) - } - #ifdef MULTITOUCH - if (num_mt_axes_total > 0) { -+ /* A Touch Timestamp is only appended to Touch events */ -+ num_ts_vals = 1; -+ - pEvdev->num_mt_vals = num_mt_axes_total; - pEvdev->mt_mask = valuator_mask_new(num_mt_axes_total); - if (!pEvdev->mt_mask) { -@@ -1813,8 +1824,9 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) - } - - for (i = 0; i < EVDEV_MAXQUEUE; i++) { -+ /* Touch Timestamp is appended directly to the touchMask */ - pEvdev->queue[i].touchMask = -- valuator_mask_new(num_mt_axes_total); -+ valuator_mask_new(num_mt_axes_total + 1); - if (!pEvdev->queue[i].touchMask) { - xf86Msg(X_ERROR, "%s: failed to allocate MT valuator masks for " - "evdev event queue.\n", device->name); -@@ -1823,7 +1835,10 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) - } - } - #endif -- atoms = malloc((pEvdev->num_vals + num_mt_axes) * sizeof(Atom)); -+ -+ num_valuators = num_axes + num_mt_axes + num_ts_vals; -+ -+ atoms = malloc(num_valuators * sizeof(Atom)); - - i = 0; - for (axis = ABS_X; i < MAX_VALUATORS && axis <= ABS_MAX; axis++) { -@@ -1853,9 +1868,22 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) - i++; - } - -+ /* Note: touch timestamp, if present, is initialized separately */ - EvdevInitAxesLabels(pEvdev, Absolute, pEvdev->num_vals + num_mt_axes, atoms); - -- if (!InitValuatorClassDeviceStruct(device, num_axes + num_mt_axes, atoms, -+#ifdef MULTITOUCH -+ if (num_ts_vals > 0) { -+ /* Manually setup the atom for Touch Timestamp since it did not happen -+ * in EvdevInitAxesLabels(). It will always be the last valuator. */ -+ pEvdev->touch_time_valuator_index = num_valuators - 1; -+ atoms[pEvdev->touch_time_valuator_index] = -+ MakeAtom(AXIS_LABEL_PROP_TOUCH_TIME, -+ strlen(AXIS_LABEL_PROP_TOUCH_TIME), -+ TRUE); -+ } -+#endif -+ -+ if (!InitValuatorClassDeviceStruct(device, num_valuators, atoms, - GetMotionHistorySize(), Absolute)) { - xf86IDrvMsg(pInfo, X_ERROR, "failed to initialize valuator class device.\n"); - goto out; -@@ -1945,6 +1973,14 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) - resolution, 0, resolution, - Absolute); - } -+ -+ /* Manually configure touch_time axis */ -+ if (num_ts_vals > 0) { -+ xf86InitValuatorAxisStruct(device, pEvdev->touch_time_valuator_index, -+ atoms[pEvdev->touch_time_valuator_index], -+ 0, INT_MAX, 1, 0, 1, Absolute); -+ } -+ - #endif - - free(atoms); -@@ -2279,6 +2315,7 @@ EvdevInit(DeviceIntPtr device) - - pEvdev->start_time_valuator_index = -1; - pEvdev->end_time_valuator_index = -1; -+ pEvdev->touch_time_valuator_index = -1; - - if (pEvdev->flags & EVDEV_KEYBOARD_EVENTS) - EvdevAddKeyClass(device); -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -260,6 +260,10 @@ typedef struct { - unsigned long led_bitmask[NLONGS(LED_CNT)]; - struct input_absinfo absinfo[ABS_CNT]; - -+ /* touch_time_valuator_index is the index for the "Touch Timestamp" -+ * property in the device valuator array. We will set it to be the -+ * last valuator in EvdevAddAbsValuatorClass(); */ -+ int touch_time_valuator_index; - int start_time_valuator_index; - int end_time_valuator_index; - --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-feedback-log.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-feedback-log.patch deleted file mode 100644 index 0160cba5ff..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-feedback-log.patch +++ /dev/null @@ -1,222 +0,0 @@ -From: Michael Spang -Date: Mon, 13 Aug 2012 11:35:32 -0400 -Subject: [PATCH] Add events debug log support - -This adds a new xinput property "Dump Debug Logs" that dumps the last -64k input events to /var/log/evdev_input_events.dat. ---- - src/Makefile.am | 3 +- - src/debug.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/evdev.c | 13 ++++++- - src/evdev.h | 11 +++++ - 4 files changed, 139 insertions(+), 2 deletions(-) - create mode 100644 src/debug.c - -diff --git a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -39,5 +39,6 @@ AM_CPPFLAGS =-I$(top_srcdir)/include - emuThird.c \ - emuWheel.c \ - draglock.c \ -- apple.c -+ apple.c \ -+ debug.c - -diff --git a/src/debug.c b/src/debug.c -new file mode 100644 ---- /dev/null -+++ b/src/debug.c -@@ -0,0 +1,114 @@ -+// Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+#define XI_PROP_DUMP_DEBUG_LOG "Dump Debug Log" -+ -+#define INPUT_EVENTS_LOG_FILE "/var/log/evdev_input_events.dat" -+ -+static Atom dump_debug_log_prop; -+ -+static void -+EvdevDumpLog(InputInfoPtr pInfo) { -+ EvdevPtr pEvdev = pInfo->private; -+ int i; -+ -+ FILE *fp = fopen(INPUT_EVENTS_LOG_FILE, "w"); -+ if (!fp) { -+ xf86IDrvMsg(pInfo, X_ERROR, "fopen: %s: %s\n", -+ INPUT_EVENTS_LOG_FILE, strerror(errno)); -+ return; -+ } -+ -+ fprintf(fp, "# device: %s\n", pInfo->name); -+ -+ for (i = ABS_X; i <= ABS_MAX; i++) { -+ if (EvdevBitIsSet(pEvdev->abs_bitmask, i)) { -+ fprintf(fp, "# absinfo: %d %d %d %d %d %d\n", -+ /* event code (axis) */ i, -+ pEvdev->absinfo[i].minimum, -+ pEvdev->absinfo[i].maximum, -+ pEvdev->absinfo[i].fuzz, -+ pEvdev->absinfo[i].flat, -+ pEvdev->absinfo[i].resolution); -+ } -+ } -+ -+ for (i = 0; i < DEBUG_BUF_SIZE; ++i) { -+ struct debug_event *de = -+ &pEvdev->debug_buf[(pEvdev->debug_buf_tail + i) % DEBUG_BUF_SIZE]; -+ if (de->ev.time.tv_sec == 0 && de->ev.time.tv_usec == 0) -+ continue; -+ fprintf(fp, "E: %ld.%06ld %04x %04x %d %d\n", -+ de->ev.time.tv_sec, -+ de->ev.time.tv_usec, -+ de->ev.type, -+ de->ev.code, -+ de->ev.value, -+ de->slot); -+ } -+ -+ fclose(fp); -+} -+ -+static int -+EvdevDebugGetProperty(DeviceIntPtr dev, Atom property) -+{ -+ return Success; -+} -+ -+static int -+EvdevDebugSetProperty(DeviceIntPtr dev, Atom atom, -+ XIPropertyValuePtr val, BOOL checkonly) -+{ -+ InputInfoPtr pInfo = dev->public.devicePrivate; -+ CARD32 data; -+ -+ if (atom == dump_debug_log_prop) { -+ if (val->type != XA_INTEGER || val->format != 32 || val->size != 1) -+ return BadMatch; -+ -+ data = *(CARD32 *)val->data; -+ -+ if (data != 1) -+ return BadValue; -+ -+ if (!checkonly) -+ EvdevDumpLog(pInfo); -+ } -+ -+ return Success; -+} -+ -+void -+EvdevDebugInitProperty(DeviceIntPtr dev) -+{ -+ -+ dump_debug_log_prop = MakeAtom(XI_PROP_DUMP_DEBUG_LOG, -+ strlen(XI_PROP_DUMP_DEBUG_LOG), TRUE); -+ CARD32 prop_dump_debug_log_init = 0; -+ -+ XIChangeDeviceProperty(dev, dump_debug_log_prop, XA_INTEGER, -+ /* format */ 32, PropModeReplace, /* size */ 1, -+ &prop_dump_debug_log_init, FALSE); -+ XISetDevicePropertyDeletable(dev, dump_debug_log_prop, FALSE); -+ XIRegisterPropertyHandler(dev, EvdevDebugSetProperty, -+ EvdevDebugGetProperty, NULL); -+} -diff --git a/src/evdev.c b/src/evdev.c ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -219,7 +219,7 @@ static size_t EvdevCountBits(unsigned long *array, size_t nlongs) - return count; - } - --static inline int EvdevBitIsSet(const unsigned long *array, int bit) -+inline int EvdevBitIsSet(const unsigned long *array, int bit) - { - return !!(array[bit / LONG_BITS] & (1LL << (bit % LONG_BITS))); - } -@@ -1208,6 +1208,16 @@ EvdevProcessEvent(InputInfoPtr pInfo, struct input_event *ev) - syn_dropped = EvdevProcessSyncEvent(pInfo, ev); - break; - } -+ -+ // Add touch events to the debug log. Keypresses are not included. -+ if (ev->type == EV_ABS || ev->type == EV_SYN || -+ (ev->type == EV_KEY && ev->code == BTN_TOUCH)) { -+ EvdevPtr pEvdev = pInfo->private; -+ pEvdev->debug_buf[pEvdev->debug_buf_tail].ev = *ev; -+ pEvdev->debug_buf[pEvdev->debug_buf_tail].slot = pEvdev->cur_slot; -+ pEvdev->debug_buf_tail++; -+ pEvdev->debug_buf_tail %= DEBUG_BUF_SIZE; -+ } - return syn_dropped; - } - -@@ -2308,6 +2318,7 @@ EvdevInit(DeviceIntPtr device) - EvdevWheelEmuInitProperty(device); - EvdevDragLockInitProperty(device); - EvdevAppleInitProperty(device); -+ EvdevDebugInitProperty(device); - - return Success; - } -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -101,6 +101,8 @@ - /* Number of longs needed to hold the given number of bits */ - #define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS) - -+#define DEBUG_BUF_SIZE 65536 -+ - #define _ABS_MT_FIRST ABS_MT_TOUCH_MAJOR - #define _ABS_MT_LAST ABS_MT_DISTANCE - #define _ABS_MT_CNT (_ABS_MT_LAST - _ABS_MT_FIRST + 1) -@@ -268,6 +270,12 @@ typedef struct { - int num_queue; - EventQueueRec queue[EVDEV_MAXQUEUE]; - -+ struct debug_event { -+ struct input_event ev; -+ int slot; -+ } debug_buf[DEBUG_BUF_SIZE]; -+ size_t debug_buf_tail; -+ - enum fkeymode fkeymode; - - /* Sync timestamps */ -@@ -329,9 +337,12 @@ BOOL EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv); - void EvdevDragLockPreInit(InputInfoPtr pInfo); - BOOL EvdevDragLockFilterEvent(InputInfoPtr pInfo, unsigned int button, int value); - -+int EvdevBitIsSet(const unsigned long *array, int bit); -+ - void EvdevMBEmuInitProperty(DeviceIntPtr); - void Evdev3BEmuInitProperty(DeviceIntPtr); - void EvdevWheelEmuInitProperty(DeviceIntPtr); - void EvdevDragLockInitProperty(DeviceIntPtr); - void EvdevAppleInitProperty(DeviceIntPtr); -+void EvdevDebugInitProperty(DeviceIntPtr); - #endif --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-fix-emulated-wheel.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-fix-emulated-wheel.patch deleted file mode 100644 index 7d0c107715..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.0-fix-emulated-wheel.patch +++ /dev/null @@ -1,163 +0,0 @@ -From: Chung-yih Wang -Date: Wed, 14 Nov 2012 15:42:36 +0800 -Subject: [PATCH] Accelerate emulated wheel events - -Use the Chromium OS Mouse Wheel acceleration for Emulated Wheel -events. This acceleration replaces the simpler "accumulated inertia -mapped to number of button clicks" approach. - -The main motivation of this change is to send Emulated Wheel events to -Chrome using the scroll valuators instead of legacy button events. ---- - src/emuWheel.c | 48 +++++++++--------------------------------------- - src/evdev.c | 20 +++++++++++++++++++- - src/evdev.h | 4 ++++ - 3 files changed, 32 insertions(+), 40 deletions(-) - -diff --git a/src/emuWheel.c b/src/emuWheel.c ---- a/src/emuWheel.c -+++ b/src/emuWheel.c -@@ -50,9 +50,6 @@ static Atom prop_wheel_inertia = 0; - static Atom prop_wheel_timeout = 0; - static Atom prop_wheel_button = 0; - --/* Local Funciton Prototypes */ --static int EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr axis, int value); -- - /* Filter mouse button events */ - BOOL - EvdevWheelEmuFilterButton(InputInfoPtr pInfo, unsigned int button, int value) -@@ -148,8 +145,15 @@ EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv) - */ - if (pAxis) - { -- if (EvdevWheelEmuInertia(pInfo, pAxis, value)) -- pOtherAxis->traveled_distance = 0; -+ if (pAxis->up_button) { -+ /* -+ * Try to emit an emulated wheel event. For REL_Y, up is - -+ * and down is + but, for REL_WHEEL, up is + and down is -. -+ */ -+ pEv->code = (pEv->code == REL_Y) ? REL_WHEEL : REL_HWHEEL; -+ pEv->value *= (pEv->code == REL_WHEEL) ? -1 : 1; -+ EvdevProcessRelativeMotionEvent(pInfo, pEv); -+ } - } - - /* Eat motion events while emulateWheel button pressed. */ -@@ -159,40 +163,6 @@ EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv) - return FALSE; - } - --/* Simulate inertia for our emulated mouse wheel. -- Returns the number of wheel events generated. -- */ --static int --EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr axis, int value) --{ -- EvdevPtr pEvdev = (EvdevPtr)pInfo->private; -- int button; -- int inertia; -- int rc = 0; -- -- /* if this axis has not been configured, just eat the motion */ -- if (!axis->up_button) -- return rc; -- -- axis->traveled_distance += value; -- -- if (axis->traveled_distance < 0) { -- button = axis->up_button; -- inertia = -pEvdev->emulateWheel.inertia; -- } else { -- button = axis->down_button; -- inertia = pEvdev->emulateWheel.inertia; -- } -- -- /* Produce button press events for wheel motion */ -- while(abs(axis->traveled_distance) > pEvdev->emulateWheel.inertia) { -- axis->traveled_distance -= inertia; -- EvdevQueueButtonClicks(pInfo, button, 1); -- rc++; -- } -- return rc; --} -- - /* Handle button mapping here to avoid code duplication, - returns true if a button mapping was found. */ - static BOOL -diff --git a/src/evdev.c b/src/evdev.c ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -131,6 +131,7 @@ static BOOL EvdevGrabDevice(InputInfoPtr pInfo, int grab, int ungrab); - static void EvdevSetCalibration(InputInfoPtr pInfo, int num_calibration, int calibration[4]); - static int EvdevOpenDevice(InputInfoPtr pInfo); - static void EvdevCloseDevice(InputInfoPtr pInfo); -+static void EvdevForceWheel(InputInfoPtr pInfo); - - static int EvdevInjectEvent(InputInfoPtr pInfo, uint16_t type, - uint16_t code, int32_t value); -@@ -787,6 +788,8 @@ EvdevAccelWheel(InputInfoPtr pInfo, struct input_event *ev) - - /* If start_time == end_time, compute click_speed using dt = 1 second */ - dt = (end_time - start_time) ?: 1.0; -+ if (pEvdev->emulateWheel.enabled) -+ dt *= pEvdev->emulateWheel.inertia; - click_speed = ev->value / dt; - - wheel->value = ev->value; -@@ -812,7 +815,7 @@ EvdevAccelWheel(InputInfoPtr pInfo, struct input_event *ev) - /** - * Take the relative motion input event and process it accordingly. - */ --static void -+void - EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, struct input_event *ev) - { - int value; -@@ -2048,6 +2051,8 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) - if (!EvdevBitIsSet(pEvdev->bitmask, EV_REL)) - goto out; - -+ EvdevForceWheel(pInfo); -+ - num_axes = EvdevCountBits(pEvdev->rel_bitmask, NLONGS(REL_MAX)); - if (num_axes < 1) - goto out; -@@ -2583,6 +2588,19 @@ EvdevGrabDevice(InputInfoPtr pInfo, int grab, int ungrab) - } - - /** -+ * Some devices require REL_WHEEL and REL_HWHEEL axes to emulate wheel -+ * activities. -+ */ -+static void -+EvdevForceWheel(InputInfoPtr pInfo) -+{ -+ EvdevPtr pEvdev = pInfo->private; -+ -+ EvdevSetBit(pEvdev->rel_bitmask, REL_WHEEL); -+ EvdevSetBit(pEvdev->rel_bitmask, REL_HWHEEL); -+} -+ -+/** - * Some devices only have other axes (e.g. wheels), but we - * still need x/y for these. The server relies on devices having - * x/y as axes 0/1 and core/XI 1.x clients expect it too (#44655) -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -314,6 +314,10 @@ void EvdevPostAbsoluteMotionEvents(InputInfoPtr pInfo, int num_v, int first_v, - int v[MAX_VALUATORS]); - unsigned int EvdevUtilButtonEventToButtonNumber(EvdevPtr pEvdev, int code); - -+/* Event processing functions */ -+void EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, -+ struct input_event *ev); -+ - /* Middle Button emulation */ - int EvdevMBEmuTimer(InputInfoPtr); - BOOL EvdevMBEmuFilterEvent(InputInfoPtr, int, BOOL); --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.3-Add-SYN_DROPPED-handling.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.3-Add-SYN_DROPPED-handling.patch deleted file mode 100644 index 9a4c9a408c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-2.7.3-Add-SYN_DROPPED-handling.patch +++ /dev/null @@ -1,537 +0,0 @@ -From: Chung-yih Wang -Date: Thu, 15 Nov 2012 16:17:12 +0800 -Subject: [PATCH] x11-drivers/xf86-input-evdev: Add SYN_DROPPED handling - -If an evdev client cannot consume evdev events in its queue fast enough, the -evdev kernel driver will enqueue a SYN_DROPPED event and clear the queue -once the client's queue is full. The result is that the X driver will be out -of sync with respect to the kernel driver state. The patch tries to handle the -SYN_DROPPED event by retrieving the kernel driver's state. Retrieving this -state is inherently non-atomic, since it requires a sequence of ioctls. We use -a simple before and after time stamping approach to deal with the race -condition between partially syncing state and any potentially stale events that -arrive during synchronization. ---- - src/evdev.c | 371 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- - src/evdev.h | 17 +++ - 2 files changed, 381 insertions(+), 7 deletions(-) - -diff --git a/src/evdev.c b/src/evdev.c ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -127,11 +127,27 @@ static void EvdevSetCalibration(InputInfoPtr pInfo, int num_calibration, int cal - static int EvdevOpenDevice(InputInfoPtr pInfo); - static void EvdevCloseDevice(InputInfoPtr pInfo); - -+static int EvdevInjectEvent(InputInfoPtr pInfo, uint16_t type, -+ uint16_t code, int32_t value); - static void EvdevInitAxesLabels(EvdevPtr pEvdev, int mode, int natoms, Atom *atoms); - static void EvdevInitButtonLabels(EvdevPtr pEvdev, int natoms, Atom *atoms); - static void EvdevInitProperty(DeviceIntPtr dev); - static int EvdevSetProperty(DeviceIntPtr dev, Atom atom, - XIPropertyValuePtr val, BOOL checkonly); -+static void EvdevSyncState(InputInfoPtr pInfo); -+static void EvdevGetKernelTime(struct timeval *current_time, -+ BOOL use_monotonic); -+static int EvdevKeyStateSync(InputInfoPtr pInfo); -+static int EvdevAbsAxesSync(InputInfoPtr pInfo); -+static int EvdevAbsMtSlotSync(InputInfoPtr pInfo); -+static int EvdevInjectAbsMtAxisChangeEvent(InputInfoPtr pInfo, int slot_index, -+ uint16_t code, int32_t value); -+static int EvdevCheckAbsMtAxesChange(InputInfoPtr pInfo, MTSlotInfoPtr slots, -+ int *count_after_synreport); -+static int EvdevGetAllSlotVals(InputInfoPtr pInfo, MTSlotInfoPtr slots); -+static int EvdevAbsMtStateSync(InputInfoPtr pInfo, int *count_after_synreport); -+static int EvdevAbsStateSync(InputInfoPtr pInfo, int *count_after_synreport); -+ - static Atom prop_product_id; - static Atom prop_invert; - static Atom prop_calibration; -@@ -205,6 +221,11 @@ static inline void EvdevSetBit(unsigned long *array, int bit) - array[bit / LONG_BITS] |= (1LL << (bit % LONG_BITS)); - } - -+static inline void EvdevClearBit(unsigned long *array, int bit) -+{ -+ array[bit / LONG_BITS] &= ~(1LL << (bit % LONG_BITS)); -+} -+ - static int - EvdevGetMajorMinor(InputInfoPtr pInfo) - { -@@ -660,6 +681,11 @@ EvdevProcessButtonEvent(InputInfoPtr pInfo, struct input_event *ev) - /* Get the signed value, earlier kernels had this as unsigned */ - value = ev->value; - -+ if (ev->value) -+ EvdevSetBit(pEvdev->key_state_bitmask, ev->code); -+ else -+ EvdevClearBit(pEvdev->key_state_bitmask, ev->code); -+ - /* Handle drag lock */ - if (EvdevDragLockFilterEvent(pInfo, button, value)) - return; -@@ -787,6 +813,7 @@ EvdevProcessTouchEvent(InputInfoPtr pInfo, struct input_event *ev) - if (pEvdev->slot_state == SLOTSTATE_EMPTY) - pEvdev->slot_state = SLOTSTATE_UPDATE; - if (ev->code == ABS_MT_TRACKING_ID) { -+ pEvdev->cached_tid[slot_index] = ev->value; - if (ev->value >= 0) { - pEvdev->slot_state = SLOTSTATE_OPEN; - -@@ -1000,7 +1027,7 @@ static void EvdevPostQueuedEvents(InputInfoPtr pInfo, int num_v, int first_v, - * Take the synchronization input event and process it accordingly; the motion - * notify events are sent first, then any button/key press/release events. - */ --static void -+static BOOL - EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev) - { - int i; -@@ -1008,6 +1035,11 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev) - int v[MAX_VALUATORS] = {}; - EvdevPtr pEvdev = pInfo->private; - -+ if (ev->code == SYN_DROPPED) { -+ xf86IDrvMsg(pInfo, X_INFO, "+++ SYN_DROPPED +++\n"); -+ return TRUE; -+ } -+ - EvdevProcessProximityState(pInfo); - - EvdevProcessValuators(pInfo); -@@ -1035,16 +1067,20 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev) - pEvdev->abs_queued = 0; - pEvdev->rel_queued = 0; - pEvdev->prox_queued = 0; -- -+ return FALSE; - } - - /** - * Process the events from the device; nothing is actually posted to the server -- * until an EV_SYN event is received. -+ * until an EV_SYN event is received. As the SYN_DROPPED event indicates that the -+ * state of evdev driver will be out of sync with the event queue, additional -+ * handling is required for processing the SYN_DROPPED event. The function returns -+ * TRUE if a SYN_DROPPED event is received, FALSE otherwise. - */ --static void -+static BOOL - EvdevProcessEvent(InputInfoPtr pInfo, struct input_event *ev) - { -+ BOOL syn_dropped = FALSE; - switch (ev->type) { - case EV_REL: - EvdevProcessRelativeMotionEvent(pInfo, ev); -@@ -1056,9 +1092,10 @@ EvdevProcessEvent(InputInfoPtr pInfo, struct input_event *ev) - EvdevProcessKeyEvent(pInfo, ev); - break; - case EV_SYN: -- EvdevProcessSyncEvent(pInfo, ev); -+ syn_dropped = EvdevProcessSyncEvent(pInfo, ev); - break; - } -+ return syn_dropped; - } - - #undef ABS_X_VALUE -@@ -1089,6 +1126,308 @@ EvdevFreeMasks(EvdevPtr pEvdev) - #endif - } - -+static void -+EvdevGetKernelTime(struct timeval *current_time, BOOL use_monotonic) { -+ struct timespec now; -+ clockid_t clockid = (use_monotonic) ? CLOCK_MONOTONIC : CLOCK_REALTIME; -+ -+ clock_gettime(clockid, &now); -+ current_time->tv_sec = now.tv_sec; -+ current_time->tv_usec = now.tv_nsec / 1000; -+} -+ -+static int -+EvdevInjectEvent(InputInfoPtr pInfo, uint16_t type, uint16_t code, -+ int32_t value) { -+ EvdevPtr pEvdev = pInfo->private; -+ struct input_event ev; -+ -+ ev.type = type; -+ ev.code = code; -+ ev.value = value; -+ EvdevGetKernelTime(&ev.time, pEvdev->is_monotonic); -+ /* Inject the event by processing it */ -+ EvdevProcessEvent(pInfo, &ev); -+ return 1; -+} -+ -+static int -+EvdevKeyStateSync(InputInfoPtr pInfo) { -+ EvdevPtr pEvdev = pInfo->private; -+ unsigned long key_state_bitmask[NLONGS(KEY_CNT)]; -+ int i, ev_count = 0; -+ int len = sizeof(key_state_bitmask); -+ -+ if (ioctl(pInfo->fd, EVIOCGKEY(len), key_state_bitmask) < 0) { -+ xf86IDrvMsg(pInfo, X_ERROR, -+ "ioctl EVIOCGKEY failed: %s\n", strerror(errno)); -+ return !Success; -+ } -+ for (i = 0; i < KEY_CNT; i++) { -+ int orig_value, current_value; -+ if (!EvdevBitIsSet(pEvdev->key_bitmask, i)) -+ continue; -+ orig_value = EvdevBitIsSet(pEvdev->key_state_bitmask, i); -+ current_value = EvdevBitIsSet(key_state_bitmask, i); -+ if (current_value == orig_value) -+ continue; -+ ev_count += EvdevInjectEvent(pInfo, EV_KEY, i, current_value); -+ } -+ return ev_count; -+} -+ -+static int -+EvdevAbsAxesSync(InputInfoPtr pInfo) { -+ EvdevPtr device = pInfo->private; -+ struct input_absinfo absinfo; -+ int i, ev_count = 0; -+ -+ /* Sync all ABS_ axes excluding ABS_MT_ axes */ -+ for (i = ABS_X; i < ABS_MAX; i++) { -+ if (i >= ABS_MT_SLOT && i <= _ABS_MT_LAST) -+ continue; -+ if (!EvdevBitIsSet(device->abs_bitmask, i)) -+ continue; -+ if (ioctl(pInfo->fd, EVIOCGABS(i), &absinfo) < 0) { -+ xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGABS(%zu) failed: %s\n", -+ i, strerror(errno)); -+ } else if (absinfo.value != device->absinfo[i].value) { -+ ev_count += EvdevInjectEvent(pInfo, EV_ABS, i, absinfo.value); -+ } -+ } -+ return ev_count; -+} -+ -+static int -+EvdevAbsMtSlotSync(InputInfoPtr pInfo) { -+ EvdevPtr device = pInfo->private; -+ struct input_absinfo absinfo; -+ int ev_count = 0; -+ -+ if (ioctl(pInfo->fd, EVIOCGABS(ABS_MT_SLOT), &absinfo) < 0) { -+ xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGABS(ABS_MT_SLOT) failed: %s\n", -+ strerror(errno)); -+ return 0; -+ } -+ if (device->cur_slot != absinfo.value) -+ ev_count = EvdevInjectEvent(pInfo, EV_ABS, ABS_MT_SLOT, absinfo.value); -+ return ev_count; -+} -+ -+static int -+EvdevInjectAbsMtAxisChangeEvent(InputInfoPtr pInfo, int slot_index, -+ uint16_t code, int32_t value) { -+ EvdevPtr device = pInfo->private; -+ int ev_count = 0; -+ -+ if (device->cur_slot != slot_index) -+ ev_count += EvdevInjectEvent(pInfo, EV_ABS, ABS_MT_SLOT, slot_index); -+ ev_count += EvdevInjectEvent(pInfo, EV_ABS, code, value); -+ return ev_count; -+} -+ -+static int -+EvdevCheckAbsMtAxesChange(InputInfoPtr pInfo, MTSlotInfoPtr slots, -+ int *count_after_synreport) -+{ -+ EvdevPtr device = pInfo->private; -+ int i, j, ev_count = 0; -+ int total_ev_count = 0; -+ -+ /* -+ * There will be five conditions of a slot change after SYN_DROPPED: -+ * a. Finger leaving, i.e., tracking id changes from a non-negative -+ * number to -1. -+ * b. Finger arriving, i.e., tracking id changes from -1 to a -+ * non-negative number. -+ * c. Finger changing, i.e., original finger leaving and new finger -+ * arriving, tracking id changes from a non-negative number to -+ * another one. -+ * d. Same finger, but axes change, i.e., no tracking id changes, but some -+ * axes values have changed. -+ * e. Fingers arrive and leave: tracking ID was -1, and is still -1, but -+ * some axes values have changed. -+ * f. nothing changed -+ * -+ * To have X server seamless of SYN_DROPPED event, additional event -+ * injections will be required except for conditions e and f: -+ * -+ * Finger leaving (a): all axes of the slot should be updated first, then -+ * followed with tracking id change (-1). -+ * -+ * Finger arriving (b): new tracking id should be injected first, followed -+ * with all axes updates. -+ * -+ * Finger changing (c): first, inject finger leaving with tracking id -1, -+ * followed with new tracking id event, then update all axes data. -+ * -+ * Same finger, but axes change (d): all axes updates should be injected -+ * -+ */ -+ -+ for (i = 0; i < num_slots(device); i++) { -+ int curr_tid = slots[ABS_MT_TRACKING_ID - _ABS_MT_FIRST].values[i]; -+ int orig_tid = device->cached_tid[i]; -+ -+ /* For conditions b and c, inject the tracking id change events first */ -+ if (orig_tid != curr_tid && curr_tid != -1) { -+ /* For (c), inject the leaving event for original finger */ -+ if (orig_tid != -1) { -+ ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo, -+ i, -+ ABS_MT_TRACKING_ID, -+ -1); -+ ev_count += EvdevInjectEvent(pInfo, EV_SYN, SYN_REPORT, 0); -+ /* Reset the count_after_synreport after SYN_REPORT event */ -+ total_ev_count += ev_count; -+ *count_after_synreport = ev_count = 0; -+ } -+ /* For (b) and (c), set the new tid before updating axes */ -+ ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo, -+ i, -+ ABS_MT_TRACKING_ID, -+ curr_tid); -+ } -+ -+ -+ for (j = _ABS_MT_FIRST; j <= _ABS_MT_LAST; j++) { -+ int axis = j - _ABS_MT_FIRST; -+ int map, orig_value, curr_value; -+ if ((j == ABS_MT_TRACKING_ID) || -+ ((map = device->axis_map[j]) == -1)) -+ continue; -+ if (!EvdevBitIsSet(device->abs_bitmask, j)) -+ continue; -+ -+ orig_value = valuator_mask_get(device->last_mt_vals[i], map); -+ curr_value = slots[axis].values[i]; -+ -+ if (orig_value == curr_value) -+ continue; -+ -+ /* For condition e, internal axes values should be updated */ -+ if (orig_tid == -1 && curr_tid == -1) { -+ valuator_mask_set(device->last_mt_vals[i], map, curr_value); -+ continue; -+ } -+ -+ /* In addition to condition d, all axes updates will be injected */ -+ ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo, -+ i, -+ j, -+ curr_value); -+ } -+ -+ /* For condition a, inject finger leaving event */ -+ if (orig_tid != -1 && curr_tid == -1) { -+ ev_count += EvdevInjectAbsMtAxisChangeEvent(pInfo, -+ i, -+ ABS_MT_TRACKING_ID, -+ -1); -+ } -+ } -+ /* Update current slot index if it is different from cur_slot value */ -+ ev_count += EvdevAbsMtSlotSync(pInfo); -+ *count_after_synreport += ev_count; -+ -+ return total_ev_count + ev_count; -+} -+ -+static int -+EvdevGetAllSlotVals(InputInfoPtr pInfo, MTSlotInfoPtr slots) -+{ -+ EvdevPtr device = pInfo->private; -+ int i; -+ -+ /* Retrieve current ABS_MT_ axes for all slots */ -+ for (i = _ABS_MT_FIRST; i <= _ABS_MT_LAST; i++) { -+ MTSlotInfoPtr req = &slots[i - _ABS_MT_FIRST]; -+ if (!EvdevBitIsSet(device->abs_bitmask, i)) -+ continue; -+ req->code = i; -+ if (ioctl(pInfo->fd, EVIOCGMTSLOTS((sizeof(*req))), req) < 0) { -+ xf86IDrvMsg(pInfo, X_ERROR, -+ "ioctl EVIOCGMTSLOTS(req.code=%d) failed: %s\n", -+ req->code, strerror(errno)); -+ return !Success; -+ } -+ } -+ -+ return Success; -+} -+ -+static int -+EvdevAbsMtStateSync(InputInfoPtr pInfo, int *count_after_synreport) { -+ MTSlotInfo slots[_ABS_MT_CNT]; -+ int ev_count = 0; -+ -+ /* Get all current slots axes, then check if there is any update required */ -+ if (EvdevGetAllSlotVals(pInfo, slots) == Success) { -+ ev_count = EvdevCheckAbsMtAxesChange(pInfo, slots, -+ count_after_synreport); -+ } -+ -+ return ev_count; -+} -+ -+static int -+EvdevAbsStateSync(InputInfoPtr pInfo, int *count_after_synreport) { -+ EvdevPtr device = pInfo->private; -+ int ev_count; -+ -+ /* Sync all ABS_ axes */ -+ ev_count = EvdevAbsAxesSync(pInfo); -+ *count_after_synreport += ev_count; -+ -+ /* Sync ABS_MT_ axes for all slots if exists */ -+ if (device->num_mt_vals) -+ ev_count += EvdevAbsMtStateSync(pInfo, count_after_synreport); -+ -+ return ev_count; -+} -+ -+/** -+ * Synchronize the current state with kernel evdev driver. -+ */ -+static void -+EvdevSyncState(InputInfoPtr pInfo) -+{ -+ int ev_count = 0; -+ int ev_count_after_synreport = 0; -+ EvdevPtr device = pInfo->private; -+ -+ EvdevGetKernelTime(&device->before_sync_time, device->is_monotonic); -+ -+ ev_count = EvdevKeyStateSync(pInfo); -+ ev_count_after_synreport += ev_count; -+ -+ /* -+ * TODO: sync all led, switch and sound states as well. We probably need -+ * to post events out actively if the new states are different from the -+ * cached ones. -+ */ -+ -+ /* sync abs and abs_mt value/limits */ -+ ev_count += EvdevAbsStateSync(pInfo, &ev_count_after_synreport); -+ -+ /* -+ * Push SYN_REPORT event out if there is any event injected -+ * during the state synchronization. -+ */ -+ if (ev_count_after_synreport) -+ ev_count += EvdevInjectEvent(pInfo, EV_SYN, SYN_REPORT, 0); -+ -+ EvdevGetKernelTime(&device->after_sync_time, device->is_monotonic); -+ -+ xf86IDrvMsg(pInfo, X_INFO, -+ "Sync_State: before %ld.%ld after %ld.%ld injected events=%d\n", -+ device->before_sync_time.tv_sec, -+ device->before_sync_time.tv_usec, -+ device->after_sync_time.tv_sec, -+ device->after_sync_time.tv_usec, -+ ev_count); -+} -+ - /* just a magic number to reduce the number of reads */ - #define NUM_EVENTS 16 - -@@ -1097,6 +1436,7 @@ EvdevReadInput(InputInfoPtr pInfo) - { - struct input_event ev[NUM_EVENTS]; - int i, len = sizeof(ev); -+ BOOL sync_evdev_state = FALSE; - - while (len == sizeof(ev)) - { -@@ -1131,9 +1471,23 @@ EvdevReadInput(InputInfoPtr pInfo) - break; - } - -- for (i = 0; i < len/sizeof(ev[0]); i++) -- EvdevProcessEvent(pInfo, &ev[i]); -+ for (i = 0; i < len/sizeof(ev[0]); i++) { -+ if (sync_evdev_state) -+ break; -+ if (timercmp(&ev[i].time, &pEvdev->before_sync_time, <)) { -+ /* Ignore events before last sync time */ -+ continue; -+ } else if (timercmp(&ev[i].time, &pEvdev->after_sync_time, >)) { -+ /* Event_Process returns TRUE if SYN_DROPPED detected */ -+ sync_evdev_state = EvdevProcessEvent(pInfo, &ev[i]); -+ } else { -+ /* If the event occurred during sync, then sync again */ -+ sync_evdev_state = TRUE; -+ } -+ } - } -+ if (sync_evdev_state) -+ EvdevSyncState(pInfo); - } - - static void -@@ -1325,6 +1679,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) - } - - for (i = 0; i < num_slots(pEvdev); i++) { -+ pEvdev->cached_tid[i] = -1; - pEvdev->last_mt_vals[i] = valuator_mask_new(num_mt_axes_total); - if (!pEvdev->last_mt_vals[i]) { - xf86IDrvMsg(pInfo, X_ERROR, -@@ -1850,6 +2205,8 @@ EvdevOn(DeviceIntPtr device) - Evdev3BEmuOn(pInfo); - pEvdev->flags |= EVDEV_INITIALIZED; - device->public.on = TRUE; -+ pEvdev->slot_state = SLOTSTATE_EMPTY; -+ EvdevSyncState(pInfo); - - return Success; - } -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -97,6 +97,12 @@ - /* Number of longs needed to hold the given number of bits */ - #define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS) - -+#define _ABS_MT_FIRST ABS_MT_TOUCH_MAJOR -+#define _ABS_MT_LAST ABS_MT_DISTANCE -+#define _ABS_MT_CNT (_ABS_MT_LAST - _ABS_MT_FIRST + 1) -+ -+#define MAX_SLOT_COUNT 64 -+ - /* Function key mode */ - enum fkeymode { - FKEYMODE_UNKNOWN = 0, -@@ -250,8 +256,19 @@ typedef struct { - EventQueueRec queue[EVDEV_MAXQUEUE]; - - enum fkeymode fkeymode; -+ -+ /* Sync timestamps */ -+ unsigned long key_state_bitmask[NLONGS(KEY_CNT)]; -+ struct timeval before_sync_time; -+ struct timeval after_sync_time; -+ int32_t cached_tid[MAX_SLOT_COUNT]; - } EvdevRec, *EvdevPtr; - -+typedef struct { -+ uint32_t code; -+ int32_t values[MAX_SLOT_COUNT]; -+} MTSlotInfo, *MTSlotInfoPtr; -+ - /* Event posting functions */ - void EvdevQueueKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value); - void EvdevQueueButtonEvent(InputInfoPtr pInfo, int button, int value); --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-disable-smooth-scrolling.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-disable-smooth-scrolling.patch deleted file mode 100644 index e3bd81f601..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/files/evdev-disable-smooth-scrolling.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Daniel Erat -Date: Wed, 21 Mar 2012 10:44:51 -0700 -Subject: [PATCH] Disable smooth scrolling in xf86-input-evdev. - -This caused additional valuator-containing motion events to -be sent on behalf of the scrollwheel, which Chrome treated -identically to touchpad scroll events, resulting in the -scrollwheel being unusable. - -BUG=chromium:118608 -TEST=manual: we scroll 106 pixels for each scrollwheel click on stumpy ---- - src/evdev.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/evdev.h b/src/evdev.h ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -67,6 +67,10 @@ - #define HAVE_SMOOTH_SCROLLING 1 - #endif - -+/* Smooth scrolling results in the mousewheel generating motion events with -+ * valuators that confuse Chrome: http://crosbug.com/118608 */ -+#undef HAVE_SMOOTH_SCROLLING -+ - #define EVDEV_MAXBUTTONS 32 - #define EVDEV_MAXQUEUE 32 - --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3-r13.ebuild deleted file mode 120000 index cfca3b06c2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3-r13.ebuild +++ /dev/null @@ -1 +0,0 @@ -xf86-input-evdev-2.7.3.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild deleted file mode 100644 index 6a67e767e0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild +++ /dev/null @@ -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-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild,v 1.1 2012/08/14 01:24:15 chithanh Exp $ - -EAPI=4 -XORG_EAUTORECONF=yes - -inherit xorg-2 - -DESCRIPTION="Generic Linux input driver" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86" -IUSE="" -RDEPEND=">=x11-base/xorg-server-1.10[udev] - sys-libs/mtdev" -DEPEND="${RDEPEND} - >=x11-proto/inputproto-2.1.99.3 - >=sys-kernel/linux-headers-2.6" - -PATCHES=( - "${FILESDIR}"/evdev-2.7.0-Use-monotonic-timestamps-for-input-events-if-availab.patch - # crosbug.com/35291 - "${FILESDIR}"/evdev-2.7.3-Add-SYN_DROPPED-handling.patch - "${FILESDIR}/evdev-disable-smooth-scrolling.patch" - "${FILESDIR}/evdev-2.6.99-wheel-accel.patch" - "${FILESDIR}"/evdev-2.7.0-feedback-log.patch - "${FILESDIR}"/evdev-2.7.0-add-touch-event-timestamp.patch - # crosbug.com/p/13787 - "${FILESDIR}"/evdev-2.7.0-fix-emulated-wheel.patch - "${FILESDIR}"/evdev-2.7.0-add-block-reading-support.patch -) diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/Manifest deleted file mode 100644 index 405cf002af..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xf86-video-armsoc-0.0.1.tar.bz2 194556 SHA256 51dd0b7dae6a216cb3b197436e4c1d0c7dcf15049e947543d45942fbd000b314 SHA512 cf6ca259059f9f1364ce936de4ee21ecbcb3b0a839622f83a6e62abadc1176be9d0dad83c86fe3aa25ad3c2297f0e6f55d4f33f10f91eaff7897a2cfe43bb39e WHIRLPOOL 4f77e7f2c0f89f09853e5d25e376494c813a7ee4a50b5cdefc20df1c5f5b99d2202c7580fa4dd9f221a152321d7656986729aa8383390cc1354d5abd8eb6eda1 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.0.1-r91.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.0.1-r91.ebuild deleted file mode 100644 index 1fab3d2371..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.0.1-r91.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU Public License v2 - -EAPI="4" -CROS_WORKON_COMMIT="9eb527e3cf926175eda9063fa0ef65504c816364" -CROS_WORKON_TREE="0d2d6cd5e23e84585ebe72df251360086c8408bf" -CROS_WORKON_PROJECT="chromiumos/third_party/xf86-video-armsoc" -CROS_WORKON_LOCALNAME="xf86-video-armsoc" - -XORG_DRI="always" -XORG_EAUTORECONF="yes" - -inherit xorg-2 cros-workon - -DESCRIPTION="X.Org driver for ARM devices" - -KEYWORDS="-* arm" - -RDEPEND=">=x11-base/xorg-server-1.9" -DEPEND="${RDEPEND}" - -src_unpack() { - cros-workon_src_unpack - mkdir -p "${S}"/m4 -} - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild deleted file mode 100644 index 894d9824f7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU Public License v2 - -EAPI="4" -CROS_WORKON_PROJECT="chromiumos/third_party/xf86-video-armsoc" -CROS_WORKON_LOCALNAME="xf86-video-armsoc" - -XORG_DRI="always" -XORG_EAUTORECONF="yes" - -inherit xorg-2 cros-workon - -DESCRIPTION="X.Org driver for ARM devices" - -KEYWORDS="-* ~arm" - -RDEPEND=">=x11-base/xorg-server-1.9" -DEPEND="${RDEPEND}" - -src_unpack() { - cros-workon_src_unpack - mkdir -p "${S}"/m4 -} - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/Manifest deleted file mode 100644 index 0d8026d6c1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xf86-video-intel-2.16.0.tar.bz2 1249069 RMD160 9eb9aeabecfbe9f6dde6c81a59c07d9d90f2dc69 SHA1 53441ea4d4335b501d32809b6b92593cbb1f79cf SHA256 77482bcd1e30a57b68ba0d6a1862b4ff3c55fa23bf0109ec2af318a3e066ebfe diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.14.0-no-gamma.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.14.0-no-gamma.patch deleted file mode 100644 index 60e474aacd..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.14.0-no-gamma.patch +++ /dev/null @@ -1,12 +0,0 @@ -Disable gamma setting. We set this early at boot and we don't want X to mess with our settings. -diff -paur xf86-video-intel-2.14.0.orig/src/intel_display.c xf86-video-intel-2.14.0.work/src/intel_display.c ---- xf86-video-intel-2.14.0.orig/src/intel_display.c 2011-01-10 15:02:16.534513000 -0800 -+++ xf86-video-intel-2.14.0.work/src/intel_display.c 2011-04-18 13:40:46.586165000 -0700 -@@ -617,6 +617,7 @@ static void - intel_crtc_gamma_set(xf86CrtcPtr crtc, - CARD16 *red, CARD16 *green, CARD16 *blue, int size) - { -+ return; - struct intel_crtc *intel_crtc = crtc->driver_private; - struct intel_mode *mode = intel_crtc->mode; - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.15.0-flips.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.15.0-flips.patch deleted file mode 100644 index 3a703258f3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.15.0-flips.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -paur xf86-video-intel-2.14.0.orig/src/intel_display.c xf86-video-intel-2.14.0.work/src/intel_display.c ---- xf86-video-intel-2.14.0.orig/src/intel_display.c 2011-01-10 15:02:16.534513000 -0800 -+++ xf86-video-intel-2.14.0.work/src/intel_display.c 2011-05-19 15:06:39.732535000 -0700 -@@ -57,6 +57,8 @@ struct intel_mode { - unsigned int fe_tv_sec; - unsigned int fe_tv_usec; - -+ unsigned int last_queued_frame; -+ - struct list outputs; - struct list crtcs; - }; -@@ -1435,6 +1437,12 @@ intel_do_pageflip(intel_screen_private * - int i, old_fb_id; - - /* -+ * Discard this flip since we already have one pending for this frame. -+ */ -+ if ( flip_info->frame <= mode->last_queued_frame ) -+ return FALSE; -+ -+ /* - * Create a new handle for the back buffer - */ - old_fb_id = mode->fb_id; -@@ -1490,11 +1498,15 @@ intel_do_pageflip(intel_screen_private * - } - - mode->old_fb_id = old_fb_id; -+ mode->last_queued_frame = flip_info->frame; - return TRUE; - - error_undo: - drmModeRmFB(mode->fd, mode->fb_id); - mode->fb_id = old_fb_id; -+ for (i = 0; i < config->num_crtc; i++) -+ if (config->crtc[i]->enabled) -+ mode->flip_count--; - - error_out: - xf86DrvMsg(scrn->scrnIndex, X_WARNING, "Page flip failed: %s\n", diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-blt-hang.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-blt-hang.patch deleted file mode 100644 index 99c9cb9b5e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-blt-hang.patch +++ /dev/null @@ -1,72 +0,0 @@ -commit 46f97127c22ea42bc8fdae59d2a133e4b8b6c997 -Author: Chris Wilson -Date: Sun Oct 16 21:40:15 2011 +0100 - - snb,ivb: Workaround unknown blitter death - - The first workaround was a performance killing MI_FLUSH_DW after every - op. This workaround appears to be a stable compromise instead, only - requiring a redundant command after every BLT command with little - impact on throughput. - - Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=27892 - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39524 - Tested-by: Daniel Vetter - Signed-off-by: Chris Wilson - -diff --git a/src/intel_uxa.c b/src/intel_uxa.c -index 30717d0..9e58c69 100644 ---- a/src/intel_uxa.c -+++ b/src/intel_uxa.c -@@ -340,13 +340,6 @@ static void intel_uxa_solid(PixmapPtr pixmap, int x1, int y1, int x2, int y2) - } - } - --static void intel_uxa_done_solid(PixmapPtr pixmap) --{ -- ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum]; -- -- intel_debug_flush(scrn); --} -- - /** - * TODO: - * - support planemask using FULL_BLT_CMD? -@@ -501,9 +494,19 @@ intel_uxa_copy(PixmapPtr dest, int src_x1, int src_y1, int dst_x1, - } - } - --static void intel_uxa_done_copy(PixmapPtr dest) -+static void intel_uxa_done(PixmapPtr pixmap) - { -- ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum]; -+ ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum]; -+ intel_screen_private *intel = intel_get_screen_private(scrn); -+ -+ if (IS_GEN6(intel) || IS_GEN7(intel)) { -+ /* workaround a random BLT hang */ -+ BEGIN_BATCH_BLT(3); -+ OUT_BATCH(XY_SETUP_CLIP_BLT_CMD); -+ OUT_BATCH(0); -+ OUT_BATCH(0); -+ ADVANCE_BATCH(); -+ } - - intel_debug_flush(scrn); - } -@@ -1225,13 +1228,13 @@ Bool intel_uxa_init(ScreenPtr screen) - intel->uxa_driver->check_solid = intel_uxa_check_solid; - intel->uxa_driver->prepare_solid = intel_uxa_prepare_solid; - intel->uxa_driver->solid = intel_uxa_solid; -- intel->uxa_driver->done_solid = intel_uxa_done_solid; -+ intel->uxa_driver->done_solid = intel_uxa_done; - - /* Copy */ - intel->uxa_driver->check_copy = intel_uxa_check_copy; - intel->uxa_driver->prepare_copy = intel_uxa_prepare_copy; - intel->uxa_driver->copy = intel_uxa_copy; -- intel->uxa_driver->done_copy = intel_uxa_done_copy; -+ intel->uxa_driver->done_copy = intel_uxa_done; - - /* Composite */ - if (IS_GEN2(intel)) { diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-copy-fb.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-copy-fb.patch deleted file mode 100644 index 4bebd60ab5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-copy-fb.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff --git a/src/intel.h b/src/intel.h -index 42afaf4..22527df 100644 ---- a/src/intel.h -+++ b/src/intel.h -@@ -465,6 +465,7 @@ extern void intel_mode_fini(intel_screen_private *intel); - extern int intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc); - extern int intel_crtc_id(xf86CrtcPtr crtc); - extern int intel_output_dpms_status(xf86OutputPtr output); -+extern void intel_copy_fb(ScrnInfoPtr pScrn); - - enum DRI2FrameEventType { - DRI2_SWAP, -diff --git a/src/intel_display.c b/src/intel_display.c -index 84c7c08..e52ca67 100644 ---- a/src/intel_display.c -+++ b/src/intel_display.c -@@ -30,6 +30,7 @@ - #endif - - #include -+#include - #include - #include - #include -@@ -1435,6 +1436,109 @@ fail: - return FALSE; - } - -+static PixmapPtr -+intel_create_pixmap_for_fbcon(ScrnInfoPtr pScrn) -+{ -+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); -+ ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; -+ drmModeFBPtr fbcon = NULL; -+ PixmapPtr pixmap = NULL; -+ struct drm_gem_flink flink; -+ drm_intel_bo *bo; -+ -+ struct intel_crtc *intel_crtc = xf86_config->crtc[0]->driver_private; -+ struct intel_mode *intel_mode = intel_crtc->mode; -+ intel_screen_private *intel = intel_get_screen_private(pScrn); -+ int i; -+ -+ for (i = 0; i < intel_mode->mode_res->count_crtcs; i++) { -+ intel_crtc = xf86_config->crtc[i]->driver_private; -+ -+ fbcon = drmModeGetFB(intel_mode->fd, intel_crtc->mode_crtc->buffer_id); -+ if (fbcon != NULL) break; -+ } -+ if (fbcon == NULL) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Couldn't find an fbcon\n."); -+ return NULL; -+ } -+ flink.handle = fbcon->handle; -+ if (ioctl(intel_mode->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Couldn't flink fbcon handle\n"); -+ return NULL; -+ } -+ bo = drm_intel_bo_gem_create_from_name(intel->bufmgr, -+ "fbcon", flink.name); -+ -+ if (bo == NULL) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Couldn't allocate bo for fbcon handle\n"); -+ return NULL; -+ } -+ -+ pixmap = GetScratchPixmapHeader(pScreen, -+ fbcon->width, fbcon->height, -+ fbcon->depth, fbcon->bpp, -+ fbcon->pitch, NULL); -+ if (pixmap == NULL) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Couldn't allocate pixmap fbcon contents\n"); -+ return NULL; -+ } -+ -+ intel_set_pixmap_bo(pixmap, bo); -+ drm_intel_bo_unreference(bo); -+ drmModeFreeFB(fbcon); -+ -+ return pixmap; -+} -+ -+void intel_copy_fb(ScrnInfoPtr pScrn) -+{ -+ ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; -+ intel_screen_private *intel = intel_get_screen_private(pScrn); -+ PixmapPtr src, dst; -+ unsigned int pitch = pScrn->displayWidth * intel->cpp; -+ int savePMSize; -+ int pixmap_size; -+ -+ /* Ugly: this runs before CreateScratchPixmap() which normally calculates -+ this number :( -+ */ -+ pixmap_size = sizeof(PixmapRec) + dixPrivatesSize(PRIVATE_PIXMAP); -+ savePMSize = pScreen->totalPixmapSize; -+ pScreen->totalPixmapSize = BitmapBytePad(pixmap_size * 8); -+ -+ src = intel_create_pixmap_for_fbcon(pScrn); -+ if (src == NULL) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Couldn't create pixmap for fbcon\n"); -+ pScreen->totalPixmapSize = savePMSize; -+ return; -+ } -+ -+ /* We dont have a screen Pixmap yet */ -+ dst = GetScratchPixmapHeader(pScreen, -+ pScrn->virtualX, pScrn->virtualY, -+ pScrn->depth, pScrn->bitsPerPixel, -+ pitch, -+ NULL); -+ pScreen->totalPixmapSize = savePMSize; -+ intel_set_pixmap_bo(dst,intel->front_buffer); -+ intel->uxa_driver->prepare_copy(src, dst, -1, -1, GXcopy, FB_ALLONES); -+ -+ intel->uxa_driver->copy(dst, 0, 0, 0, 0, -+ pScrn->virtualX, pScrn->virtualY); -+ intel->uxa_driver->done_copy(dst); -+ -+ intel_batch_submit(pScrn); -+ -+ (*pScreen->DestroyPixmap)(src); -+ (*pScreen->DestroyPixmap)(dst); -+ -+} -+ - Bool - intel_do_pageflip(intel_screen_private *intel, - dri_bo *new_front, -@@ -1584,6 +1688,8 @@ Bool intel_mode_pre_init(ScrnInfoPtr scrn, int fd, int cpp) - unsigned int i; - int has_flipping; - -+ scrn->canDoBGNoneRoot = TRUE; -+ - mode = calloc(1, sizeof *mode); - if (!mode) - return FALSE; -diff --git a/src/intel_driver.c b/src/intel_driver.c -index 7fc1c1a..40ff396 100644 ---- a/src/intel_driver.c -+++ b/src/intel_driver.c -@@ -1154,6 +1154,8 @@ static Bool I830EnterVT(int scrnIndex, int flags) - - intel_set_gem_max_sizes(scrn); - -+ intel_copy_fb(scrn); -+ - if (!xf86SetDesiredModes(scrn)) - return FALSE; - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-fix-blt-damage.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-fix-blt-damage.patch deleted file mode 100644 index 8f2a407372..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-fix-blt-damage.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e1f718b600029d43bb2e2e4a6b50e5a990c6d08d Mon Sep 17 00:00:00 2001 -From: Chris Wolfe -Date: Mon, 5 Nov 2012 11:10:24 -0500 -Subject: [PATCH] xf86-video-intel: Avoid display corruption when unable to - flip. - -This replaces the previous patch to xorg-server for crosbug/33775. -That change avoids calling ScheduleSwap when a flip would not be -classically possible, so interferes with the upcoming per-crtc -flip feature. - -BUG=chromium-os:35796 -TEST=Rapidly minimize/restore/tile window so that the animation spans - monitors, observe that none of the preview shadow is left behind. ---- - src/intel_dri.c | 12 +++++++++--- - 1 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/intel_dri.c b/src/intel_dri.c -index 1227dbb..938a022 100644 ---- a/src/intel_dri.c -+++ b/src/intel_dri.c -@@ -1151,10 +1151,16 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, - - /* Flips need to be submitted one frame before */ - if (can_exchange(draw, front, back)) { -- swap_type = DRI2_FLIP; -- flip = 1; -+ swap_type = DRI2_FLIP; -+ flip = 1; -+ } else { -+ /* Using the DRI2_SWAP path defers the back-to-front blit until -+ * the frame event handler. If another swap comes in before that -+ * event executes, our two-frame damage tracking will copy from -+ * the unfinished frame and cause corruption. To avoid this -+ * problem we force an immediate blit here. */ -+ goto blit_fallback; - } -- - swap_info->type = swap_type; - - /* Correct target_msc by 'flip' if swap_type == DRI2_FLIP. --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-backlight.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-backlight.patch deleted file mode 100644 index 29cb999694..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-backlight.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/intel_display.c b/src/intel_display.c -index 84c7c08..a9dee28 100644 ---- a/src/intel_display.c -+++ b/src/intel_display.c -@@ -400,7 +400,6 @@ intel_crtc_apply(xf86CrtcPtr crtc) - continue; - - intel_output = output->driver_private; -- intel_output_dpms_backlight(output, intel_output->dpms_mode, DPMSModeOn); - intel_output->dpms_mode = DPMSModeOn; - } - } -@@ -950,9 +949,6 @@ intel_output_dpms(xf86OutputPtr output, int dpms) - intel_output->output_id, - props->prop_id, - dpms); -- intel_output_dpms_backlight(output, -- intel_output->dpms_mode, -- dpms); - intel_output->dpms_mode = dpms; - drmModeFreeProperty(props); - return; diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-triple.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-triple.patch deleted file mode 100644 index 3dd4a57e0e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-no-triple.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/intel_driver.c b/src/intel_driver.c -index 9d1c4e8..3e4f664 100644 ---- a/src/intel_driver.c -+++ b/src/intel_driver.c -@@ -677,6 +677,7 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) - xf86ReturnOptValBool(intel->Options, - OPTION_TRIPLE_BUFFER, - TRUE); -+ intel->use_triple_buffer = FALSE; - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Triple buffering? %s\n", - intel->use_triple_buffer ? "enabled" : "disabled"); - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-per-crtc-flip.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-per-crtc-flip.patch deleted file mode 100644 index 5a38919e4e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/files/2.16.0-per-crtc-flip.patch +++ /dev/null @@ -1,1490 +0,0 @@ -From 715ca0c0ccd94650948efd36a9e7b4592c306906 Mon Sep 17 00:00:00 2001 -From: Chris Wolfe -Date: Thu, 20 Dec 2012 15:27:59 -0500 -Subject: [PATCH] xf86-video-intel: Split framebuffer and flip crtcs. - -Try to allocate a separate framebuffer for each CRTC and flip those -directly with the back-buffer of updated drawables. This avoids -blitting content when the drawable size matches the crtc size. - -When CopyRegion is used top copy content into or out of the screen -buffer, it may be redirected to exactly one scanout buffer. This is -enough to support our one-drawable-per-crtc case, but not sufficient -in general. - -This change also moves page flip state that was previously centralized -in the intel_mode structure into the intel_crtc structure associated -with the reference crtc for a flip. This allows flips to pending on -multiple pipes simultaneously. - -Tested with the WebGL aquarium and space rocks demos, a Youtube -video and WebKit poster circle demo. Added and removed displays while -active and while suspended. ---- - src/intel.h | 55 ++++- - src/intel_display.c | 685 ++++++++++++++++++++++++++++++++++++++++++--------- - src/intel_dri.c | 180 ++++++++++++-- - src/intel_driver.c | 10 + - src/intel_uxa.c | 48 ++++ - src/intel_video.c | 11 +- - 6 files changed, 851 insertions(+), 138 deletions(-) - -diff --git a/src/intel.h b/src/intel.h -index 22527df..99b2cfe 100644 ---- a/src/intel.h -+++ b/src/intel.h -@@ -185,6 +185,8 @@ struct intel_pixmap { - int8_t batch_write :1; - int8_t offscreen :1; - int8_t pinned :1; -+ -+ uint32_t fb; - }; - - #if HAS_DEVPRIVATEKEYREC -@@ -429,6 +431,7 @@ typedef struct intel_screen_private { - Bool has_kernel_flush; - Bool needs_flush; - Bool use_shadow; -+ Bool use_split_framebuffer; - - struct _DRI2FrameEvent *pending_flip[2]; - -@@ -462,15 +465,43 @@ extern void intel_mode_init(struct intel_screen_private *intel); - extern void intel_mode_remove_fb(intel_screen_private *intel); - extern void intel_mode_fini(intel_screen_private *intel); - -+extern void intel_pixmap_remove_fb(intel_screen_private *intel, PixmapPtr pixmap); -+ - extern int intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc); - extern int intel_crtc_id(xf86CrtcPtr crtc); - extern int intel_output_dpms_status(xf86OutputPtr output); - extern void intel_copy_fb(ScrnInfoPtr pScrn); - -+struct intel_scanout { -+ PixmapPtr pixmap; -+ BoxRec area; /* area of the virtual screen provided by this scanout */ -+}; -+ -+/* Splits the screen buffer into one scanout per distinct crtc region. */ -+extern Bool intel_split_fb(intel_screen_private *intel); -+ -+/* Merges any scanouts into the screen buffer. */ -+extern void intel_merge_fb(intel_screen_private *intel); -+ -+/* Finds a scanout that exactly matches the area, and stores it in |out_scanout|. -+ * Will return FALSE if any scanout partially intersects the area. If no scanout -+ * includes the area, will return TRUE with |out_scanout| set to NULL. -+ */ -+extern Bool intel_find_scanout(intel_screen_private *intel, BoxPtr area, -+ struct intel_scanout **out_scanout); -+ -+/* Finds a scanout that contains the area, and stores it in |out_scanout|. -+ * Will return FALSE if any scanout partially intersects the area. If no scanout -+ * includes the area, will return TRUE with |out_scanout| set to NULL. -+ */ -+extern Bool intel_covering_scanout(intel_screen_private *intel, BoxPtr area, -+ struct intel_scanout **out_scanout); -+ - enum DRI2FrameEventType { - DRI2_SWAP, - DRI2_SWAP_CHAIN, -- DRI2_FLIP, -+ DRI2_FLIP_FRONT, -+ DRI2_FLIP_SPLIT, - DRI2_WAITMSC, - }; - -@@ -495,13 +526,14 @@ typedef struct _DRI2FrameEvent { - void *event_data; - DRI2BufferPtr front; - DRI2BufferPtr back; -+ BoxRec area; /* screen rectangle being flipped */ - - struct _DRI2FrameEvent *chain; - } DRI2FrameEventRec, *DRI2FrameEventPtr; - - extern Bool intel_do_pageflip(intel_screen_private *intel, -- dri_bo *new_front, -- DRI2FrameEventPtr flip_info, int ref_crtc_hw_id); -+ PixmapPtr new_front, -+ DRI2FrameEventPtr flip_info); - - static inline intel_screen_private * - intel_get_screen_private(ScrnInfoPtr scrn) -@@ -529,6 +561,11 @@ extern void I915EmitInvarientState(ScrnInfoPtr scrn); - extern void I830EmitFlush(ScrnInfoPtr scrn); - - extern void I830InitVideo(ScreenPtr pScreen); -+ -+extern void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b); -+extern void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box); -+extern void intel_drawable_box(DrawablePtr draw, BoxPtr draw_box); -+ - extern xf86CrtcPtr intel_covering_crtc(ScrnInfoPtr scrn, BoxPtr box, - xf86CrtcPtr desired, BoxPtr crtc_box_ret); - -@@ -734,6 +771,18 @@ void intel_uxa_block_handler(intel_screen_private *intel); - Bool intel_get_aperture_space(ScrnInfoPtr scrn, drm_intel_bo ** bo_table, - int num_bos); - -+/* Copies a box between pixmaps using intel->uxa_driver. */ -+extern Bool intel_uxa_driver_copy_pixmap(intel_screen_private *intel, -+ PixmapPtr src, PixmapPtr dst, -+ int src_x, int src_y, -+ int dst_x, int dst_y, -+ int w, int h); -+ -+/* Fills a box of a pixmap using intel->uxa_driver. */ -+extern Bool intel_uxa_driver_fill_pixmap(intel_screen_private *intel, -+ uint32_t src, PixmapPtr dst, -+ int x, int y, int w, int h); -+ - /* intel_shadow.c */ - void intel_shadow_blt(intel_screen_private *intel); - void intel_shadow_create(struct intel_screen_private *intel); -diff --git a/src/intel_display.c b/src/intel_display.c -index bac3f8f..8908386 100644 ---- a/src/intel_display.c -+++ b/src/intel_display.c -@@ -44,27 +44,33 @@ - #include "xf86drmMode.h" - #include "X11/Xatom.h" - -+#define MAX_SCANOUTS (4) -+ -+enum intel_scanout_state { -+ INTEL_SCANOUT_INVALID = 0, -+ INTEL_SCANOUT_FRONT, -+ INTEL_SCANOUT_SPLIT, -+}; -+ - struct intel_mode { - int fd; -- uint32_t fb_id; - drmModeResPtr mode_res; - int cpp; - - drmEventContext event_context; -- DRI2FrameEventPtr flip_info; -- int old_fb_id; -- int flip_count; -- unsigned int fe_frame; -- unsigned int fe_tv_sec; -- unsigned int fe_tv_usec; -+ -+ uint32_t front_fb_id; -+ -+ int scanout_state; -+ struct intel_scanout scanouts[MAX_SCANOUTS]; - - struct list outputs; - struct list crtcs; - }; - - struct intel_pageflip { -- struct intel_mode *mode; -- Bool dispatch_me; -+ struct intel_crtc *reference_crtc; -+ struct intel_crtc *flipped_crtc; - }; - - struct intel_crtc { -@@ -72,10 +78,20 @@ struct intel_crtc { - drmModeModeInfo kmode; - drmModeCrtcPtr mode_crtc; - int pipe; -+ -+ struct { -+ int pending; /* number of outstanding flip requests */ -+ unsigned int frame; -+ unsigned int tv_sec; -+ unsigned int tv_usec; -+ DRI2FrameEventPtr info; -+ } flip; -+ - dri_bo *cursor; - dri_bo *rotate_bo; - uint32_t rotate_pitch; - uint32_t rotate_fb_id; -+ - xf86CrtcPtr crtc; - struct list link; - }; -@@ -109,6 +125,9 @@ struct intel_output { - }; - - static void -+intel_crtc_merge_scanouts(intel_screen_private *intel); -+ -+static void - intel_output_dpms(xf86OutputPtr output, int mode); - - static void -@@ -330,16 +349,97 @@ intel_crtc_dpms(xf86CrtcPtr intel_crtc, int mode) - - } - -+/* Get a scratch pixmap attached to the current front buffer. This needs to be -+ * used rather than GetScreenPixmap before the screen is fully initialized, -+ * and during intel_xf86crtc_resize when the state is inconsistent. -+ */ -+static PixmapPtr intel_get_scratch_front_pixmap(intel_screen_private *intel) -+{ -+ ScrnInfoPtr scrn = intel->scrn; -+ PixmapPtr pixmap; -+ -+ pixmap = GetScratchPixmapHeader( -+ scrn->pScreen, -+ scrn->virtualX, -+ scrn->virtualY, -+ scrn->depth, -+ scrn->bitsPerPixel, -+ intel->front_pitch, -+ NULL); -+ -+ intel_set_pixmap_bo(pixmap, intel->front_buffer); -+ return pixmap; -+} -+ -+static void intel_free_scratch_front_pixmap(PixmapPtr pixmap) -+{ -+ if (pixmap == NULL) -+ return; -+ intel_set_pixmap_bo(pixmap, NULL); -+ FreeScratchPixmapHeader(pixmap); -+} -+ -+static uint32_t -+intel_pixmap_ensure_fb(intel_screen_private *intel, PixmapPtr pixmap) -+{ -+ struct intel_mode *mode = intel->modes; -+ struct intel_pixmap *intel_pixmap = intel_get_pixmap_private(pixmap); -+ int ret; -+ -+ if (intel_pixmap->fb != 0) -+ return intel_pixmap->fb; -+ -+ ret = drmModeAddFB(mode->fd, -+ pixmap->drawable.width, -+ pixmap->drawable.height, -+ intel->scrn->depth, -+ intel->scrn->bitsPerPixel, -+ intel_pixmap_pitch(pixmap), -+ intel_get_pixmap_bo(pixmap)->handle, -+ &intel_pixmap->fb); -+ if (ret < 0) { -+ xf86DrvMsg(intel->scrn->scrnIndex, X_ERROR, -+ "failed to add fb for pixmap: %s\n", -+ strerror(-ret)); -+ return FALSE; -+ } -+ -+ return intel_pixmap->fb; -+} -+ -+void intel_pixmap_remove_fb(intel_screen_private *intel, PixmapPtr pixmap) -+{ -+ struct intel_mode *mode = intel->modes; -+ struct intel_pixmap *intel_pixmap = intel_get_pixmap_private(pixmap); -+ int ret; -+ -+ if (intel_pixmap->fb == 0) -+ return; -+ -+ ret = drmModeRmFB(mode->fd, intel_pixmap->fb); -+ if (ret < 0) { -+ xf86DrvMsg(intel->scrn->scrnIndex, X_ERROR, -+ "failed to remove fb for pixmap: %s\n", -+ strerror(-ret)); -+ } -+ -+ intel_pixmap->fb = 0; -+} -+ - static Bool - intel_crtc_apply(xf86CrtcPtr crtc) - { - ScrnInfoPtr scrn = crtc->scrn; -+ intel_screen_private *intel = intel_get_screen_private(scrn); -+ struct intel_mode *mode = intel->modes; - struct intel_crtc *intel_crtc = crtc->driver_private; -- struct intel_mode *mode = intel_crtc->mode; -+ BoxRec crtc_box; -+ struct intel_scanout *scanout; - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn); - uint32_t *output_ids; - int output_count = 0; -- int fb_id, x, y; -+ uint32_t fb_id; -+ int x, y; - int i, ret = FALSE; - - output_ids = calloc(sizeof(uint32_t), xf86_config->num_output); -@@ -372,9 +472,20 @@ intel_crtc_apply(xf86CrtcPtr crtc) - crtc->gamma_blue, crtc->gamma_size); - #endif - -+ fb_id = mode->front_fb_id; - x = crtc->x; - y = crtc->y; -- fb_id = mode->fb_id; -+ -+ intel_crtc_box(crtc, &crtc_box); -+ if (!intel_find_scanout(intel, &crtc_box, &scanout)) { -+ /* partially intersects a scanout; merge everything */ -+ intel_crtc_merge_scanouts(intel); -+ } -+ if (scanout != NULL) { -+ fb_id = intel_pixmap_ensure_fb(intel, scanout->pixmap); -+ x -= scanout->area.x1; -+ y -= scanout->area.y1; -+ } - if (intel_crtc->rotate_fb_id) { - fb_id = intel_crtc->rotate_fb_id; - x = 0; -@@ -396,7 +507,6 @@ intel_crtc_apply(xf86CrtcPtr crtc) - for (i = 0; i < xf86_config->num_output; i++) { - xf86OutputPtr output = xf86_config->output[i]; - struct intel_output *intel_output; -- - if (output->crtc != crtc) - continue; - -@@ -421,20 +531,20 @@ intel_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, - { - ScrnInfoPtr scrn = crtc->scrn; - intel_screen_private *intel = intel_get_screen_private(scrn); -+ struct intel_mode *intel_mode = intel->modes; - struct intel_crtc *intel_crtc = crtc->driver_private; -- struct intel_mode *intel_mode = intel_crtc->mode; - int saved_x, saved_y; - Rotation saved_rotation; - DisplayModeRec saved_mode; -- int ret = TRUE; -- unsigned int pitch = scrn->displayWidth * intel->cpp; -+ int ret; - -- if (intel_mode->fb_id == 0) { -+ if (intel_mode->front_fb_id == 0) { - ret = drmModeAddFB(intel_mode->fd, - scrn->virtualX, scrn->virtualY, - scrn->depth, scrn->bitsPerPixel, -- pitch, intel->front_buffer->handle, -- &intel_mode->fb_id); -+ scrn->displayWidth * intel->cpp, -+ intel->front_buffer->handle, -+ &intel_mode->front_fb_id); - if (ret < 0) { - ErrorF("failed to add fb\n"); - return FALSE; -@@ -454,14 +564,17 @@ intel_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, - intel_batch_submit(crtc->scrn); - - mode_to_kmode(crtc->scrn, &intel_crtc->kmode, mode); -- ret = intel_crtc_apply(crtc); -- if (!ret) { -- crtc->x = saved_x; -- crtc->y = saved_y; -- crtc->rotation = saved_rotation; -- crtc->mode = saved_mode; -- } -- return ret; -+ if (!intel_crtc_apply(crtc)) -+ goto error_undo; -+ -+ return TRUE; -+ -+error_undo: -+ crtc->x = saved_x; -+ crtc->y = saved_y; -+ crtc->rotation = saved_rotation; -+ crtc->mode = saved_mode; -+ return FALSE; - } - - static void -@@ -1349,31 +1462,51 @@ intel_output_init(ScrnInfoPtr scrn, struct intel_mode *mode, int num) - list_add(&intel_output->link, &mode->outputs); - } - -+static void -+intel_destroy_scanout(struct intel_scanout *scanout) -+{ -+ if (!scanout) -+ return; -+ -+ if (scanout->pixmap) { -+ intel_set_pixmap_bo(scanout->pixmap, NULL); -+ FreeScratchPixmapHeader(scanout->pixmap); -+ } -+ memset(scanout, 0, sizeof(*scanout)); -+} -+ - static Bool - intel_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height) - { - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); -- struct intel_crtc *intel_crtc = xf86_config->crtc[0]->driver_private; -- struct intel_mode *mode = intel_crtc->mode; - intel_screen_private *intel = intel_get_screen_private(scrn); -+ struct intel_mode *mode = intel->modes; - drm_intel_bo *old_front = NULL; -- Bool ret; -+ int ret; - uint32_t old_fb_id; - int i, old_width, old_height, old_pitch; - unsigned long pitch; - uint32_t tiling; - -+ intel_batch_submit(scrn); -+ - if (scrn->virtualX == width && scrn->virtualY == height) - return TRUE; - -- intel_batch_submit(scrn); -+ for (i = 0; i < MAX_SCANOUTS; i++) { -+ intel_destroy_scanout(&mode->scanouts[i]); -+ } -+ mode->scanout_state = INTEL_SCANOUT_INVALID; - - old_width = scrn->virtualX; - old_height = scrn->virtualY; - old_pitch = scrn->displayWidth; -- old_fb_id = mode->fb_id; -+ old_fb_id = mode->front_fb_id; - old_front = intel->front_buffer; - -+ intel->front_buffer = NULL; -+ mode->front_fb_id = 0; -+ - if (intel->back_buffer) { - drm_intel_bo_unreference(intel->back_buffer); - intel->back_buffer = NULL; -@@ -1390,7 +1523,7 @@ intel_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height) - ret = drmModeAddFB(mode->fd, width, height, scrn->depth, - scrn->bitsPerPixel, pitch, - intel->front_buffer->handle, -- &mode->fb_id); -+ &mode->front_fb_id); - if (ret) - goto fail; - -@@ -1426,9 +1559,9 @@ fail: - scrn->virtualX = old_width; - scrn->virtualY = old_height; - scrn->displayWidth = old_pitch; -- if (old_fb_id != mode->fb_id) -- drmModeRmFB(mode->fd, mode->fb_id); -- mode->fb_id = old_fb_id; -+ if (old_fb_id != mode->front_fb_id) -+ drmModeRmFB(mode->fd, mode->front_fb_id); -+ mode->front_fb_id = old_fb_id; - - return FALSE; - } -@@ -1536,86 +1669,408 @@ void intel_copy_fb(ScrnInfoPtr pScrn) - - } - -+static PixmapPtr intel_create_split_fb(intel_screen_private *intel, int width, int height) -+{ -+ ScrnInfoPtr scrn = intel->scrn; -+ drm_intel_bo *pixmap_bo = NULL; -+ PixmapPtr pixmap = NULL; -+ unsigned long pitch; -+ uint32_t tiling; -+ -+ pixmap_bo = intel_allocate_framebuffer(scrn, width, height, intel->cpp, -+ &pitch, &tiling); -+ if (!pixmap_bo) -+ goto fail; -+ -+ pixmap = GetScratchPixmapHeader(scrn->pScreen, -+ width, height, -+ scrn->depth, -+ scrn->bitsPerPixel, -+ pitch, -+ NULL); -+ if (!pixmap) -+ goto fail; -+ -+ intel_set_pixmap_bo(pixmap, pixmap_bo); -+ drm_intel_bo_unreference(pixmap_bo); -+ pixmap_bo = NULL; -+ -+ return pixmap; -+fail: -+ drm_intel_bo_unreference(pixmap_bo); -+ return NULL; -+} -+ - Bool --intel_do_pageflip(intel_screen_private *intel, -- dri_bo *new_front, -- DRI2FrameEventPtr flip_info, int ref_crtc_hw_id) -+intel_split_fb(intel_screen_private *intel) - { - ScrnInfoPtr scrn = intel->scrn; -+ struct intel_mode *mode = intel->modes; - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); -- struct intel_crtc *crtc = config->crtc[0]->driver_private; -- struct intel_mode *mode = crtc->mode; -- unsigned int pitch = scrn->displayWidth * intel->cpp; -- struct intel_pageflip *flip; -- int i, old_fb_id; -+ struct intel_scanout *scanout; -+ PixmapPtr screen_pixmap; -+ BoxRec crtc_box; -+ int i, j, old_state; - -- /* -- * Create a new handle for the back buffer -- */ -- old_fb_id = mode->fb_id; -- if (drmModeAddFB(mode->fd, scrn->virtualX, scrn->virtualY, -- scrn->depth, scrn->bitsPerPixel, pitch, -- new_front->handle, &mode->fb_id)) -- goto error_out; -+ if (mode->scanout_state == INTEL_SCANOUT_SPLIT) -+ return TRUE; /* nothing to do */ -+ -+ old_state = mode->scanout_state; -+ mode->scanout_state = INTEL_SCANOUT_SPLIT; -+ -+ screen_pixmap = intel_get_scratch_front_pixmap(intel); -+ -+ for (i = 0; i < config->num_crtc; i++) { -+ xf86CrtcPtr crtc = config->crtc[i]; -+ if (!crtc->enabled) -+ continue; -+ -+ intel_crtc_box(crtc, &crtc_box); -+ -+ for (j = 0; j < MAX_SCANOUTS; j++) { -+ scanout = &mode->scanouts[j]; -+ if (scanout->pixmap == NULL) -+ break; /* beyond the last valid entry */ -+ -+ if (crtc_box.x1 == scanout->area.x1 && -+ crtc_box.y1 == scanout->area.y1 && -+ crtc_box.x2 == scanout->area.x2 && -+ crtc_box.y2 == scanout->area.y2) -+ break; /* already have a scanout for this crtc */ -+ } -+ if (j == MAX_SCANOUTS) { -+ xf86DrvMsg(intel->scrn->scrnIndex, X_WARNING, -+ "failed to split framebuffer: all scanouts in use\n"); -+ goto fail; -+ } -+ -+ if (scanout->pixmap) -+ continue; /* already have a complete scanout for this crtc */ -+ -+ /* need to allocate a new scanout bo for this crtc */ -+ scanout->pixmap = intel_create_split_fb(intel, -+ crtc->mode.HDisplay, crtc->mode.VDisplay); -+ if (!scanout->pixmap) { -+ xf86DrvMsg(intel->scrn->scrnIndex, X_WARNING, -+ "failed to split framebuffer: allocation failure\n"); -+ goto fail; -+ } -+ -+ scanout->area.x1 = crtc_box.x1; -+ scanout->area.y1 = crtc_box.y1; -+ scanout->area.x2 = crtc_box.x2; -+ scanout->area.y2 = crtc_box.y2; -+ -+ if (old_state == INTEL_SCANOUT_FRONT) { -+ /* copy current content from the front buffer */ -+ intel_uxa_driver_copy_pixmap(intel, -+ screen_pixmap, scanout->pixmap, -+ crtc_box.x1, crtc_box.y1, 0, 0, -+ crtc_box.x2 - crtc_box.x1, -+ crtc_box.y2 - crtc_box.y1); -+ } -+ } - - intel_batch_submit(scrn); - -- /* -- * Queue flips on all enabled CRTCs -- * Note that if/when we get per-CRTC buffers, we'll have to update this. -- * Right now it assumes a single shared fb across all CRTCs, with the -- * kernel fixing up the offset of each CRTC as necessary. -- * -- * Also, flips queued on disabled or incorrectly configured displays -- * may never complete; this is a configuration error. -- */ -- mode->fe_frame = 0; -- mode->fe_tv_sec = 0; -- mode->fe_tv_usec = 0; -+ for (i = 0; i < config->num_crtc; i++) { -+ xf86CrtcPtr crtc = config->crtc[i]; -+ if (!crtc->enabled) -+ continue; -+ -+ if (!intel_crtc_apply(crtc)) -+ goto fail; -+ } -+ -+ intel_free_scratch_front_pixmap(screen_pixmap); -+ -+ return TRUE; -+ -+fail: -+ mode->scanout_state = old_state; -+ intel_free_scratch_front_pixmap(screen_pixmap); -+ return FALSE; -+} -+ -+static void -+intel_crtc_merge_scanouts(intel_screen_private *intel) -+{ -+ struct intel_mode *mode = intel->modes; -+ PixmapPtr screen_pixmap; -+ int i, old_state; -+ -+ old_state = mode->scanout_state; -+ mode->scanout_state = INTEL_SCANOUT_FRONT; -+ -+ screen_pixmap = intel_get_scratch_front_pixmap(intel); -+ -+ for (i = 0; i < MAX_SCANOUTS; i++) { -+ struct intel_scanout *scanout = &mode->scanouts[i]; -+ if (scanout->pixmap == NULL) -+ continue; -+ -+ if (old_state == INTEL_SCANOUT_SPLIT) { -+ /* copy current content from the split buffer */ -+ intel_uxa_driver_copy_pixmap(intel, -+ scanout->pixmap, screen_pixmap, -+ 0, 0, -+ scanout->area.x1, scanout->area.y1, -+ scanout->area.x2 - scanout->area.x1, -+ scanout->area.y2 - scanout->area.y1); -+ } -+ -+ intel_destroy_scanout(scanout); -+ } -+ -+ intel_free_scratch_front_pixmap(screen_pixmap); -+} -+ -+void -+intel_merge_fb(intel_screen_private *intel) -+{ -+ ScrnInfoPtr scrn = intel->scrn; -+ struct intel_mode *mode = intel->modes; -+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); -+ int i; -+ -+ if (mode->scanout_state == INTEL_SCANOUT_FRONT) -+ return; /* nothing to do */ -+ -+ intel_crtc_merge_scanouts(intel); -+ intel_batch_submit(scrn); - - for (i = 0; i < config->num_crtc; i++) { -- if (!config->crtc[i]->enabled) -+ xf86CrtcPtr crtc = config->crtc[i]; -+ if (!crtc->enabled) - continue; - -- mode->flip_info = flip_info; -- mode->flip_count++; -+ if (!intel_crtc_apply(crtc)) -+ continue; /* update as many crtcs as possible */ -+ } -+} -+ -+Bool -+intel_find_scanout(intel_screen_private *intel, BoxPtr area, -+ struct intel_scanout **out_scanout) -+{ -+ struct intel_mode *mode = intel->modes; -+ BoxRec intersect_box; -+ int i; -+ -+ *out_scanout = NULL; -+ -+ if (mode->scanout_state != INTEL_SCANOUT_SPLIT) -+ return TRUE; /* always use screen buffer */ -+ -+ for (i = 0; i < MAX_SCANOUTS; i++) { -+ struct intel_scanout *scanout = &mode->scanouts[i]; -+ if (scanout->pixmap == NULL) -+ continue; -+ -+ if (scanout->area.x1 == area->x1 && -+ scanout->area.y1 == area->y1 && -+ scanout->area.x2 == area->x2 && -+ scanout->area.y2 == area->y2) { -+ *out_scanout = scanout; -+ return TRUE; -+ } -+ -+ intel_box_intersect(&intersect_box, &scanout->area, area); -+ if (intersect_box.x1 != intersect_box.x2 || -+ intersect_box.y1 != intersect_box.y2) { -+ /* partial intersection; must merge to use area. */ -+ return FALSE; -+ } -+ } - -- crtc = config->crtc[i]->driver_private; -+ /* did not intersect any scanouts; use the screen. */ -+ return TRUE; -+} - -- flip = calloc(1, sizeof(struct intel_pageflip)); -- if (flip == NULL) { -+Bool -+intel_covering_scanout(intel_screen_private *intel, BoxPtr area, -+ struct intel_scanout **out_scanout) -+{ -+ struct intel_mode *mode = intel->modes; -+ BoxRec intersect_box; -+ int i; -+ -+ *out_scanout = NULL; -+ -+ if (mode->scanout_state != INTEL_SCANOUT_SPLIT) -+ return TRUE; /* always use screen buffer */ -+ -+ for (i = 0; i < MAX_SCANOUTS; i++) { -+ struct intel_scanout *scanout = &mode->scanouts[i]; -+ if (scanout->pixmap == NULL) -+ continue; -+ -+ if (scanout->area.x1 <= area->x1 && -+ scanout->area.y1 <= area->y1 && -+ scanout->area.x2 >= area->x2 && -+ scanout->area.y2 >= area->y2) { -+ *out_scanout = scanout; -+ return TRUE; -+ } -+ -+ intel_box_intersect(&intersect_box, &scanout->area, area); -+ if (intersect_box.x1 != intersect_box.x2 || -+ intersect_box.y1 != intersect_box.y2) { -+ /* partial intersection; must merge to use area. */ -+ return FALSE; -+ } -+ } -+ -+ /* did not intersect any scanouts; use the screen. */ -+ return TRUE; -+} -+ -+Bool -+intel_do_pageflip(intel_screen_private *intel, -+ PixmapPtr new_front, -+ DRI2FrameEventPtr flip_info) -+{ -+ struct intel_mode *mode = intel->modes; -+ ScrnInfoPtr scrn = intel->scrn; -+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); -+ struct intel_pageflip **flip_data = NULL; -+ uint32_t new_front_fb_id; -+ struct intel_crtc *reference_crtc; -+ BoxRec crtc_box, intersect_box; -+ int i, ret; -+ -+ if (mode->scanout_state == INTEL_SCANOUT_INVALID) { -+ xf86DrvMsg(scrn->scrnIndex, X_WARNING, -+ "flip queue failed: scanout state not configured.\n"); -+ return FALSE; -+ } -+ -+ new_front_fb_id = intel_pixmap_ensure_fb(intel, new_front); -+ if (new_front_fb_id == 0) -+ goto error_undo; -+ -+ flip_data = calloc(config->num_crtc, sizeof(*flip_data)); -+ if (!flip_data) { -+ xf86DrvMsg(scrn->scrnIndex, X_WARNING, -+ "flip queue failed: memory allocation error.\n"); -+ goto error_undo; -+ } -+ -+ /* Find the reference CRTC, check safety and allocate flip data. */ -+ reference_crtc = NULL; -+ for (i = 0; i < config->num_crtc; i++) { -+ xf86CrtcPtr crtc = config->crtc[i]; -+ struct intel_crtc *intel_crtc = crtc->driver_private; -+ if (!crtc->enabled) -+ continue; -+ -+ if (flip_info->pipe == intel_crtc->pipe) -+ reference_crtc = intel_crtc; -+ -+ intel_crtc_box(crtc, &crtc_box); -+ intel_box_intersect(&intersect_box, &crtc_box, &flip_info->area); -+ -+ if (intersect_box.x1 == intersect_box.x2 || -+ intersect_box.y1 == intersect_box.y2) { -+ /* Skip crtcs unaffected by this update. */ -+ if (reference_crtc == intel_crtc) { -+ xf86DrvMsg(scrn->scrnIndex, X_WARNING, -+ "flip queue failed: updated area does " -+ "not include the reference crtc.\n"); -+ goto error_undo; -+ } -+ continue; -+ } -+ -+ if (intersect_box.x1 != crtc_box.x1 || -+ intersect_box.y1 != crtc_box.y1 || -+ intersect_box.x2 != crtc_box.x2 || -+ intersect_box.y2 != crtc_box.y2) { - xf86DrvMsg(scrn->scrnIndex, X_WARNING, -- "flip queue: carrier alloc failed.\n"); -+ "flip queue failed: updated area partially " -+ "intersects crtc %d.\n", -+ crtc_id(intel_crtc)); - goto error_undo; - } - -- /* Only the reference crtc will finally deliver its page flip -- * completion event. All other crtc's events will be discarded. -- */ -- flip->dispatch_me = (intel_crtc_to_pipe(crtc->crtc) == ref_crtc_hw_id); -- flip->mode = mode; -+ flip_data[i] = calloc(1, sizeof(**flip_data)); -+ if (!flip_data[i]) { -+ xf86DrvMsg(scrn->scrnIndex, X_WARNING, -+ "flip queue failed: memory allocation error.\n"); -+ goto error_undo; -+ } -+ } -+ if (reference_crtc == NULL) { -+ xf86DrvMsg(scrn->scrnIndex, X_WARNING, -+ "flip queue failed: no reference crtc for pipe %d.\n", -+ flip_info->pipe); -+ goto error_undo; -+ } -+ if (reference_crtc->flip.info) { -+ xf86DrvMsg(scrn->scrnIndex, X_WARNING, -+ "flip queue failed: reference crtc %d (for pipe %d) " -+ "already has a flip pending.\n", -+ crtc_id(reference_crtc), -+ flip_info->pipe); -+ goto error_undo; -+ } -+ -+ intel_batch_submit(scrn); -+ -+ reference_crtc->flip.pending = 0; -+ reference_crtc->flip.frame = 0; -+ reference_crtc->flip.tv_sec = 0; -+ reference_crtc->flip.tv_usec = 0; -+ -+ /* Defer storing the flip info until we have successfully queued all of -+ * the flips. If this function returns FALSE, the caller will free the -+ * flip_info structure, so any successful flips must not access it. -+ */ -+ reference_crtc->flip.info = NULL; -+ -+ /* -+ * Queue flips on all updated CRTCs. -+ * Flips queued on disabled or incorrectly-configured crtcs may never -+ * complete. This type of configuration error will result in the -+ * flip never completing, and leak some objects. -+ */ -+ for (i = 0; i < config->num_crtc; i++) { -+ struct intel_crtc *intel_crtc = config->crtc[i]->driver_private; -+ if (!flip_data[i]) -+ continue; -+ -+ flip_data[i]->reference_crtc = reference_crtc; -+ flip_data[i]->flipped_crtc = intel_crtc; - -- if (drmModePageFlip(mode->fd, -- crtc_id(crtc), -- mode->fb_id, -- DRM_MODE_PAGE_FLIP_EVENT, flip)) { -+ ret = drmModePageFlip(mode->fd, -+ crtc_id(intel_crtc), -+ new_front_fb_id, -+ DRM_MODE_PAGE_FLIP_EVENT, -+ flip_data[i]); -+ if (ret < 0) { - xf86DrvMsg(scrn->scrnIndex, X_WARNING, -- "flip queue failed: %s\n", strerror(errno)); -- free(flip); -+ "flip queue failed: error flipping crtc %d: %s\n", -+ crtc_id(intel_crtc), strerror(-ret)); - goto error_undo; - } -+ /* The flip_data object will be freed when the flip completes. */ -+ flip_data[i] = NULL; -+ -+ reference_crtc->flip.pending++; - } - -- mode->old_fb_id = old_fb_id; -+ reference_crtc->flip.info = flip_info; -+ free(flip_data); - return TRUE; - - error_undo: -- drmModeRmFB(mode->fd, mode->fb_id); -- mode->fb_id = old_fb_id; -- --error_out: -- xf86DrvMsg(scrn->scrnIndex, X_WARNING, "Page flip failed: %s\n", -- strerror(errno)); -+ if (flip_data) { -+ /* Free any unused flip data objects. */ -+ for (i = 0; i < config->num_crtc; i++) { -+ free(flip_data[i]); -+ } -+ free(flip_data); -+ } - return FALSE; - } - -@@ -1635,31 +2090,33 @@ intel_page_flip_handler(int fd, unsigned int frame, unsigned int tv_sec, - unsigned int tv_usec, void *event_data) - { - struct intel_pageflip *flip = event_data; -- struct intel_mode *mode = flip->mode; -- -- /* Is this the event whose info shall be delivered to higher level? */ -- if (flip->dispatch_me) { -- /* Yes: Cache msc, ust for later delivery. */ -- mode->fe_frame = frame; -- mode->fe_tv_sec = tv_sec; -- mode->fe_tv_usec = tv_usec; -+ struct intel_crtc *reference_crtc = flip->reference_crtc; -+ struct intel_crtc *flipped_crtc = flip->flipped_crtc; -+ -+ if (reference_crtc == flipped_crtc) { -+ /* Cache information from the reference crtc's flip for the event handler. */ -+ reference_crtc->flip.frame = frame; -+ reference_crtc->flip.tv_sec = tv_sec; -+ reference_crtc->flip.tv_usec = tv_usec; - } -+ - free(flip); - -- /* Last crtc completed flip? */ -- mode->flip_count--; -- if (mode->flip_count > 0) -+ /* Was this the last pending flip? */ -+ reference_crtc->flip.pending--; -+ if (reference_crtc->flip.pending > 0) - return; - -- /* Release framebuffer */ -- drmModeRmFB(mode->fd, mode->old_fb_id); -- -- if (mode->flip_info == NULL) -+ if (reference_crtc->flip.info == NULL) - return; - -- /* Deliver cached msc, ust from reference crtc to flip event handler */ -- I830DRI2FlipEventHandler(mode->fe_frame, mode->fe_tv_sec, -- mode->fe_tv_usec, mode->flip_info); -+ /* Deliver cached info from reference crtc to flip event handler */ -+ I830DRI2FlipEventHandler( -+ reference_crtc->flip.frame, -+ reference_crtc->flip.tv_sec, -+ reference_crtc->flip.tv_usec, -+ reference_crtc->flip.info); -+ reference_crtc->flip.info = NULL; - } - - static void -@@ -1714,6 +2171,7 @@ Bool intel_mode_pre_init(ScrnInfoPtr scrn, int fd, int cpp) - - for (i = 0; i < mode->mode_res->count_connectors; i++) - intel_output_init(scrn, mode, i); -+ intel_output_init(scrn, mode, i); - - xf86InitialConfiguration(scrn, TRUE); - -@@ -1746,7 +2204,6 @@ intel_mode_init(struct intel_screen_private *intel) - * feedback on every server generation, so perform the - * registration within ScreenInit and not PreInit. - */ -- mode->flip_count = 0; - AddGeneralSocket(mode->fd); - RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, - drm_wakeup_handler, mode); -@@ -1758,9 +2215,9 @@ intel_mode_remove_fb(intel_screen_private *intel) - { - struct intel_mode *mode = intel->modes; - -- if (mode->fb_id) { -- drmModeRmFB(mode->fd, mode->fb_id); -- mode->fb_id = 0; -+ if (mode->front_fb_id != 0) { -+ drmModeRmFB(mode->fd, mode->front_fb_id); -+ mode->front_fb_id = 0; - } - } - -@@ -1768,6 +2225,7 @@ void - intel_mode_fini(intel_screen_private *intel) - { - struct intel_mode *mode = intel->modes; -+ int i; - - while(!list_is_empty(&mode->crtcs)) { - xf86CrtcDestroy(list_first_entry(&mode->crtcs, -@@ -1781,8 +2239,9 @@ intel_mode_fini(intel_screen_private *intel) - link)->output); - } - -- if (mode->fb_id) -- drmModeRmFB(mode->fd, mode->fb_id); -+ for (i = 0; i < MAX_SCANOUTS; i++) { -+ intel_destroy_scanout(&mode->scanouts[i]); -+ } - - /* mode->rotate_fb_id should have been destroyed already */ - -diff --git a/src/intel_dri.c b/src/intel_dri.c -index 938a022..d8768a6 100644 ---- a/src/intel_dri.c -+++ b/src/intel_dri.c -@@ -457,6 +457,12 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion, - ? drawable : &dstPrivate->pixmap->drawable; - RegionPtr pCopyClip; - GCPtr gc; -+ BoxRec draw_box; -+ struct intel_scanout *scanout; -+ -+ if (pRegion->extents.x1 == pRegion->extents.x2 || -+ pRegion->extents.y1 == pRegion->extents.y2) -+ return; /* nothing actually being copied */ - - gc = GetScratchGC(dst->depth, screen); - if (!gc) -@@ -542,6 +548,22 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion, - } - } - -+ if (pixmap_is_scanout(get_drawable_pixmap(dst))) { -+ intel_drawable_box(drawable, &draw_box); -+ if (!intel_find_scanout(intel, &draw_box, &scanout) || scanout == NULL) -+ intel_merge_fb(intel); -+ else -+ dst = &scanout->pixmap->drawable; -+ } -+ -+ if (pixmap_is_scanout(get_drawable_pixmap(src))) { -+ intel_drawable_box(drawable, &draw_box); -+ if (!intel_find_scanout(intel, &draw_box, &scanout) || scanout == NULL) -+ intel_merge_fb(intel); -+ else -+ src = &scanout->pixmap->drawable; -+ } -+ - /* It's important that this copy gets submitted before the - * direct rendering client submits rendering for the next - * frame, but we don't actually need to submit right now. The -@@ -764,10 +786,11 @@ i830_dri2_del_frame_event(DrawablePtr drawable, DRI2FrameEventPtr info) - static void - I830DRI2ExchangeBuffers(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr back) - { -+ ScreenPtr pScreen = draw->pScreen; -+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; -+ intel_screen_private *intel = intel_get_screen_private(scrn); - I830DRI2BufferPrivatePtr front_priv, back_priv; - struct intel_pixmap *front_intel, *back_intel; -- ScreenPtr screen; -- intel_screen_private *intel; - int tmp; - - front_priv = front->driverPrivate; -@@ -784,14 +807,42 @@ I830DRI2ExchangeBuffers(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr bac - intel_set_pixmap_private(front_priv->pixmap, back_intel); - intel_set_pixmap_private(back_priv->pixmap, front_intel); - -- screen = draw->pScreen; -- intel = intel_get_screen_private(xf86Screens[screen->myNum]); -- - dri_bo_unreference (intel->front_buffer); - intel->front_buffer = back_intel->bo; - dri_bo_reference (intel->front_buffer); - -- intel_set_pixmap_private(screen->GetScreenPixmap(screen), back_intel); -+ intel_set_pixmap_private(pScreen->GetScreenPixmap(pScreen), back_intel); -+ back_intel->busy = 1; -+ front_intel->busy = -1; -+} -+ -+static void -+I830DRI2ExchangeBuffersSplit(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr back) -+{ -+ ScreenPtr pScreen = draw->pScreen; -+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; -+ intel_screen_private *intel = intel_get_screen_private(scrn); -+ I830DRI2BufferPrivatePtr back_priv; -+ struct intel_pixmap *front_intel, *back_intel; -+ struct intel_scanout *scanout; -+ BoxRec draw_box; -+ -+ back_priv = back->driverPrivate; -+ -+ intel_drawable_box(draw, &draw_box); -+ if (!intel_find_scanout(intel, &draw_box, &scanout) || scanout == NULL) { -+ xf86DrvMsg(intel->scrn->scrnIndex, X_WARNING, -+ "failed to exchange with scanout"); -+ return; -+ } -+ -+ front_intel = intel_get_pixmap_private(scanout->pixmap); -+ back_intel = intel_get_pixmap_private(back_priv->pixmap); -+ intel_set_pixmap_private(scanout->pixmap, back_intel); -+ intel_set_pixmap_private(back_priv->pixmap, front_intel); -+ -+ back->name = pixmap_flink(back_priv->pixmap); -+ - back_intel->busy = 1; - front_intel->busy = -1; - } -@@ -806,16 +857,19 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel, - DRI2FrameEventPtr info) - { - I830DRI2BufferPrivatePtr priv = info->back->driverPrivate; -- drm_intel_bo *new_back, *old_back; -+ drm_intel_bo *new_back; - - if (!intel->use_triple_buffer) { -- if (!intel_do_pageflip(intel, -- intel_get_pixmap_bo(priv->pixmap), -- info, info->pipe)) -+ if (!intel_do_pageflip(intel, priv->pixmap, info)) - return FALSE; - -- info->type = DRI2_SWAP; -- I830DRI2ExchangeBuffers(draw, info->front, info->back); -+ if (info->type == DRI2_FLIP_SPLIT) { -+ info->type = DRI2_SWAP; -+ I830DRI2ExchangeBuffersSplit(draw, info->front, info->back); -+ } else { -+ info->type = DRI2_SWAP; -+ I830DRI2ExchangeBuffers(draw, info->front, info->back); -+ } - return TRUE; - } - -@@ -846,8 +900,7 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel, - intel->back_buffer = NULL; - } - -- old_back = intel_get_pixmap_bo(priv->pixmap); -- if (!intel_do_pageflip(intel, old_back, info, info->pipe)) { -+ if (!intel_do_pageflip(intel, priv->pixmap, info)) { - intel->back_buffer = new_back; - return FALSE; - } -@@ -916,6 +969,79 @@ can_exchange(DrawablePtr drawable, DRI2BufferPtr front, DRI2BufferPtr back) - return TRUE; - } - -+static Bool -+can_exchange_split(DrawablePtr drawable, DRI2BufferPtr front, DRI2BufferPtr back) -+{ -+ struct intel_screen_private *intel = intel_get_screen_private(xf86Screens[drawable->pScreen->myNum]); -+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(intel->scrn); -+ I830DRI2BufferPrivatePtr front_priv = front->driverPrivate; -+ I830DRI2BufferPrivatePtr back_priv = back->driverPrivate; -+ PixmapPtr front_pixmap = front_priv->pixmap; -+ PixmapPtr back_pixmap = back_priv->pixmap; -+ struct intel_pixmap *front_intel = intel_get_pixmap_private(front_pixmap); -+ struct intel_pixmap *back_intel = intel_get_pixmap_private(back_pixmap); -+ WindowPtr draw_win; -+ Bool found_match, found_conflict; -+ BoxRec draw_box, crtc_box, intersect_box; -+ int i; -+ -+ if (drawable == NULL || -+ drawable->type != DRAWABLE_WINDOW || -+ intel->shadow_present || -+ !intel->use_pageflipping || -+ !intel->use_split_framebuffer) -+ return FALSE; -+ -+ if (!pixmap_is_scanout(front_pixmap)) -+ return FALSE; -+ -+ /* Reject cases where the drawable and backing store have different -+ * sizes. This occurs occasionally when a resize and an update happen -+ * simultaneously. */ -+ if (drawable->width != back_pixmap->drawable.width || -+ drawable->height != back_pixmap->drawable.height) -+ return FALSE; -+ -+ /* Reported depth differs because the scanout pixmap has no alpha, -+ * however the formats are still interchangeable. */ -+ if (front_pixmap->drawable.bitsPerPixel != back_pixmap->drawable.bitsPerPixel || -+ front_intel->tiling != back_intel->tiling) -+ return FALSE; -+ -+ /* Can only do a split exchange if the window is completely exposed. */ -+ draw_win = (WindowPtr)drawable; -+ if (!RegionEqual(&draw_win->clipList, &draw_win->winSize)) -+ return FALSE; -+ -+ /* Only split if the area matches at least one crtc, and does not -+ * partially intersect any crtcs. */ -+ found_match = FALSE; -+ found_conflict = FALSE; -+ intel_drawable_box(drawable, &draw_box); -+ for (i = 0; i < config->num_crtc; i++) { -+ xf86CrtcPtr crtc = config->crtc[i]; -+ if (!crtc->enabled) -+ continue; -+ -+ intel_crtc_box(crtc, &crtc_box); -+ if (crtc_box.x1 == draw_box.x1 && -+ crtc_box.y1 == draw_box.y1 && -+ crtc_box.x2 == draw_box.x2 && -+ crtc_box.y2 == draw_box.y2) { -+ /* regions are equal, so can flip with this crtc */ -+ found_match = TRUE; -+ continue; -+ } -+ -+ /* not equal, so any intersection indicates a conflict */ -+ intel_box_intersect(&intersect_box, &draw_box, &crtc_box); -+ if (intersect_box.x1 != intersect_box.x2 && -+ intersect_box.y1 != intersect_box.y2) -+ found_conflict = TRUE; -+ } -+ return found_match && !found_conflict; -+} -+ - void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec, - unsigned int tv_usec, DRI2FrameEventPtr swap_info) - { -@@ -935,11 +1061,18 @@ void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec, - - - switch (swap_info->type) { -- case DRI2_FLIP: -+ case DRI2_FLIP_SPLIT: -+ if (can_exchange_split(drawable, swap_info->front, swap_info->back)) { -+ if (I830DRI2ScheduleFlip(intel, drawable, swap_info)) -+ return; -+ } -+ -+ case DRI2_FLIP_FRONT: - /* If we can still flip... */ -- if (can_exchange(drawable, swap_info->front, swap_info->back) && -- I830DRI2ScheduleFlip(intel, drawable, swap_info)) -- return; -+ if (can_exchange(drawable, swap_info->front, swap_info->back)) { -+ if (I830DRI2ScheduleFlip(intel, drawable, swap_info)) -+ return; -+ } - - /* else fall through to exchange/blit */ - case DRI2_SWAP: { -@@ -1124,6 +1257,7 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, - swap_info->front = front; - swap_info->back = back; - swap_info->pipe = I830DRI2DrawablePipe(draw); -+ intel_drawable_box(draw, &swap_info->area); - - if (!i830_dri2_add_frame_event(swap_info)) { - free(swap_info); -@@ -1151,7 +1285,13 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, - - /* Flips need to be submitted one frame before */ - if (can_exchange(draw, front, back)) { -- swap_type = DRI2_FLIP; -+ intel_merge_fb(intel); -+ swap_type = DRI2_FLIP_FRONT; -+ flip = 1; -+ } else if (can_exchange_split(draw, front, back)) { -+ if (!intel_split_fb(intel)) -+ goto blit_fallback; -+ swap_type = DRI2_FLIP_SPLIT; - flip = 1; - } else { - /* Using the DRI2_SWAP path defers the back-to-front blit until -@@ -1163,7 +1303,7 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, - } - swap_info->type = swap_type; - -- /* Correct target_msc by 'flip' if swap_type == DRI2_FLIP. -+ /* Correct target_msc by 'flip' if swap_type == DRI2_FLIP_*. - * Do it early, so handling of different timing constraints - * for divisor, remainder and msc vs. target_msc works. - */ -diff --git a/src/intel_driver.c b/src/intel_driver.c -index cdd7713..12ff9a1 100644 ---- a/src/intel_driver.c -+++ b/src/intel_driver.c -@@ -101,6 +101,7 @@ typedef enum { - OPTION_DEBUG_WAIT, - OPTION_HOTPLUG, - OPTION_RELAXED_FENCING, -+ OPTION_SPLIT_FRAMEBUFFER, - } I830Opts; - - static OptionInfoRec I830Options[] = { -@@ -122,6 +123,7 @@ static OptionInfoRec I830Options[] = { - {OPTION_DEBUG_WAIT, "DebugWait", OPTV_BOOLEAN, {0}, FALSE}, - {OPTION_HOTPLUG, "HotPlug", OPTV_BOOLEAN, {0}, TRUE}, - {OPTION_RELAXED_FENCING, "RelaxedFencing", OPTV_BOOLEAN, {0}, TRUE}, -+ {OPTION_SPLIT_FRAMEBUFFER, "SplitFramebuffer", OPTV_BOOLEAN, {0}, TRUE}, - {-1, NULL, OPTV_NONE, {0}, FALSE} - }; - /* *INDENT-ON* */ -@@ -669,6 +671,14 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Triple buffering? %s\n", - intel->use_triple_buffer ? "enabled" : "disabled"); - -+ intel->use_split_framebuffer = -+ xf86ReturnOptValBool(intel->Options, -+ OPTION_SPLIT_FRAMEBUFFER, -+ TRUE); -+ xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Split framebuffer? %s\n", -+ intel->use_split_framebuffer ? "enabled" : "disabled"); -+ -+ - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Framebuffer %s\n", - intel->tiling & INTEL_TILING_FB ? "tiled" : "linear"); - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Pixmaps %s\n", -diff --git a/src/intel_uxa.c b/src/intel_uxa.c -index b55b285..c811fbe 100644 ---- a/src/intel_uxa.c -+++ b/src/intel_uxa.c -@@ -636,6 +636,7 @@ void intel_set_pixmap_bo(PixmapPtr pixmap, dri_bo * bo) - if (priv->bo == bo) - return; - -+ intel_pixmap_remove_fb(intel, pixmap); - priv->dst_bound = priv->src_bound = 0; - if (list_is_empty(&priv->batch)) { - dri_bo_unreference(priv->bo); -@@ -704,6 +705,9 @@ static Bool intel_uxa_prepare_access(PixmapPtr pixmap, uxa_access_t access) - dri_bo *bo = priv->bo; - int ret; - -+ if (pixmap_is_scanout(pixmap)) -+ intel_merge_fb(intel); -+ - if (!list_is_empty(&priv->batch) && - (access == UXA_ACCESS_RW || priv->batch_write)) - intel_batch_submit(scrn); -@@ -765,8 +769,13 @@ static Bool intel_uxa_put_image(PixmapPtr pixmap, - int w, int h, - char *src, int src_pitch) - { -+ ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum]; -+ intel_screen_private *intel = intel_get_screen_private(scrn); - struct intel_pixmap *priv; - -+ if (pixmap_is_scanout(pixmap)) -+ intel_merge_fb(intel); -+ - priv = intel_get_pixmap_private(pixmap); - if (!intel_pixmap_is_busy(priv)) { - /* bo is not busy so can be replaced without a stall, upload in-place. */ -@@ -882,6 +891,8 @@ static Bool intel_uxa_get_image(PixmapPtr pixmap, - int w, int h, - char *dst, int dst_pitch) - { -+ ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum]; -+ intel_screen_private *intel = intel_get_screen_private(scrn); - struct intel_pixmap *priv; - PixmapPtr scratch = NULL; - Bool ret; -@@ -893,6 +904,24 @@ static Bool intel_uxa_get_image(PixmapPtr pixmap, - * Also the gpu is much faster at detiling. - */ - -+ if (pixmap_is_scanout(pixmap)) { -+ struct intel_scanout *scanout; -+ BoxRec get_box; -+ -+ get_box.x1 = x; -+ get_box.x2 = x + w; -+ get_box.y1 = y; -+ get_box.y2 = y + h; -+ if (!intel_covering_scanout(intel, &get_box, &scanout) || scanout == NULL) { -+ intel_merge_fb(intel); -+ } else { -+ /* Adjust the copy to come from the scanout. */ -+ pixmap = scanout->pixmap; -+ x -= scanout->area.x1; -+ y -= scanout->area.y1; -+ } -+ } -+ - priv = intel_get_pixmap_private(pixmap); - if (intel_pixmap_is_busy(priv) || priv->tiling != I915_TILING_NONE) { - ScreenPtr screen = pixmap->drawable.pScreen; -@@ -1191,6 +1220,25 @@ intel_limits_init(intel_screen_private *intel) - } - } - -+Bool -+intel_uxa_driver_copy_pixmap(intel_screen_private *intel, -+ PixmapPtr src, PixmapPtr dst, -+ int src_x, int src_y, -+ int dst_x, int dst_y, -+ int w, int h) -+{ -+ if (!intel->uxa_driver->check_copy(src, dst, GXcopy, FB_ALLONES)) -+ return FALSE; -+ -+ if (!intel->uxa_driver->prepare_copy(src, dst, -1, -1, -+ GXcopy, FB_ALLONES)) -+ return FALSE; -+ -+ intel->uxa_driver->copy(dst, src_x, src_y, dst_x, dst_y, w, h); -+ intel->uxa_driver->done_copy(dst); -+ return TRUE; -+} -+ - Bool intel_uxa_init(ScreenPtr screen) - { - ScrnInfoPtr scrn = xf86Screens[screen->myNum]; -diff --git a/src/intel_video.c b/src/intel_video.c -index 021ca5f..17fd0d7 100644 ---- a/src/intel_video.c -+++ b/src/intel_video.c -@@ -1033,7 +1033,7 @@ I830CopyPlanarData(intel_adaptor_private *adaptor_priv, - return TRUE; - } - --static void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b) -+void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b) - { - dest->x1 = a->x1 > b->x1 ? a->x1 : b->x1; - dest->x2 = a->x2 < b->x2 ? a->x2 : b->x2; -@@ -1043,7 +1043,7 @@ static void intel_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b) - dest->x1 = dest->x2 = dest->y1 = dest->y2 = 0; - } - --static void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box) -+void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box) - { - if (crtc->enabled) { - crtc_box->x1 = crtc->x; -@@ -1056,6 +1056,13 @@ static void intel_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box) - crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0; - } - -+void intel_drawable_box(DrawablePtr draw, BoxPtr draw_box) { -+ draw_box->x1 = draw->x; -+ draw_box->x2 = draw->x + draw->width; -+ draw_box->y1 = draw->y; -+ draw_box->y2 = draw->y + draw->height; -+} -+ - static int intel_box_area(BoxPtr box) - { - return (int)(box->x2 - box->x1) * (int)(box->y2 - box->y1); --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0-r9.ebuild deleted file mode 100644 index 3183eb4fae..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0-r9.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0.ebuild,v 1.1 2011/08/11 15:51:43 chithanh Exp $ - -EAPI=4 - -XORG_DRI=dri -inherit linux-info xorg-2 - -DESCRIPTION="X.Org driver for Intel cards" - -KEYWORDS="amd64 ~ia64 x86 -x86-fbsd" -IUSE="dri sna xvmc broken_partialswaps" - -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 - )" -DEPEND="${RDEPEND} - >=x11-proto/dri2proto-2.6" - -PATCHES=( - # Copy the initial framebuffer contents when starting X so we can get - # seamless transitions. - "${FILESDIR}/2.16.0-copy-fb.patch" - # Prevent X from touching boot-time gamma settings. - "${FILESDIR}/2.14.0-no-gamma.patch" - # BLT ring hang fix. - "${FILESDIR}/2.16.0-blt-hang.patch" - # Disable backlight adjustments on DPMS mode changes. - "${FILESDIR}/2.16.0-no-backlight.patch" - # Avoid display corruption when unable to flip - "${FILESDIR}/2.16.0-fix-blt-damage.patch" - # Split framebuffer and flip crtcs indepenently. - "${FILESDIR}/2.16.0-per-crtc-flip.patch" -) - -src_prepare() { - # Disable triple buffering since we need double buffering - # to implement partial updates on top of flips - if use broken_partialswaps; then - PATCHES+=( - "${FILESDIR}/2.16.0-no-triple.patch" - ) - fi - - for patch_file in "${PATCHES[@]}"; do - epatch $patch_file - done -} - -pkg_setup() { - xorg-2_pkg_setup - CONFIGURE_OPTIONS="$(use_enable dri) --disable-xvmc --enable-kms-only" -} - -pkg_postinst() { - if linux_config_exists \ - && ! linux_chkconfig_present DRM_I915_KMS; then - echo - ewarn "This driver requires KMS support in your kernel" - ewarn " Device Drivers --->" - ewarn " Graphics support --->" - ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->" - ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->" - ewarn " i915 driver" - ewarn " [*] Enable modesetting on intel by default" - echo - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/Manifest deleted file mode 100644 index d950086f82..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xf86-video-vesa-2.3.0.tar.bz2 264539 RMD160 7e7c11f6cc094bb898c57d26a70f6c4c0ab83d0f SHA1 4689b7c295d7a8d7326302dafecb812739617134 SHA256 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-domainiobase.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-domainiobase.patch deleted file mode 100644 index e27a355d48..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-domainiobase.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/vesa.c b/src/vesa.c -index 61d3550..1136ac3 100644 ---- a/src/vesa.c -+++ b/src/vesa.c -@@ -1299,3 +1299,7 @@ VESAMapVidMem(ScrnInfoPtr pScrn) -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - pVesa->ioBase = pScrn->domainIOBase; -+#else -+ pVesa->ioBase = 0; -+#endif - - xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB, diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-xf86MapDomainMemory.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-xf86MapDomainMemory.patch deleted file mode 100644 index ea3d68a9b3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/2.3.0-r1-xf86MapDomainMemory.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 1f84310ddf49778f776a39810aa98211c812e8ab Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston -Date: Wed, 19 Oct 2011 08:33:07 +0000 -Subject: Build fix for ABI Version 12 - -ABI Version 12 removes support for multiple PCI domains. If you need to -use this driver on a system with more than one PCI domain, you should -either port this driver to using libpciaccess directly or stick with an -older server. - -Signed-off-by: Jeremy Huddleston ---- -diff --git a/src/vesa.c b/src/vesa.c -index 1136ac3..5a0120c 100644 ---- a/src/vesa.c -+++ b/src/vesa.c -@@ -1268,14 +1268,16 @@ VESAMapVidMem(ScrnInfoPtr pScrn) - & pVesa->base); - } - else -- pVesa->base = xf86MapDomainMemory(pScrn->scrnIndex, 0, pVesa->pciInfo, -- pScrn->memPhysBase, pVesa->mapSize); -+ (void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase, -+ pVesa->mapSize, -+ PCI_DEV_MAP_FLAG_WRITABLE, -+ & pVesa->base); - - if (pVesa->base) { - if (pVesa->mapPhys != 0xa0000) -- pVesa->VGAbase = xf86MapDomainMemory(pScrn->scrnIndex, 0, -- pVesa->pciInfo, -- 0xa0000, 0x10000); -+ (void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000, -+ PCI_DEV_MAP_FLAG_WRITABLE, -+ & pVesa->VGAbase); - else - pVesa->VGAbase = pVesa->base; - -@@ -1325,10 +1327,12 @@ VESAUnmapVidMem(ScrnInfoPtr pScrn) - if (pVesa->mapPhys != 0xa0000) { - (void) pci_device_unmap_range(pVesa->pciInfo, pVesa->base, - pVesa->mapSize); -- xf86UnMapVidMem(pScrn->scrnIndex, pVesa->VGAbase, 0x10000); -+ (void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->VGAbase, -+ 0x10000); - } - else { -- xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize); -+ (void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->base, -+ pVesa->mapSize); - } - #else - xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize); --- -cgit v0.9.0.2-2-gbebe diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/no-dga.patch b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/no-dga.patch deleted file mode 100644 index 50ff3d1f2b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/files/no-dga.patch +++ /dev/null @@ -1,202 +0,0 @@ -diff -rup xf86-video-vesa-2.3.0.orig/src/vesa.c xf86-video-vesa-2.3.0.work/src/vesa.c ---- xf86-video-vesa-2.3.0.orig/src/vesa.c 2010-01-04 11:19:13.000000000 -0800 -+++ xf86-video-vesa-2.3.0.work/src/vesa.c 2011-03-08 11:06:58.264579000 -0800 -@@ -143,8 +143,6 @@ vesaUpdatePacked(ScreenPtr pScreen, shad - shadowUpdatePacked(pScreen, pBuf); - } - --static Bool VESADGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen); -- - enum GenericTypes - { - CHIP_VESA_GENERIC -@@ -1050,8 +1048,6 @@ VESAScreenInit(int scrnIndex, ScreenPtr - return FALSE; - } - -- VESADGAInit(pScrn, pScreen); -- - xf86SetBlackWhitePixels(pScreen); - miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); -@@ -1121,11 +1117,6 @@ VESACloseScreen(int scrnIndex, ScreenPtr - shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen)); - xfree(pVesa->shadow); - } -- if (pVesa->pDGAMode) { -- xfree(pVesa->pDGAMode); -- pVesa->pDGAMode = NULL; -- pVesa->nDGAMode = 0; -- } - pScrn->vtSema = FALSE; - - pScrn->EnableDisableFBAccess = pVesa->EnableDisableFBAccess; -@@ -1652,143 +1643,3 @@ VESADisplayPowerManagementSet(ScrnInfoPt - VBEDPMSSet(pVesa->pVbe, mode); - } - --/*********************************************************************** -- * DGA stuff -- ***********************************************************************/ --static Bool VESADGAOpenFramebuffer(ScrnInfoPtr pScrn, char **DeviceName, -- unsigned char **ApertureBase, -- int *ApertureSize, int *ApertureOffset, -- int *flags); --static Bool VESADGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode); --static void VESADGASetViewport(ScrnInfoPtr pScrn, int x, int y, int flags); -- --static Bool --VESADGAOpenFramebuffer(ScrnInfoPtr pScrn, char **DeviceName, -- unsigned char **ApertureBase, int *ApertureSize, -- int *ApertureOffset, int *flags) --{ -- VESAPtr pVesa = VESAGetRec(pScrn); -- -- *DeviceName = NULL; /* No special device */ -- *ApertureBase = (unsigned char *)(long)(pVesa->mapPhys); -- *ApertureSize = pVesa->mapSize; -- *ApertureOffset = pVesa->mapOff; -- *flags = DGA_NEED_ROOT; -- -- return (TRUE); --} -- --static Bool --VESADGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode) --{ -- DisplayModePtr pMode; -- int scrnIdx = pScrn->pScreen->myNum; -- int frameX0, frameY0; -- -- if (pDGAMode) { -- pMode = pDGAMode->mode; -- frameX0 = frameY0 = 0; -- } -- else { -- if (!(pMode = pScrn->currentMode)) -- return (TRUE); -- -- frameX0 = pScrn->frameX0; -- frameY0 = pScrn->frameY0; -- } -- -- if (!(*pScrn->SwitchMode)(scrnIdx, pMode, 0)) -- return (FALSE); -- (*pScrn->AdjustFrame)(scrnIdx, frameX0, frameY0, 0); -- -- return (TRUE); --} -- --static void --VESADGASetViewport(ScrnInfoPtr pScrn, int x, int y, int flags) --{ -- (*pScrn->AdjustFrame)(pScrn->pScreen->myNum, x, y, flags); --} -- --static int --VESADGAGetViewport(ScrnInfoPtr pScrn) --{ -- return (0); --} -- --static DGAFunctionRec VESADGAFunctions = --{ -- VESADGAOpenFramebuffer, -- NULL, /* CloseFramebuffer */ -- VESADGASetMode, -- VESADGASetViewport, -- VESADGAGetViewport, -- NULL, /* Sync */ -- NULL, /* FillRect */ -- NULL, /* BlitRect */ -- NULL, /* BlitTransRect */ --}; -- --static void --VESADGAAddModes(ScrnInfoPtr pScrn) --{ -- VESAPtr pVesa = VESAGetRec(pScrn); -- DisplayModePtr pMode = pScrn->modes; -- DGAModePtr pDGAMode; -- -- do { -- pDGAMode = xrealloc(pVesa->pDGAMode, -- (pVesa->nDGAMode + 1) * sizeof(DGAModeRec)); -- if (!pDGAMode) -- break; -- -- pVesa->pDGAMode = pDGAMode; -- pDGAMode += pVesa->nDGAMode; -- (void)memset(pDGAMode, 0, sizeof(DGAModeRec)); -- -- ++pVesa->nDGAMode; -- pDGAMode->mode = pMode; -- pDGAMode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE; -- pDGAMode->byteOrder = pScrn->imageByteOrder; -- pDGAMode->depth = pScrn->depth; -- pDGAMode->bitsPerPixel = pScrn->bitsPerPixel; -- pDGAMode->red_mask = pScrn->mask.red; -- pDGAMode->green_mask = pScrn->mask.green; -- pDGAMode->blue_mask = pScrn->mask.blue; -- pDGAMode->visualClass = pScrn->bitsPerPixel > 8 ? -- TrueColor : PseudoColor; -- pDGAMode->xViewportStep = 1; -- pDGAMode->yViewportStep = 1; -- pDGAMode->viewportWidth = pMode->HDisplay; -- pDGAMode->viewportHeight = pMode->VDisplay; -- -- pDGAMode->bytesPerScanline = pVesa->maxBytesPerScanline; -- pDGAMode->imageWidth = pMode->HDisplay; -- pDGAMode->imageHeight = pMode->VDisplay; -- pDGAMode->pixmapWidth = pDGAMode->imageWidth; -- pDGAMode->pixmapHeight = pDGAMode->imageHeight; -- pDGAMode->maxViewportX = pScrn->virtualX - -- pDGAMode->viewportWidth; -- pDGAMode->maxViewportY = pScrn->virtualY - -- pDGAMode->viewportHeight; -- -- pDGAMode->address = pVesa->base; -- -- pMode = pMode->next; -- } while (pMode != pScrn->modes); --} -- --static Bool --VESADGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen) --{ -- VESAPtr pVesa = VESAGetRec(pScrn); -- -- if (pScrn->depth < 8 || pVesa->mapPhys == 0xa0000L) -- return (FALSE); -- -- if (!pVesa->nDGAMode) -- VESADGAAddModes(pScrn); -- -- return (DGAInit(pScreen, &VESADGAFunctions, -- pVesa->pDGAMode, pVesa->nDGAMode)); --} -Only in xf86-video-vesa-2.3.0.work/src: vesa.c~ -diff -rup xf86-video-vesa-2.3.0.orig/src/vesa.h xf86-video-vesa-2.3.0.work/src/vesa.h ---- xf86-video-vesa-2.3.0.orig/src/vesa.h 2010-01-04 11:19:13.000000000 -0800 -+++ xf86-video-vesa-2.3.0.work/src/vesa.h 2011-03-08 11:01:24.443622000 -0800 -@@ -64,9 +64,6 @@ - /* Int 10 support */ - #include "xf86int10.h" - --/* Dga definitions */ --#include "dgaproc.h" -- - #include "fb.h" - - #ifdef XSERVER_LIBPCIACCESS -@@ -108,9 +105,6 @@ typedef struct _VESARec - CARD32 windowAoffset; - /* Don't override the default refresh rate. */ - Bool defaultRefresh; -- /* DGA info */ -- DGAModePtr pDGAMode; -- int nDGAMode; - CloseScreenProcPtr CloseScreen; - CreateScreenResourcesProcPtr CreateScreenResources; - xf86EnableDisableFBAccessProc *EnableDisableFBAccess; -Only in xf86-video-vesa-2.3.0.work/src: vesa.h~ diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild deleted file mode 100644 index df0fe20abc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild,v 1.3 2010/02/08 15:31:28 fauli Exp $ - -inherit x-modular - -DESCRIPTION="Generic VESA video driver" -KEYWORDS="-* ~alpha amd64 ~ia64 x86 ~x86-fbsd" -RDEPEND=">=x11-base/xorg-server-1.0.99" -DEPEND="${RDEPEND} - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xextproto - x11-proto/xproto" -PATCHES=( - "${FILESDIR}/no-dga.patch" - "${FILESDIR}/2.3.0-r1-domainiobase.patch" - "${FILESDIR}/2.3.0-r1-xf86MapDomainMemory.patch" -) -