diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /x11-base | |
reinit the tree, so we can have metadata
Diffstat (limited to 'x11-base')
36 files changed, 3963 insertions, 0 deletions
diff --git a/x11-base/metadata.xml b/x11-base/metadata.xml new file mode 100644 index 000000000000..5293f86a7217 --- /dev/null +++ b/x11-base/metadata.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<catmetadata> + <longdescription lang="en"> + The x11-base category contains various X11 base implementations. + </longdescription> + <longdescription lang="de"> + Die Kategorie x11-base enthält verschiedene X11 Implementierungen. + </longdescription> + <longdescription lang="es"> + La categoría x11-base contiene varias implementaciones base de X11. + </longdescription> + <longdescription lang="ja"> + x11-baseカテゴリーには様々なX11を基本とした実行環境が含まれています。 + </longdescription> + <longdescription lang="nl"> + De x11-base categorie bevat verschillende implementaties van X11. + </longdescription> + <longdescription lang="vi"> + Nhóm x11-base chứa các bản cài đặt X11 cơ sở. + </longdescription> + <longdescription lang="it"> + La categoria x11-base contiene varie implementazioni base di X11. + </longdescription> + <longdescription lang="pt"> + A categoria x11-base contém várias implementações de base de + X11. + </longdescription> + <longdescription lang="pl"> + Kategoria x11-base zawiera podstawowe implementacje X11. + </longdescription> +</catmetadata> + diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest new file mode 100644 index 000000000000..cbc208bee0dc --- /dev/null +++ b/x11-base/xorg-drivers/Manifest @@ -0,0 +1,8 @@ +EBUILD xorg-drivers-1.12.ebuild 5565 SHA256 3feaf120fa09c8dbda980b53b14f50f64613a248ecbb2ef91d6a8540c01f4f76 SHA512 a0400aae4200837d4cab95fd4f7ae3019c07b29affd5861f2bb7ce8152e74d8e053e2ffc251d146cc63b712f006716559eab4bb79bcc67bd041f2e07b94a2a63 WHIRLPOOL 4f15b7c11e04c763946d8973fe51f9fd6d70774d5a9301d4e4f699f16656f7cce7105c92450cf5a9810aa7df61ccf33cceabf0b1289ab49983204fa1de9a5a07 +EBUILD xorg-drivers-1.15.ebuild 5873 SHA256 d30f09ff4bc63e83e69745ab5ddd8e2317b3f2fe6b52bc5c6db5c8fbbd41cfdc SHA512 23cea6d29a3fd189c0ff64736606e2a1826b8c80d03c1874de9849a0f59dd02755a206c71da71b98af182602b92a84269cc7fc831f11d0c002cd55ab7ea00d40 WHIRLPOOL a0e9965aa3d9b3947bfd59ed65a53402732f1b3f725861743871f4bf351d988074aed874311551cf12b6dabd5faab60d6686d3b8d10f698432a6c4d593d06777 +EBUILD xorg-drivers-1.18-r1.ebuild 6247 SHA256 1e66cfc1be13a23086793903e0b48c34f077f04c29aa84d1d5ae3937e0c462b8 SHA512 9f5074bae3553839625425f10bfe4f6df1654a089a1d28c0669967e233e4c49ee1d4930d74223dc6841835702b33fa9334e9056b34941e55ec95d46a8a76ae13 WHIRLPOOL 856b18d7547e903f9053e4372f6923a74c1e32cc2a53e8a63d061ccce38e822ae4ce62ae3a93ccb013e8b1ce09284084627e0ee99659862724599ab7458b4a4e +EBUILD xorg-drivers-1.19.ebuild 7542 SHA256 9a39c8821587256190f797cb26ea7a1812b11a8e22ddab6a1516d4044aa5577f SHA512 9989ff131690471b4c2896f79333c1e76419d6936052fee908c874555f5891fff9500d97d71f02d56b1b496f6c43b1673ea58da0ec08c9df430a87c972039c0c WHIRLPOOL f503bc66158b21a3df6c0bcb37c780214a042bdce2c7f7580a80d454ab18948dc28160750bb3d68ccd4740f45c8b70242b40b9a9227b887af48cf1f74ef35508 +EBUILD xorg-drivers-9999.ebuild 5832 SHA256 f5d51c6833098708aaa70b74652e5f4df3dfb41e3b5dc6cd3447fddcecfcd565 SHA512 48cdbaf353e0d1fa778dfbfe7e4dfb9fe35d27636355cb64cdf586396dadce2ac34cad50d427014ea5f424ee3cb4e88ebd5620fc413e7cbe3fa09df17a199696 WHIRLPOOL 2d228a70d71d1456b3654d77af59c3b6ebf7d6d93ac121f9a543fbec57ba9b3ead2eeb72b87d657c6c27b8481aa7d8a5564c8aa75012406c71065d79426e0795 +MISC ChangeLog 7116 SHA256 61a5c637bed0e64f74ff432ebf397b571c351d16257752990a7de0175bd915e9 SHA512 fe492bcce7d82560c9dc53e9720570833c2c292588c5a070586f8e8daa43b843529b98ebba30fc94ab39ca8487ce4fe236d339f7792d7e15a32842b02d63bd0e WHIRLPOOL 17233381744c97e1f20c3344a43e56cbd21a2834fffd873879ca7be2ac4e26324a0a1d51b68191f2d68fab4d1c6bb8d3cb96716efe150e89380e21cd04bcd6eb +MISC ChangeLog-2015 16850 SHA256 a58741c3db5d30f12c3c65ef9d40bb99f37f007ccacccce0af0adc8cd40aa9ca SHA512 dce1ff05e33920925230d992ace83f925fb11384b36edaca887422880cf84be22430f370850fbe3b3e56b2def128b3daade4c08a22f3fe0114ffd549c41ddd93 WHIRLPOOL 0c87e7c1ddd9836a6b9fc4494a9eea4326d7cd2a4855afc80192b48ef21013a2c3763bcde72d713aad55f9506091ed167b47ff9330d91efb06e75d795c48dce0 +MISC metadata.xml 234 SHA256 900f23c261ef4bbc25ef3d591263a70142c3c6f1cf833d1e66301936532399e7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b WHIRLPOOL 362d1afca87746963dbde2f7b3a6d4cfdf0948f9347fef9eca5510c04e2c6c9b9e6f5f9a934ba0939e261f472a1a74111d70a4cc87a8590f38ceff7692fdca79 diff --git a/x11-base/xorg-drivers/metadata.xml b/x11-base/xorg-drivers/metadata.xml new file mode 100644 index 000000000000..7a7bbf810544 --- /dev/null +++ b/x11-base/xorg-drivers/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> +</pkgmetadata> diff --git a/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild new file mode 100644 index 000000000000..2ef101a50a06 --- /dev/null +++ b/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +DESCRIPTION="Meta package containing deps on all xorg drivers" +HOMEPAGE="https://www.gentoo.org/" +SRC_URI="" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd" + +IUSE_INPUT_DEVICES=" + input_devices_acecad + input_devices_aiptek + input_devices_elographics + input_devices_evdev + input_devices_fpit + input_devices_hyperpen + input_devices_joystick + input_devices_keyboard + input_devices_mouse + input_devices_mutouch + input_devices_penmount + input_devices_tslib + input_devices_vmmouse + input_devices_void + input_devices_synaptics + input_devices_wacom +" +IUSE_VIDEO_CARDS=" + video_cards_apm + video_cards_ark + video_cards_ast + video_cards_cirrus + video_cards_dummy + video_cards_epson + video_cards_fbdev + video_cards_geode + video_cards_glint + video_cards_i128 + video_cards_i740 + video_cards_intel + video_cards_mach64 + video_cards_mga + video_cards_modesetting + video_cards_neomagic + video_cards_newport + video_cards_nouveau + video_cards_nv + video_cards_qxl + video_cards_r128 + video_cards_radeon + video_cards_s3 + video_cards_s3virge + video_cards_savage + video_cards_siliconmotion + video_cards_sis + video_cards_sunbw2 + video_cards_suncg14 + video_cards_suncg3 + video_cards_suncg6 + video_cards_sunffb + video_cards_sunleo + video_cards_suntcx + video_cards_tdfx + video_cards_tga + video_cards_trident + video_cards_vesa + video_cards_via + video_cards_virtualbox + video_cards_vmware + video_cards_voodoo + video_cards_fglrx + video_cards_nvidia +" + +IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}" + +PDEPEND=" + input_devices_acecad? ( x11-drivers/xf86-input-acecad ) + input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) + input_devices_elographics? ( x11-drivers/xf86-input-elographics ) + input_devices_evdev? ( x11-drivers/xf86-input-evdev ) + input_devices_fpit? ( x11-drivers/xf86-input-fpit ) + input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) + input_devices_joystick? ( x11-drivers/xf86-input-joystick ) + input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) + input_devices_mouse? ( x11-drivers/xf86-input-mouse ) + input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) + input_devices_penmount? ( x11-drivers/xf86-input-penmount ) + input_devices_tslib? ( x11-drivers/xf86-input-tslib ) + input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) + input_devices_void? ( x11-drivers/xf86-input-void ) + input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) + input_devices_wacom? ( x11-drivers/xf86-input-wacom ) + + video_cards_apm? ( x11-drivers/xf86-video-apm ) + video_cards_ark? ( x11-drivers/xf86-video-ark ) + video_cards_ast? ( x11-drivers/xf86-video-ast ) + video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) + video_cards_dummy? ( x11-drivers/xf86-video-dummy ) + video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) + video_cards_geode? ( x11-drivers/xf86-video-geode ) + video_cards_glint? ( x11-drivers/xf86-video-glint ) + video_cards_i128? ( x11-drivers/xf86-video-i128 ) + video_cards_i740? ( x11-drivers/xf86-video-i740 ) + video_cards_intel? ( x11-drivers/xf86-video-intel ) + video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) + video_cards_mga? ( x11-drivers/xf86-video-mga ) + video_cards_modesetting? ( x11-drivers/xf86-video-modesetting ) + video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) + video_cards_newport? ( x11-drivers/xf86-video-newport ) + video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) + video_cards_nv? ( x11-drivers/xf86-video-nv ) + video_cards_qxl? ( x11-drivers/xf86-video-qxl ) + video_cards_nvidia? ( x11-drivers/nvidia-drivers ) + video_cards_fglrx? ( x11-drivers/ati-drivers ) + video_cards_r128? ( x11-drivers/xf86-video-r128 ) + video_cards_radeon? ( x11-drivers/xf86-video-ati ) + video_cards_s3? ( x11-drivers/xf86-video-s3 ) + video_cards_s3virge? ( x11-drivers/xf86-video-s3virge ) + video_cards_savage? ( x11-drivers/xf86-video-savage ) + video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) + video_cards_sis? ( x11-drivers/xf86-video-sis ) + video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) + video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) + video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) + video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) + video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) + video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) + video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) + video_cards_tga? ( x11-drivers/xf86-video-tga ) + video_cards_trident? ( x11-drivers/xf86-video-trident ) + video_cards_vesa? ( x11-drivers/xf86-video-vesa ) + video_cards_via? ( x11-drivers/xf86-video-openchrome ) + video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) + video_cards_vmware? ( x11-drivers/xf86-video-vmware ) + video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) + + !x11-drivers/xf86-input-citron + !<=x11-drivers/xf86-video-chips-1.2.4 + !x11-drivers/xf86-video-cyrix + !x11-drivers/xf86-video-impact + !x11-drivers/xf86-video-nsc + !<=x11-drivers/xf86-video-rendition-4.2.4 + !<=x11-drivers/xf86-video-sisusb-0.9.4 + !x11-drivers/xf86-video-sunbw2 + !<=x11-drivers/xf86-video-tseng-1.2.4 +" diff --git a/x11-base/xorg-drivers/xorg-drivers-1.15.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.15.ebuild new file mode 100644 index 000000000000..0dec229a64e0 --- /dev/null +++ b/x11-base/xorg-drivers/xorg-drivers-1.15.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Meta package containing deps on all xorg drivers" +HOMEPAGE="https://www.gentoo.org/" +SRC_URI="" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +IUSE_INPUT_DEVICES=" + input_devices_acecad + input_devices_aiptek + input_devices_elographics + input_devices_evdev + input_devices_fpit + input_devices_hyperpen + input_devices_joystick + input_devices_keyboard + input_devices_mouse + input_devices_mutouch + input_devices_penmount + input_devices_tslib + input_devices_vmmouse + input_devices_void + input_devices_synaptics + input_devices_wacom +" +IUSE_VIDEO_CARDS=" + video_cards_apm + video_cards_ast + video_cards_chips + video_cards_cirrus + video_cards_dummy + video_cards_epson + video_cards_fbdev + video_cards_freedreno + video_cards_geode + video_cards_glint + video_cards_i128 + video_cards_i740 + video_cards_intel + video_cards_mach64 + video_cards_mga + video_cards_modesetting + video_cards_neomagic + video_cards_nouveau + video_cards_nv + video_cards_omap + video_cards_qxl + video_cards_r128 + video_cards_radeon + video_cards_radeonsi + video_cards_rendition + video_cards_s3virge + video_cards_savage + video_cards_siliconmotion + video_cards_sisusb + video_cards_sunbw2 + video_cards_suncg14 + video_cards_suncg3 + video_cards_suncg6 + video_cards_sunffb + video_cards_sunleo + video_cards_suntcx + video_cards_tdfx + video_cards_tga + video_cards_trident + video_cards_tseng + video_cards_vesa + video_cards_via + video_cards_virtualbox + video_cards_vmware + video_cards_voodoo + video_cards_fglrx + video_cards_nvidia +" + +IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}" + +PDEPEND=" + input_devices_acecad? ( x11-drivers/xf86-input-acecad ) + input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) + input_devices_elographics? ( x11-drivers/xf86-input-elographics ) + input_devices_evdev? ( x11-drivers/xf86-input-evdev ) + input_devices_fpit? ( x11-drivers/xf86-input-fpit ) + input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) + input_devices_joystick? ( x11-drivers/xf86-input-joystick ) + input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) + input_devices_mouse? ( x11-drivers/xf86-input-mouse ) + input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) + input_devices_penmount? ( x11-drivers/xf86-input-penmount ) + input_devices_tslib? ( x11-drivers/xf86-input-tslib ) + input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) + input_devices_void? ( x11-drivers/xf86-input-void ) + input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) + input_devices_wacom? ( x11-drivers/xf86-input-wacom ) + + video_cards_apm? ( x11-drivers/xf86-video-apm ) + video_cards_ast? ( x11-drivers/xf86-video-ast ) + video_cards_chips? ( x11-drivers/xf86-video-chips ) + video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) + video_cards_dummy? ( x11-drivers/xf86-video-dummy ) + video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) + video_cards_freedreno? ( x11-drivers/xf86-video-freedreno ) + video_cards_geode? ( x11-drivers/xf86-video-geode ) + video_cards_glint? ( x11-drivers/xf86-video-glint ) + video_cards_i128? ( x11-drivers/xf86-video-i128 ) + video_cards_i740? ( x11-drivers/xf86-video-i740 ) + video_cards_intel? ( x11-drivers/xf86-video-intel ) + video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) + video_cards_mga? ( x11-drivers/xf86-video-mga ) + video_cards_modesetting? ( x11-drivers/xf86-video-modesetting ) + video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) + video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) + video_cards_nv? ( x11-drivers/xf86-video-nv ) + video_cards_omap? ( x11-drivers/xf86-video-omap ) + video_cards_qxl? ( x11-drivers/xf86-video-qxl ) + video_cards_nvidia? ( x11-drivers/nvidia-drivers ) + video_cards_fglrx? ( x11-drivers/ati-drivers ) + video_cards_r128? ( x11-drivers/xf86-video-r128 ) + video_cards_radeon? ( x11-drivers/xf86-video-ati ) + video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) + video_cards_rendition? ( x11-drivers/xf86-video-rendition ) + video_cards_s3virge? ( x11-drivers/xf86-video-s3virge ) + video_cards_savage? ( x11-drivers/xf86-video-savage ) + video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) + video_cards_sisusb? ( x11-drivers/xf86-video-sisusb ) + video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) + video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) + video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) + video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) + video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) + video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) + video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) + video_cards_tga? ( x11-drivers/xf86-video-tga ) + video_cards_trident? ( x11-drivers/xf86-video-trident ) + video_cards_tseng? ( x11-drivers/xf86-video-tseng ) + video_cards_vesa? ( x11-drivers/xf86-video-vesa ) + video_cards_via? ( x11-drivers/xf86-video-openchrome ) + video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) + video_cards_vmware? ( x11-drivers/xf86-video-vmware ) + video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) + + !x11-drivers/xf86-input-citron + !x11-drivers/xf86-video-cyrix + !x11-drivers/xf86-video-impact + !x11-drivers/xf86-video-nsc + !x11-drivers/xf86-video-sunbw2 + !<=x11-drivers/xf86-video-ark-0.7.5 + !<=x11-drivers/xf86-video-newport-0.2.4 + !<=x11-drivers/xf86-video-s3-0.6.5 + !<=x11-drivers/xf86-video-sis-0.10.7 +" diff --git a/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild new file mode 100644 index 000000000000..bdd9c12bd4a2 --- /dev/null +++ b/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Meta package containing deps on all xorg drivers" +HOMEPAGE="https://www.gentoo.org/" +SRC_URI="" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +IUSE_INPUT_DEVICES=" + input_devices_acecad + input_devices_aiptek + input_devices_elographics + input_devices_evdev + input_devices_fpit + input_devices_hyperpen + input_devices_joystick + input_devices_keyboard + input_devices_libinput + input_devices_mouse + input_devices_mutouch + input_devices_penmount + input_devices_tslib + input_devices_vmmouse + input_devices_void + input_devices_synaptics + input_devices_wacom +" +IUSE_VIDEO_CARDS=" + video_cards_amdgpu + video_cards_apm + video_cards_ast + video_cards_chips + video_cards_cirrus + video_cards_dummy + video_cards_epson + video_cards_fbdev + video_cards_freedreno + video_cards_geode + video_cards_glint + video_cards_i128 + video_cards_i740 + video_cards_intel + video_cards_mach64 + video_cards_mga + video_cards_neomagic + video_cards_nouveau + video_cards_nv + video_cards_omap + video_cards_qxl + video_cards_r128 + video_cards_radeon + video_cards_radeonsi + video_cards_rendition + video_cards_s3 + video_cards_s3virge + video_cards_savage + video_cards_siliconmotion + video_cards_sisusb + video_cards_sunbw2 + video_cards_suncg14 + video_cards_suncg3 + video_cards_suncg6 + video_cards_sunffb + video_cards_sunleo + video_cards_suntcx + video_cards_tdfx + video_cards_tegra + video_cards_tga + video_cards_trident + video_cards_tseng + video_cards_vesa + video_cards_via + video_cards_virtualbox + video_cards_vmware + video_cards_voodoo + video_cards_fglrx + video_cards_nvidia +" + +IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}" + +PDEPEND=" + input_devices_acecad? ( x11-drivers/xf86-input-acecad ) + input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) + input_devices_elographics? ( x11-drivers/xf86-input-elographics ) + input_devices_evdev? ( x11-drivers/xf86-input-evdev ) + input_devices_fpit? ( x11-drivers/xf86-input-fpit ) + input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) + input_devices_joystick? ( x11-drivers/xf86-input-joystick ) + input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) + input_devices_libinput? ( x11-drivers/xf86-input-libinput ) + input_devices_mouse? ( x11-drivers/xf86-input-mouse ) + input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) + input_devices_penmount? ( x11-drivers/xf86-input-penmount ) + input_devices_tslib? ( x11-drivers/xf86-input-tslib ) + input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) + input_devices_void? ( x11-drivers/xf86-input-void ) + input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) + input_devices_wacom? ( x11-drivers/xf86-input-wacom ) + + video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) + video_cards_apm? ( x11-drivers/xf86-video-apm ) + video_cards_ast? ( x11-drivers/xf86-video-ast ) + video_cards_chips? ( x11-drivers/xf86-video-chips ) + video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) + video_cards_dummy? ( x11-drivers/xf86-video-dummy ) + video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) + video_cards_freedreno? ( x11-drivers/xf86-video-freedreno ) + video_cards_geode? ( x11-drivers/xf86-video-geode ) + video_cards_glint? ( x11-drivers/xf86-video-glint ) + video_cards_i128? ( x11-drivers/xf86-video-i128 ) + video_cards_i740? ( x11-drivers/xf86-video-i740 ) + video_cards_intel? ( x11-drivers/xf86-video-intel ) + video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) + video_cards_mga? ( x11-drivers/xf86-video-mga ) + video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) + video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) + video_cards_nv? ( x11-drivers/xf86-video-nv ) + video_cards_omap? ( x11-drivers/xf86-video-omap ) + video_cards_qxl? ( x11-drivers/xf86-video-qxl ) + video_cards_nvidia? ( x11-drivers/nvidia-drivers ) + video_cards_fglrx? ( x11-drivers/ati-drivers ) + video_cards_r128? ( x11-drivers/xf86-video-r128 ) + video_cards_radeon? ( x11-drivers/xf86-video-ati ) + video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) + video_cards_rendition? ( x11-drivers/xf86-video-rendition ) + video_cards_s3? ( x11-drivers/xf86-video-s3 ) + video_cards_s3virge? ( x11-drivers/xf86-video-s3virge ) + video_cards_savage? ( x11-drivers/xf86-video-savage ) + video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) + video_cards_sisusb? ( x11-drivers/xf86-video-sisusb ) + video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) + video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) + video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) + video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) + video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) + video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) + video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) + video_cards_tegra? ( x11-drivers/xf86-video-opentegra ) + video_cards_tga? ( x11-drivers/xf86-video-tga ) + video_cards_trident? ( x11-drivers/xf86-video-trident ) + video_cards_tseng? ( x11-drivers/xf86-video-tseng ) + video_cards_vesa? ( x11-drivers/xf86-video-vesa ) + video_cards_via? ( x11-drivers/xf86-video-openchrome ) + video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) + video_cards_vmware? ( x11-drivers/xf86-video-vmware ) + video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) + + !x11-drivers/xf86-input-citron + !x11-drivers/xf86-video-cyrix + !x11-drivers/xf86-video-impact + !x11-drivers/xf86-video-nsc + !x11-drivers/xf86-video-sunbw2 + !<=x11-drivers/xf86-video-ark-0.7.5 + !<=x11-drivers/xf86-video-newport-0.2.4 + !<=x11-drivers/xf86-video-sis-0.10.7 + !<x11-drivers/xf86-input-evdev-2.10.0 + !<x11-drivers/xf86-video-ati-7.6.1 + !<x11-drivers/xf86-video-intel-2.99.917_p20160122 + !<x11-drivers/xf86-video-nouveau-1.0.12 +" diff --git a/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild new file mode 100644 index 000000000000..a248e7b26c67 --- /dev/null +++ b/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Meta package containing deps on all xorg drivers" +HOMEPAGE="https://www.gentoo.org/" +SRC_URI="" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +IUSE_INPUT_DEVICES=" + input_devices_acecad + input_devices_aiptek + input_devices_elographics + input_devices_evdev + input_devices_fpit + input_devices_hyperpen + input_devices_joystick + input_devices_keyboard + input_devices_libinput + input_devices_mouse + input_devices_mutouch + input_devices_penmount + input_devices_tslib + input_devices_vmmouse + input_devices_void + input_devices_synaptics + input_devices_wacom +" +IUSE_VIDEO_CARDS=" + video_cards_amdgpu + video_cards_apm + video_cards_ark + video_cards_ast + video_cards_chips + video_cards_cirrus + video_cards_dummy + video_cards_epson + video_cards_fbdev + video_cards_freedreno + video_cards_geode + video_cards_glint + video_cards_i128 + video_cards_i740 + video_cards_i915 + video_cards_i965 + video_cards_intel + video_cards_mach64 + video_cards_mga + video_cards_neomagic + video_cards_newport + video_cards_nouveau + video_cards_nv + video_cards_omap + video_cards_qxl + video_cards_r128 + video_cards_radeon + video_cards_radeonsi + video_cards_rendition + video_cards_s3 + video_cards_s3virge + video_cards_savage + video_cards_siliconmotion + video_cards_sis + video_cards_sisusb + video_cards_sunbw2 + video_cards_suncg14 + video_cards_suncg3 + video_cards_suncg6 + video_cards_sunffb + video_cards_sunleo + video_cards_suntcx + video_cards_tdfx + video_cards_tegra + video_cards_tga + video_cards_trident + video_cards_tseng + video_cards_vesa + video_cards_via + video_cards_vc4 + video_cards_virtualbox + video_cards_vmware + video_cards_voodoo + video_cards_fglrx + video_cards_nvidia +" + +IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}" + +PDEPEND=" + input_devices_acecad? ( x11-drivers/xf86-input-acecad ) + input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) + input_devices_elographics? ( x11-drivers/xf86-input-elographics ) + input_devices_evdev? ( x11-drivers/xf86-input-evdev ) + input_devices_fpit? ( x11-drivers/xf86-input-fpit ) + input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) + input_devices_joystick? ( x11-drivers/xf86-input-joystick ) + input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) + input_devices_libinput? ( x11-drivers/xf86-input-libinput ) + input_devices_mouse? ( x11-drivers/xf86-input-mouse ) + input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) + input_devices_penmount? ( x11-drivers/xf86-input-penmount ) + input_devices_tslib? ( x11-drivers/xf86-input-tslib ) + input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) + input_devices_void? ( x11-drivers/xf86-input-void ) + input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) + input_devices_wacom? ( x11-drivers/xf86-input-wacom ) + + video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) + video_cards_apm? ( x11-drivers/xf86-video-apm ) + video_cards_ark? ( x11-drivers/xf86-video-ark ) + video_cards_ast? ( x11-drivers/xf86-video-ast ) + video_cards_chips? ( x11-drivers/xf86-video-chips ) + video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) + video_cards_dummy? ( x11-drivers/xf86-video-dummy ) + video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) + video_cards_freedreno? ( >=x11-base/xorg-server-${PV}[glamor] ) + video_cards_geode? ( x11-drivers/xf86-video-geode ) + video_cards_glint? ( x11-drivers/xf86-video-glint ) + video_cards_i128? ( x11-drivers/xf86-video-i128 ) + video_cards_i740? ( x11-drivers/xf86-video-i740 ) + video_cards_i915? ( x11-drivers/xf86-video-intel ) + video_cards_i965? ( >=x11-base/xorg-server-${PV}[glamor] ) + video_cards_intel? ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) ) + video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) + video_cards_mga? ( x11-drivers/xf86-video-mga ) + video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) + video_cards_newport? ( x11-drivers/xf86-video-newport ) + video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) + video_cards_nv? ( x11-drivers/xf86-video-nv ) + video_cards_omap? ( x11-drivers/xf86-video-omap ) + video_cards_qxl? ( x11-drivers/xf86-video-qxl ) + video_cards_nvidia? ( x11-drivers/nvidia-drivers ) + video_cards_fglrx? ( x11-drivers/ati-drivers ) + video_cards_r128? ( x11-drivers/xf86-video-r128 ) + video_cards_radeon? ( x11-drivers/xf86-video-ati ) + video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) + video_cards_rendition? ( x11-drivers/xf86-video-rendition ) + video_cards_s3? ( x11-drivers/xf86-video-s3 ) + video_cards_s3virge? ( x11-drivers/xf86-video-s3virge ) + video_cards_savage? ( x11-drivers/xf86-video-savage ) + video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) + video_cards_sis? ( x11-drivers/xf86-video-sis ) + video_cards_sisusb? ( x11-drivers/xf86-video-sisusb ) + video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) + video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) + video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) + video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) + video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) + video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) + video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) + video_cards_tegra? ( >=x11-base/xorg-server-${PV}[glamor] ) + video_cards_tga? ( x11-drivers/xf86-video-tga ) + video_cards_trident? ( x11-drivers/xf86-video-trident ) + video_cards_tseng? ( x11-drivers/xf86-video-tseng ) + video_cards_vc4? ( >=x11-base/xorg-server-${PV}[glamor] ) + video_cards_vesa? ( x11-drivers/xf86-video-vesa ) + video_cards_via? ( x11-drivers/xf86-video-openchrome ) + video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) + video_cards_vmware? ( x11-drivers/xf86-video-vmware ) + video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) + + !x11-drivers/xf86-input-citron + !x11-drivers/xf86-video-cyrix + !x11-drivers/xf86-video-impact + !x11-drivers/xf86-video-ivtv + !x11-drivers/xf86-video-nsc + !x11-drivers/xf86-video-sunbw2 + + !<=x11-drivers/xf86-video-ark-0.7.5 + !<=x11-drivers/xf86-video-newport-0.2.4 + + !<x11-drivers/xf86-input-evdev-2.10.4 + !<x11-drivers/xf86-input-joystick-1.6.3 + !<x11-drivers/xf86-input-libinput-0.20.0 + !<x11-drivers/xf86-input-wacom-0.34.0 + !<x11-drivers/xf86-video-amdgpu-1.2.0 + !<x11-drivers/xf86-video-ati-7.8.0 + !<x11-drivers/xf86-video-chips-1.2.7 + !<x11-drivers/xf86-video-glint-1.2.9 + !<x11-drivers/xf86-video-i740-1.3.6 + !<x11-drivers/xf86-video-intel-2.99.917_p20160122 + !<x11-drivers/xf86-video-mga-1.6.5 + !<x11-drivers/xf86-video-nouveau-1.0.13 + !<x11-drivers/xf86-video-nv-2.1.21 + !<x11-drivers/xf86-video-omap-0.4.5 + !<x11-drivers/xf86-video-r128-6.10.2 + !<x11-drivers/xf86-video-savage-2.3.9 + !<x11-drivers/xf86-video-siliconmotion-1.7.9 + !<x11-drivers/xf86-video-sis-0.10.9 + !<x11-drivers/xf86-video-sisusb-0.9.7 + !<x11-drivers/xf86-video-sunleo-1.2.2 + !<x11-drivers/xf86-video-tdfx-1.4.7 + !<x11-drivers/xf86-video-trident-1.3.8 + !<x11-drivers/xf86-video-virtualbox-5.1.14 + !<x11-drivers/xf86-video-vmware-13.2.1 +" diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild new file mode 100644 index 000000000000..9120f8b91869 --- /dev/null +++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild @@ -0,0 +1,164 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Meta package containing deps on all xorg drivers" +HOMEPAGE="https://www.gentoo.org/" +SRC_URI="" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="" + +IUSE_INPUT_DEVICES=" + input_devices_acecad + input_devices_aiptek + input_devices_elographics + input_devices_evdev + input_devices_fpit + input_devices_hyperpen + input_devices_joystick + input_devices_keyboard + input_devices_libinput + input_devices_mouse + input_devices_mutouch + input_devices_penmount + input_devices_tslib + input_devices_vmmouse + input_devices_void + input_devices_synaptics + input_devices_wacom +" +IUSE_VIDEO_CARDS=" + video_cards_amdgpu + video_cards_ast + video_cards_dummy + video_cards_epson + video_cards_fbdev + video_cards_freedreno + video_cards_geode + video_cards_glint + video_cards_i915 + video_cards_i965 + video_cards_intel + video_cards_mga + video_cards_nouveau + video_cards_nv + video_cards_omap + video_cards_qxl + video_cards_r128 + video_cards_radeon + video_cards_radeonsi + video_cards_siliconmotion + video_cards_tdfx + video_cards_tegra + video_cards_vc4 + video_cards_vesa + video_cards_via + video_cards_virtualbox + video_cards_vmware + video_cards_voodoo + video_cards_fglrx + video_cards_nvidia +" + +IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}" + +PDEPEND=" + input_devices_acecad? ( x11-drivers/xf86-input-acecad ) + input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) + input_devices_elographics? ( x11-drivers/xf86-input-elographics ) + input_devices_evdev? ( x11-drivers/xf86-input-evdev ) + input_devices_fpit? ( x11-drivers/xf86-input-fpit ) + input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) + input_devices_joystick? ( x11-drivers/xf86-input-joystick ) + input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) + input_devices_libinput? ( x11-drivers/xf86-input-libinput ) + input_devices_mouse? ( x11-drivers/xf86-input-mouse ) + input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) + input_devices_penmount? ( x11-drivers/xf86-input-penmount ) + input_devices_tslib? ( x11-drivers/xf86-input-tslib ) + input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) + input_devices_void? ( x11-drivers/xf86-input-void ) + input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) + input_devices_wacom? ( x11-drivers/xf86-input-wacom ) + + video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) + video_cards_ast? ( x11-drivers/xf86-video-ast ) + video_cards_dummy? ( x11-drivers/xf86-video-dummy ) + video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) + video_cards_freedreno? ( >=x11-base/xorg-server-${PV}[glamor] ) + video_cards_geode? ( x11-drivers/xf86-video-geode ) + video_cards_glint? ( x11-drivers/xf86-video-glint ) + video_cards_i915? ( x11-drivers/xf86-video-intel ) + video_cards_i965? ( >=x11-base/xorg-server-${PV}[glamor] ) + video_cards_intel? ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) ) + video_cards_mga? ( x11-drivers/xf86-video-mga ) + video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) + video_cards_nv? ( x11-drivers/xf86-video-nv ) + video_cards_omap? ( x11-drivers/xf86-video-omap ) + video_cards_qxl? ( x11-drivers/xf86-video-qxl ) + video_cards_nvidia? ( x11-drivers/nvidia-drivers ) + video_cards_fglrx? ( x11-drivers/ati-drivers ) + video_cards_r128? ( x11-drivers/xf86-video-r128 ) + video_cards_radeon? ( x11-drivers/xf86-video-ati ) + video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) + video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) + video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) + video_cards_tegra? ( >=x11-base/xorg-server-${PV}[glamor] ) + video_cards_vc4? ( >=x11-base/xorg-server-${PV}[glamor] ) + video_cards_vesa? ( x11-drivers/xf86-video-vesa ) + video_cards_via? ( x11-drivers/xf86-video-openchrome ) + video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) + video_cards_vmware? ( x11-drivers/xf86-video-vmware ) + video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) + + !x11-drivers/xf86-input-citron + !x11-drivers/xf86-video-apm + !x11-drivers/xf86-video-ark + !x11-drivers/xf86-video-chips + !x11-drivers/xf86-video-cirrus + !x11-drivers/xf86-video-cyrix + !x11-drivers/xf86-video-i128 + !x11-drivers/xf86-video-i740 + !x11-drivers/xf86-video-impact + !x11-drivers/xf86-video-mach64 + !x11-drivers/xf86-video-neomagic + !x11-drivers/xf86-video-newport + !x11-drivers/xf86-video-nsc + !x11-drivers/xf86-video-rendition + !x11-drivers/xf86-video-s3 + !x11-drivers/xf86-video-s3virge + !x11-drivers/xf86-video-savage + !x11-drivers/xf86-video-sis + !x11-drivers/xf86-video-sisusb + !x11-drivers/xf86-video-sunbw2 + !x11-drivers/xf86-video-suncg14 + !x11-drivers/xf86-video-suncg3 + !x11-drivers/xf86-video-suncg6 + !x11-drivers/xf86-video-sunffb + !x11-drivers/xf86-video-sunleo + !x11-drivers/xf86-video-suntcx + !x11-drivers/xf86-video-tga + !x11-drivers/xf86-video-trident + !x11-drivers/xf86-video-tseng + + !<x11-drivers/xf86-input-evdev-2.10.4 + !<x11-drivers/xf86-input-joystick-1.6.3 + !<x11-drivers/xf86-input-libinput-0.20.0 + !<x11-drivers/xf86-input-wacom-0.34.0 + !<x11-drivers/xf86-video-amdgpu-1.2.0 + !<x11-drivers/xf86-video-ati-7.8.0 + !<x11-drivers/xf86-video-glint-1.2.9 + !<x11-drivers/xf86-video-intel-2.99.917_p20160122 + !<x11-drivers/xf86-video-mga-1.6.5 + !<x11-drivers/xf86-video-nouveau-1.0.13 + !<x11-drivers/xf86-video-nv-2.1.21 + !<x11-drivers/xf86-video-omap-0.4.5 + !<x11-drivers/xf86-video-r128-6.10.2 + !<x11-drivers/xf86-video-siliconmotion-1.7.9 + !<x11-drivers/xf86-video-tdfx-1.4.7 + !<x11-drivers/xf86-video-virtualbox-5.1.14 + !<x11-drivers/xf86-video-vmware-13.2.1 +" diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest new file mode 100644 index 000000000000..dcaf1cb3fb41 --- /dev/null +++ b/x11-base/xorg-server/Manifest @@ -0,0 +1,35 @@ +AUX xdm-setup.initd-1 225 SHA256 e37a9353ed848f35ac7b07d1398466a18741fd1de075a6cb971e1c28088d791d SHA512 c6bdf1e195c9af97cd504ef9b63fc0835fe79d24738295d21277aa97951405721b96cff11097098edb707f9b351dce26993de04198d22251ca0655a313083083 WHIRLPOOL a32234efcf62891b93f6eeac2234a775bea29c89a8e5fe45d7ce771756303365edc2b085f9ebec681a4f459a652a477f093dc37cae309d5c47ea6b44c17afa34 +AUX xdm.confd-4 562 SHA256 9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8 SHA512 facfb91c0b4e0b1cae86b707d263523215633720e1e8f4595639411f936907b321643e8a06111dd3f7b74fa601476e4b0d09768edfdec762c73fa07cb227588b WHIRLPOOL d701fb5f40ecde2b2f2bb56970576c8abde1499916168fee4a6d27afbc1c0493eb17ddd1a8ee70bfbc77d553a47e219e538febada4946d19cccbdabc90f40e6f +AUX xdm.initd-11 6021 SHA256 2ae57ee506eeb15eaa8f06b6a8f1d29fd007e33558c506bbf7640d16c4a67d50 SHA512 c599d41e2476239ee3ba704ca2493f2d976c5de660ca05393580ca6387eba91156a00a1aa919da2b0d4a5f943eb858f801dc8d3cd907d1abd487fe4fe69bd321 WHIRLPOOL 52691eea74775c9c76f6477ebb7d86fe35d5095ceb6cb8522a3f6510a9c65ff62ad779239463f9ed20bc31faa1b37cc5aaf91c6a7b5f442d3009e352ceaca0cc +AUX xdm.initd-9 5586 SHA256 9edc09122a9aad67287f4e0e06d59b546b132c4c5d4815c86cbce80aa81f92e7 SHA512 0486eb26afb454e9d105c61b890d849cd990a5401d8d2c445999db8690bb8b8cfae2519f7055ca6833a5df3c6dde92972517735f376fcc5bfc9d3b6144155b8f WHIRLPOOL 937849c3b9c44b7ee03d638b4c81e5c5d76437949193314c3c2937dd09f8ee469d8d40b4aee440fb520ef338e3a1641b921f675744b9dcb007f96bea64f365bf +AUX xorg-server-1.12-cve-2013-1940.patch 1191 SHA256 cd2c72854f04bf8140e8c5beee51f7575eac63857b01353daec63d8d473d75c5 SHA512 cd38bf7fed8bde0b69c55c05b6e275843eb78178669cbbbcf313edbfcd02a91c4f297898f0220faa1e3592bec8e24e5b9a708499f6e63c2e8c15655de3f7149b WHIRLPOOL 3522bd9735e83f6ee6d9c1efc5bdfa41684dae9b9e49f92005ac7c54f1b9f7c23904042cb9714d97c73832272d6b92b5eaed16982392b0707f3ee82ca893de02 +AUX xorg-server-1.12-cve-2013-4396.patch 2807 SHA256 11707d59d550a9f0b04f0ca3dba1668c7f848a4e8a4cea7a6ae01c665bd11fe9 SHA512 9c8fea712e7ad727390052fd6a717c00e6d16eecaee23153b21870b82772a67c841d9ae48573cf4f8adfc101c948ed25e454ce420226ca991a3c671ecdefa209 WHIRLPOOL 932cba6b4641156de7a56fa977fd39dcf171015e21d196de588694e31cb0fa1d9928b17a3ac81568581c6f722be252ca09125eb08a9f088d5550e205dd09cb42 +AUX xorg-server-1.12-cve-2015-3418.patch 1028 SHA256 59f3c787ab8703ef7567346c63d57f1045fbc29d372528a6b38291851423093b SHA512 77b78021bedf710274a371fc672663041a8bdaf8c8c2244f1a68af91f95f62817846c2c3f43abc762cd2214e1db8b89285d3ae111682f1210ad8049242dbb326 WHIRLPOOL 39268112363ec151c5938712c40895df5cb16994b2b0ac416f37fd517c3ec56595ff8893eaeedcfc99b25e647e1959bbb6da7d7ff1a18cde2946704d87144830 +AUX xorg-server-1.12-disable-acpi.patch 275 SHA256 1d3878d44e2b8690bb7d1595960d06acee7f86a6a4724236a09a74900404e953 SHA512 ca52ce0931819acf46a066116b8485c3a398a56d79826a5cdb2b3b8c7809e5163e17a5954de370805dc51a3be3c75a0333d5c17c30bf99139105d705de2fff95 WHIRLPOOL 048be09bad947a5ef02d5935534c47d08439f0ceccddcdb017908bf73aa0484a69b0e42e8e6630393323305b31a8008ef8a0f4655556082245bc5fcde254aa5b +AUX xorg-server-1.12-ia64-fix_inx_outx.patch 1737 SHA256 bf996a01faf3d1e6f00f12b17373a2530e7e433d3e6c4cac8935ebddc91cd089 SHA512 18bf9bbb973ae4e3f95ffafca8f82845f0c318c3b2dbf0cf9089a2614215ecf000b9037bfed7d80d9367be01247bf316ba2f6e16aa04fe79c54d81441c962bcd WHIRLPOOL cd133d58fc74de9d49773fe2a570d023cea38d09d7550fb9097a8c83a8393e8fc829ffaac566eee732475410e5d8063d0f99d437a68a67e8d3f65d012522240e +AUX xorg-server-1.12-unloadsubmodule.patch 1373 SHA256 c68c4c0749b9229c3ca11c72b5ca98b58c7dbaf5c7311ce45890204bdc637c3c SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e WHIRLPOOL 7e9dce7dc4e064567e68697a2966f87cef756670db7e49da50c8d9a5379d7930c3f9642913b8482b8c7597067ef9098e1989284986b5ec605aca6a536329c05c +AUX xorg-server-1.17-cve-2015-0255-0.patch 3454 SHA256 eab604a006dca644132fcc98db36cb184422b16d1e0f6becd94b311565d0f79d SHA512 dcca4037cb0278fc508f8c4a9b33b8e1f21a4be7d22fb6345b2b2c30956dfd9c9e574fb1dba7e1dadd7f312c033e76286b5f94b1edb058a37e704e3b2b27f241 WHIRLPOOL 75aede9cb62103108b08ea2e5f281c2077acc692c5b503f9f4cca55348aa29c2f3dfcf04065105715c57ae3d994bb7c6942405806aba276d4e14a9d6c1dc8b06 +AUX xorg-server-1.17-cve-2015-0255-1.patch 4715 SHA256 dbd9f973ef3fab04f3889cd8a44aeacae87bf463a74209d36f014055495fdbab SHA512 493e55bfb8bf3792af91ceb5ca270f7bad9b885e1eda94e61e9c1837c837906b1134864f000610f0e79acba24a55cd1b948b866cfe634c704cc2e19d4258f5b5 WHIRLPOOL c9bcd9a84e00a466efdfe6b954592c166c6758da124b5d866f25e6ad8f77a3b3cc46c30aa7fc6a6eafa2e70af47e2cd800109ec6ed8f67d04c41db7d53b740a3 +AUX xorg-server-1.17.2-uninit-clientsWritable.patch 2752 SHA256 e832ec502522c1153e3032386958ff462562227a74760a72d96b1a906b14aded SHA512 667c0330426a63ecfd790c922f5e892f24a4644d46bd621e39798db42f47835f80f3512f6910bab88a50a2138f76d9b5ca35b680143266ed3c9cba788d02fbdb WHIRLPOOL 042e4e6ae9de07dcbd8161e0023b236f54303918644cc713dd7d02bac39eb63b662177af0bd19274137880d698dcb6469f6b4485b006c652efd2761143c11a98 +AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 SHA256 07ef91cb5da75d5165d10d5bc29c58a8b003e743092c1e290453bd6f82a2cf63 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5 WHIRLPOOL 08fa76e82278cc103ba91555d679413409fd70c29609950e9c1fdd7cfc1e13d5d5b76dc2891465b8faa0fca37c89a32556d0c4cb644a131a7abd332a91fc6cad +AUX xorg-server-1.18-sysmacros.patch 1698 SHA256 bcd9aa80cd37d05aa4c09bb60e72eab47c14165cc479fd8cb743dca47f1b72b8 SHA512 e92300d9e965ebed7dc6f90d6d58b616e589f3df57efc954280a5eba65fa098bb6069f9b06c81cda169d46051f51a707e5ca659f820fc64948431bbc80e3e5a0 WHIRLPOOL dcb9469c22bc0b6478b0891bf88dcebc214990d12cb7387d1e6f86d8ebd12a5be71c4f0449a10d39034b7e34eef4b1a8846c7f406f1184e19f8e00f8f4c5e69b +AUX xorg-sets.conf 199 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 WHIRLPOOL 4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d +DIST xorg-server-1.12-cve-2014-8091..8103.patches.tar.xz 14832 SHA256 a98fd1589ef92d6f8a633326d387f2f203df72452788a6aaa2bcd4242700fe7f SHA512 2ac18d36cd8b6d9fcaf98a32e3e6b9107e420476e066a4ac9581f12e9afb7e397614761373a20d96c8fa840886b81ee0ec5cfc812e16876b4922bf6c5fe3f736 WHIRLPOOL 5c3ddd654fdecf3285d865b4b864bcaa3de87cd6005f8d500da4250b5b659db69e103743109ec3c72cb79abf24910b6de4ac05c0a7b7bcb2656d5a95c9703d38 +DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98 +DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163 SHA512 5fcbf0012af309f80e1db206e05d7861796146d765cd17f3963fde6da7f43f0e57d63dbbdbf2c554612a557aa4dee623ef62f7ca7d007834aafd7a46ca7bb1d6 WHIRLPOOL 22cdbad68462f9bac32b13be958df496411ca72fe47435ec7e3ebb470b121ba4b4a0e023913f31a92113c5a56bc4be660dfec5086bc1fb72a617d2cdeaa8adf1 +DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b WHIRLPOOL 2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885 +DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b WHIRLPOOL f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f +DIST xorg-server-1.19.2.tar.bz2 5969543 SHA256 4f8ab9f4a1a885fe7550080555381b34b82858582559e8e3c4da96e3a85884bb SHA512 258c5d615efda28170bf0fd4a19e24fd2cefe086d5ef1aada7a407b8dc2ddaa7d74ad0245e0b13155a3e6d30c65fedf054326e191b6dfe800aae881664d63f16 WHIRLPOOL 6ffca7dc695d9551efecbf9061e40862a187f16afba113467640a506c7becdb2e37d7fe042cbfe08af8ba9f2e8f538fd50460ef46a34452796436de15fa463fd +DIST xorg-server-1.19.3.tar.bz2 6050221 SHA256 677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98 SHA512 b988897418399e1361fdcca9465a781f55f8f6fbfdc5a59edfaee9046a0c6ad7a76f348d88b6004ce3d3fb3966b4c5af0b854f6549c32b2b8d7a43758809f669 WHIRLPOOL acbac6db7ba0aff8d0b906e52a783b38b1ce43a342159becb2fc696e34274c98e546e9712d59cf3360ad745555416e6be89575523285e1ca3954f9e60a5cf079 +DIST xorg-server-1.19.4.tar.bz2 5962834 SHA256 aa758acea91deaf1f95069ddc5ea3818e13675fb14fef40ad1b3d0b2bf03c9a8 SHA512 ff80934e42a7dd2d437e947fe02c74c3b25bdbb3002b7005191d52272d5eae8cb3a83377fa32f40000011be88405830e796f6bd3b914bd7fc163ea8ece76226b WHIRLPOOL 75d82daf7fa87b70182ed5d81fe785b4909b82f838530c0318444bc05ccb2a4073f4bebb2a8dd0d283dfbb5d1498dc98a9098176eff16c7a31b801bd179e3c00 +EBUILD xorg-server-1.12.4-r7.ebuild 6339 SHA256 fc06f0d552b2da33e0b232eeeb47f901c5a03b6de43d17d66a978b17770fca23 SHA512 c9ab6283536166d46402c4358e9f4279ec08a8eaf2f0c5b68496435bfcdd901c537fc85b7e2b3b90817921bf4095d7f12564f7fa24e35f49d97368c9d61620c1 WHIRLPOOL c457a40daca30fab1365c5abccde28b24ce24ec4e9feabf0f5713fe7784009b29dd49a0ee75b2ba633d3fa86f49ee462f1ba3ded9a5523e7d9dc374b825b916f +EBUILD xorg-server-1.15.2-r4.ebuild 6422 SHA256 8241831f37e51808a28c5b1e0b6cc674edb0b787a4b5e33fbfb18f1a760a7fe7 SHA512 c4c4ff0f22a2900f57a716fe9724f47ae629e6a1278bc15cc984071639e3334002c09b375d4871a538f57fae166b397773eba4d08277607f493b197bf695126a WHIRLPOOL 2e43b3ee32a6778d9f8ad678a0b913bf621f14d7e23b1e704afcfe84042f7c7a4c40a7b838557b1c3b5436db67ed736c8e851e448bc019bcc562c578cc6ccbe3 +EBUILD xorg-server-1.18.4.ebuild 6269 SHA256 7e3b05dc5b6e07ccbe18050ea12105339c7046be62900fc76d6a8973f3376e94 SHA512 2e903d0be445154fee0aa0a6f8a5598ddbdc2bc2625a5f0e623125b52ae1d828d9f97af044a45565163c92230cccffb3d9b77f2c0c69f95bb6ef8278d36bd15a WHIRLPOOL a262e7e6aedb7f0c063af59cf5c2d158097c5b46403449a25dcd5276b556e93f8f32f21442aa796e56f04d1150a8c63fe2b5c80d04ef90daa2bd4b961d7950dd +EBUILD xorg-server-1.19.2.ebuild 6495 SHA256 78089c6a548396c89095fc6beec071f94689c3fb2bfa4f1156cf330fccac400a SHA512 db296b198e270909aa86aa10749031f63d906ebff0bb1f69893a41bb96c9a5b73b929a55815ab23ad0927c7a28d9a2e64e1c5c2ccb09a8f7cb8e340e270ca4a8 WHIRLPOOL f48f9b9d36708b482ddb9c8e9334dc727f5c2759a8ce0305704efe789a2156ce871bb5700648f7b4ba37b60dd9bbcaab0fc39fde615fca57c6ba684071b266a4 +EBUILD xorg-server-1.19.3.ebuild 6512 SHA256 2e83c66c00a67d4e9d9fcf34ec762519f3c9ada917b5762088675b5d0f0cc0fa SHA512 cffa1e80ce0c8f4435384a5f92d2bf2849e2118273ac13d1e7a9eb66bb679bb122861f2ad329f1fc92f9e3ba22dda3b2eb3b91f2f8ab1783ca8f2294d61b9f4e WHIRLPOOL ad0ae175db020297a0cf3d2f9e94402c08ba93265e746e16b9e7efc80b02898db3e628a9c3b8d82f1db3f840f490305cd5ad286fbf23d6d38d8703c6bddf1641 +EBUILD xorg-server-1.19.4.ebuild 6470 SHA256 93774f4c5bb8a96c5dc0691e138408eb2472e979a80bd75f8156e34ee7a198d3 SHA512 1b14cf05e265a6905121648602fe255f64e6ce90e76420639d344785ee47354b730f66559fa0baf74d5a594e0202b0ee15d2596dfc67b5103fff30383d3bcbf1 WHIRLPOOL 4091ab008663e78eb046a478661fa75571aff266879dbb7adb465e12fc8b66e777cc8cecfdd64e3e53f040f4ba870951634aa819ff178e4392f0593bf7c35301 +EBUILD xorg-server-9999.ebuild 6169 SHA256 182dba1e70540b652a44aae356d12c1c26064ed11b508ab540ad41b97d4d3817 SHA512 23d99ad15a01a4d36b0e25869f4c742d2c8138d54e166f46194901315e79953f61da89abfd130459dd18dd7a6a3fd37775fcf4edf429702b33d0989fb31d52c2 WHIRLPOOL c05149abc68024f65edec18f04ea0d78acc50c35737a3ff221862f54737f8ead8b3d245b9a0549d5d9e8a2b68a63b64a18c9147c59fb4e73a33ad74104c3e599 +MISC ChangeLog 13297 SHA256 1977bc55d2059999337eb7da74854d87df14c185e4385d94996bee3b873acde9 SHA512 71cec7ec907faed0cd6c6d17a1cfe7e239d3ab232886b283ba5d4e96d14ec4f72dab46aae948112cd9df86e5abe7db09ebca8b975dacc0576deff3be2f07c6a0 WHIRLPOOL 35bafac5f84bbb743de840b3019eb6e665925e001af2f8ae8086f9e715e868d554a99e91ed595edd648b4eba84c3ce8a31a1fe6bb8a659606b941ea548671a27 +MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece +MISC ChangeLog-2015 67846 SHA256 1a36cba8faa911f2716c739a85f0a00df9fb898e4aa1d6b5b1289c9f65834448 SHA512 b1d90a0be5f85e7c73938b2e36dce0d8b9d820854541b9953853cd7f01387a598c0a90ea4828470771f1e98ded0939b94e2254de9dd6f7315e83e81a1def5216 WHIRLPOOL 385f495ebdf9fcd9a2f7cd7cc03aada06edc6d050a3da476bfa61c6d8ae23e8018018b5a32a9d047ada8a5e9d1fbc8982d0c27caf8f1b8756bb40efc737289a7 +MISC metadata.xml 934 SHA256 acb36a2492283548f6ece8ae25973cb832092c77976924cde61cfe4ec16a2544 SHA512 97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac WHIRLPOOL 32254696451b638c886b8d78b32973abb7a73f593f2cec14e5f6513c8acb32578881086b29701e7b74c137a21b9d58a589e9c444ca7a23ec2c5ea8dea153b28b diff --git a/x11-base/xorg-server/files/xdm-setup.initd-1 b/x11-base/xorg-server/files/xdm-setup.initd-1 new file mode 100644 index 000000000000..8f2ed27e6634 --- /dev/null +++ b/x11-base/xorg-server/files/xdm-setup.initd-1 @@ -0,0 +1,13 @@ +#!/sbin/openrc-run +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need localmount +} + +start() { + if get_bootparam "nox" ; then + touch /etc/.noxdm + fi +} diff --git a/x11-base/xorg-server/files/xdm.confd-4 b/x11-base/xorg-server/files/xdm.confd-4 new file mode 100644 index 000000000000..c82fece01cb7 --- /dev/null +++ b/x11-base/xorg-server/files/xdm.confd-4 @@ -0,0 +1,10 @@ +# We always try and start X on a static VT. The various DMs normally default +# to using VT7. If you wish to use the xdm init script, then you should ensure +# that the VT checked is the same VT your DM wants to use. We do this check to +# ensure that you haven't accidentally configured something to run on the VT +# in your /etc/inittab file so that you don't get a dead keyboard. +CHECKVT=7 + +# What display manager do you use ? [ xdm | gdm | kdm | gpe | entrance ] +# NOTE: If this is set in /etc/rc.conf, that setting will override this one. +DISPLAYMANAGER="xdm" diff --git a/x11-base/xorg-server/files/xdm.initd-11 b/x11-base/xorg-server/files/xdm.initd-11 new file mode 100644 index 000000000000..c9ec36746d09 --- /dev/null +++ b/x11-base/xorg-server/files/xdm.initd-11 @@ -0,0 +1,230 @@ +#!/sbin/openrc-run +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 + +# This is here to serve as a note to myself, and future developers. +# +# Any Display manager (gdm,kdm,xdm) has the following problem: if +# it is started before any getty, and no vt is specified, it will +# usually run on vt2. When the getty on vt2 then starts, and the +# DM is already started, the getty will take control of the keyboard, +# leaving us with a "dead" keyboard. +# +# Resolution: add the following line to /etc/inittab +# +# x:a:once:/etc/X11/startDM.sh +# +# and have /etc/X11/startDM.sh start the DM in daemon mode if +# a lock is present (with the info of what DM should be started), +# else just fall through. +# +# How this basically works, is the "a" runlevel is a additional +# runlevel that you can use to fork processes with init, but the +# runlevel never gets changed to this runlevel. Along with the "a" +# runlevel, the "once" key word means that startDM.sh will only be +# run when we specify it to run, thus eliminating respawning +# startDM.sh when "xdm" is not added to the default runlevel, as was +# done previously. +# +# This script then just calls "telinit a", and init will run +# /etc/X11/startDM.sh after the current runlevel completes (this +# script should only be added to the actual runlevel the user is +# using). +# +# Martin Schlemmer +# aka Azarah +# 04 March 2002 + +depend() { + need localmount xdm-setup + + # this should start as early as possible + # we can't do 'before *' as that breaks it + # (#139824) Start after ypbind and autofs for network authentication + # (#145219 #180163) Could use lirc mouse as input device + # (#70689 comment #92) Start after consolefont to avoid display corruption + # (#291269) Start after quota, since some dm need readable home + # (#390609) gdm-3 will fail when dbus is not running + # (#366753) starting keymaps after X causes problems + after bootmisc consolefont modules netmount + after readahead-list ypbind autofs openvpn gpm lircmd + after quota keymaps + before alsasound + + # Start before X + use consolekit dbus xfs +} + +setup_dm() { + local MY_XDM + + MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]') + + # Load our root path from profile.env + # Needed for kdm + PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}") + + NAME= + case "${MY_XDM}" in + kdm|kde) + EXE=/usr/bin/kdm + PIDFILE=/run/kdm.pid + ;; + entrance*) + EXE=/usr/sbin/entrance + PIDFILE=/run/entrance.pid + ;; + gdm|gnome) + # gdm-3 and above has different paths + if [ -f /usr/sbin/gdm ]; then + EXE=/usr/sbin/gdm + PIDFILE=/run/gdm/gdm.pid + START_STOP_ARGS="--background" + AUTOCLEAN_CGROUP="yes" + else + EXE=/usr/bin/gdm + PIDFILE=/run/gdm.pid + fi + [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary + ;; + wdm) + EXE=/usr/bin/wdm + PIDFILE= + ;; + gpe) + EXE=/usr/bin/gpe-dm + PIDFILE=/run/gpe-dm.pid + ;; + lxdm) + EXE=/usr/sbin/lxdm-binary + PIDFILE=/run/lxdm.pid + START_STOP_ARGS="--background" + ;; + lightdm) + EXE=/usr/sbin/lightdm + PIDFILE=/run/lightdm.pid + START_STOP_ARGS="--background" + ;; + sddm) + EXE="/usr/bin/sddm" + START_STOP_ARGS="-m --background" + PIDFILE=/run/sddm.pid + ;; + *) + # first find out if there is such executable + EXE="$(command -v ${MY_XDM} 2>/dev/null)" + PIDFILE="/run/${MY_XDM}.pid" + + # warn user that he is doing sick things if the exe was not found + if [ -z "${EXE}" ]; then + echo "ERROR: Your XDM value is invalid." + echo " No ${MY_XDM} executable could be found on your system." + fi + ;; + esac + + if ! [ -x "${EXE}" ]; then + EXE=/usr/bin/xdm + PIDFILE=/run/xdm.pid + if ! [ -x "/usr/bin/xdm" ]; then + echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm," + echo " or install x11-apps/xdm package" + eend 255 + fi + fi +} + +# Check to see if something is defined on our VT +vtstatic() { + if [ -e /etc/inittab ] ; then + grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab + elif [ -e /etc/ttys ] ; then + grep -q "^ttyv$(($1 - 1))" /etc/ttys + else + return 1 + fi +} + +start() { + local EXE NAME PIDFILE AUTOCLEAN_CGROUP + setup_dm + + if [ -f /etc/.noxdm ]; then + einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed." + rm /etc/.noxdm + return 0 + fi + + ebegin "Setting up ${EXE##*/}" + + # save the prefered DM + save_options "service" "${EXE}" + save_options "name" "${NAME}" + save_options "pidfile" "${PIDFILE}" + save_options "start_stop_args" "${START_STOP_ARGS}" + save_options "autoclean_cgroup" "${AUTOCLEAN_CGROUP:-no}" + + if [ -n "${CHECKVT-y}" ] ; then + if vtstatic "${CHECKVT:-7}" ; then + if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then + ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later" + telinit a >/dev/null 2>&1 + return 0 + else + eerror "Something is already defined on VT ${CHECKVT:-7}, not starting" + return 1 + fi + fi + fi + + /etc/X11/startDM.sh + eend 0 +} + +stop() { + local curvt retval + + retval=0 + if [ -t 0 ]; then + if type fgconsole >/dev/null 2>&1; then + curvt=$(fgconsole 2>/dev/null) + else + curvt=$(tty) + case "${curvt}" in + /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;; + *) curvt= ;; + esac + fi + fi + local myexe myname mypidfile myservice + myexe=$(get_options "service") + myname=$(get_options "name") + mypidfile=$(get_options "pidfile") + myservice=${myexe##*/} + yesno "${rc_cgroup_cleanup:-no}" || rc_cgroup_cleanup=$(get_options "autoclean_cgroup") + + [ -z "${myexe}" ] && return 0 + + ebegin "Stopping ${myservice}" + + if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then + start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ + ${mypidfile:+--pidfile} ${mypidfile} \ + ${myname:+--name} ${myname} + retval=${?} + fi + + # switch back to original vt + if [ -n "${curvt}" ]; then + if type chvt >/dev/null 2>&1; then + chvt "${curvt}" + else + vidcontrol -s "$((curvt + 1))" + fi + fi + + eend ${retval} "Error stopping ${myservice}" + return ${retval} +} + +# vim: set ts=4 : diff --git a/x11-base/xorg-server/files/xdm.initd-9 b/x11-base/xorg-server/files/xdm.initd-9 new file mode 100644 index 000000000000..d6e20a6dd73e --- /dev/null +++ b/x11-base/xorg-server/files/xdm.initd-9 @@ -0,0 +1,215 @@ +#!/sbin/openrc-run +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 + +# This is here to serve as a note to myself, and future developers. +# +# Any Display manager (gdm,kdm,xdm) has the following problem: if +# it is started before any getty, and no vt is specified, it will +# usually run on vt2. When the getty on vt2 then starts, and the +# DM is already started, the getty will take control of the keyboard, +# leaving us with a "dead" keyboard. +# +# Resolution: add the following line to /etc/inittab +# +# x:a:once:/etc/X11/startDM.sh +# +# and have /etc/X11/startDM.sh start the DM in daemon mode if +# a lock is present (with the info of what DM should be started), +# else just fall through. +# +# How this basically works, is the "a" runlevel is a additional +# runlevel that you can use to fork processes with init, but the +# runlevel never gets changed to this runlevel. Along with the "a" +# runlevel, the "once" key word means that startDM.sh will only be +# run when we specify it to run, thus eliminating respawning +# startDM.sh when "xdm" is not added to the default runlevel, as was +# done previously. +# +# This script then just calls "telinit a", and init will run +# /etc/X11/startDM.sh after the current runlevel completes (this +# script should only be added to the actual runlevel the user is +# using). +# +# Martin Schlemmer +# aka Azarah +# 04 March 2002 + +depend() { + need localmount xdm-setup + + # this should start as early as possible + # we can't do 'before *' as that breaks it + # (#139824) Start after ypbind and autofs for network authentication + # (#145219 #180163) Could use lirc mouse as input device + # (#70689 comment #92) Start after consolefont to avoid display corruption + # (#291269) Start after quota, since some dm need readable home + # (#390609) gdm-3 will fail when dbus is not running + # (#366753) starting keymaps after X causes problems + after bootmisc consolefont modules netmount + after readahead-list ypbind autofs openvpn gpm lircmd + after quota keymaps + before alsasound + + # Start before X + use consolekit dbus xfs +} + +setup_dm() { + local MY_XDM + + MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]') + + # Load our root path from profile.env + # Needed for kdm + PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}") + + NAME= + case "${MY_XDM}" in + kdm|kde) + EXE=/usr/bin/kdm + PIDFILE=/var/run/kdm.pid + ;; + entrance*) + EXE=/usr/sbin/entrance + PIDFILE=/var/run/entrance.pid + ;; + gdm|gnome) + EXE=/usr/bin/gdm + [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary + PIDFILE=/var/run/gdm.pid + ;; + wdm) + EXE=/usr/bin/wdm + PIDFILE= + ;; + gpe) + EXE=/usr/bin/gpe-dm + PIDFILE=/var/run/gpe-dm.pid + ;; + lxdm) + EXE=/usr/sbin/lxdm-binary + PIDFILE=/var/run/lxdm.pid + START_STOP_ARGS="--background" + ;; + lightdm) + EXE=/usr/sbin/lightdm + PIDFILE=/var/run/lightdm.pid + START_STOP_ARGS="--background" + ;; + *) + # first find out if there is such executable + EXE="$(command -v ${MY_XDM} 2>/dev/null)" + PIDFILE="/var/run/${MY_XDM}.pid" + + # warn user that he is doing sick things if the exe was not found + if [ -z "${EXE}" ]; then + echo "ERROR: Your XDM value is invalid." + echo " No ${MY_XDM} executable could be found on your system." + fi + ;; + esac + + if ! [ -x "${EXE}" ]; then + EXE=/usr/bin/xdm + PIDFILE=/var/run/xdm.pid + if ! [ -x "/usr/bin/xdm" ]; then + echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm," + echo " or install x11-apps/xdm package" + eend 255 + fi + fi +} + +# Check to see if something is defined on our VT +vtstatic() { + if [ -e /etc/inittab ] ; then + grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab + elif [ -e /etc/ttys ] ; then + grep -q "^ttyv$(($1 - 1))" /etc/ttys + else + return 1 + fi +} + +start() { + local EXE NAME PIDFILE + setup_dm + + if [ -f /etc/.noxdm ]; then + einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed." + rm /etc/.noxdm + return 0 + fi + + ebegin "Setting up ${EXE##*/}" + + # save the prefered DM + save_options "service" "${EXE}" + save_options "name" "${NAME}" + save_options "pidfile" "${PIDFILE}" + save_options "start_stop_args" "${START_STOP_ARGS}" + + if [ -n "${CHECKVT-y}" ] ; then + if vtstatic "${CHECKVT:-7}" ; then + if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then + ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later" + telinit a >/dev/null 2>&1 + return 0 + else + eerror "Something is already defined on VT ${CHECKVT:-7}, not starting" + return 1 + fi + fi + fi + + /etc/X11/startDM.sh + eend 0 +} + +stop() { + local curvt retval + + retval=0 + if [ -t 0 ]; then + if type fgconsole >/dev/null 2>&1; then + curvt=$(fgconsole 2>/dev/null) + else + curvt=$(tty) + case "${curvt}" in + /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;; + *) curvt= ;; + esac + fi + fi + local myexe myname mypidfile myservice + myexe=$(get_options "service") + myname=$(get_options "name") + mypidfile=$(get_options "pidfile") + myservice=${myexe##*/} + + [ -z "${myexe}" ] && return 0 + + ebegin "Stopping ${myservice}" + + if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then + start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ + ${mypidfile:+--pidfile} ${mypidfile} \ + ${myname:+--name} ${myname} + retval=${?} + fi + + # switch back to original vt + if [ -n "${curvt}" ]; then + if type chvt >/dev/null 2>&1; then + chvt "${curvt}" + else + vidcontrol -s "$((curvt + 1))" + fi + fi + + eend ${retval} "Error stopping ${myservice}" + return ${retval} +} + +# vim: set ts=4 : diff --git a/x11-base/xorg-server/files/xorg-server-1.12-cve-2013-1940.patch b/x11-base/xorg-server/files/xorg-server-1.12-cve-2013-1940.patch new file mode 100644 index 000000000000..d85494f90293 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.12-cve-2013-1940.patch @@ -0,0 +1,34 @@ +From 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@gmail.com> +Date: Wed, 10 Apr 2013 06:09:01 +0000 +Subject: xf86: fix flush input to work with Linux evdev devices. + +So when we VT switch back and attempt to flush the input devices, +we don't succeed because evdev won't return part of an event, +since we were only asking for 4 bytes, we'd only get -EINVAL back. + +This could later cause events to be flushed that we shouldn't have +gotten. + +This is a fix for CVE-2013-1940. + +Signed-off-by: Dave Airlie <airlied@redhat.com> +Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- +diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c +index ab3757a..4d08c1e 100644 +--- a/hw/xfree86/os-support/shared/posix_tty.c ++++ b/hw/xfree86/os-support/shared/posix_tty.c +@@ -421,7 +421,8 @@ xf86FlushInput(int fd) + { + fd_set fds; + struct timeval timeout; +- char c[4]; ++ /* this needs to be big enough to flush an evdev event. */ ++ char c[256]; + + DebugF("FlushingSerial\n"); + if (tcflush(fd, TCIFLUSH) == 0) +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-base/xorg-server/files/xorg-server-1.12-cve-2013-4396.patch b/x11-base/xorg-server/files/xorg-server-1.12-cve-2013-4396.patch new file mode 100644 index 000000000000..4b6727e61c05 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.12-cve-2013-4396.patch @@ -0,0 +1,75 @@ +From 7bddc2ba16a2a15773c2ea8947059afa27727764 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon, 16 Sep 2013 21:47:16 -0700 +Subject: [PATCH] Avoid use-after-free in dix/dixfonts.c: doImageText() + [CVE-2013-4396] + +Save a pointer to the passed in closure structure before copying it +and overwriting the *c pointer to point to our copy instead of the +original. If we hit an error, once we free(c), reset c to point to +the original structure before jumping to the cleanup code that +references *c. + +Since one of the errors being checked for is whether the server was +able to malloc(c->nChars * itemSize), the client can potentially pass +a number of characters chosen to cause the malloc to fail and the +error path to be taken, resulting in the read from freed memory. + +Since the memory is accessed almost immediately afterwards, and the +X server is mostly single threaded, the odds of the free memory having +invalid contents are low with most malloc implementations when not using +memory debugging features, but some allocators will definitely overwrite +the memory there, leading to a likely crash. + +Reported-by: Pedro Ribeiro <pedrib@gmail.com> +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> +Reviewed-by: Julien Cristau <jcristau@debian.org> +--- + dix/dixfonts.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/dix/dixfonts.c b/dix/dixfonts.c +index feb765d..2e34d37 100644 +--- a/dix/dixfonts.c ++++ b/dix/dixfonts.c +@@ -1425,6 +1425,7 @@ doImageText(ClientPtr client, ITclosurePtr c) + GC *pGC; + unsigned char *data; + ITclosurePtr new_closure; ++ ITclosurePtr old_closure; + + /* We're putting the client to sleep. We need to + save some state. Similar problem to that handled +@@ -1436,12 +1437,14 @@ doImageText(ClientPtr client, ITclosurePtr c) + err = BadAlloc; + goto bail; + } ++ old_closure = c; + *new_closure = *c; + c = new_closure; + + data = malloc(c->nChars * itemSize); + if (!data) { + free(c); ++ c = old_closure; + err = BadAlloc; + goto bail; + } +@@ -1452,6 +1455,7 @@ doImageText(ClientPtr client, ITclosurePtr c) + if (!pGC) { + free(c->data); + free(c); ++ c = old_closure; + err = BadAlloc; + goto bail; + } +@@ -1464,6 +1468,7 @@ doImageText(ClientPtr client, ITclosurePtr c) + FreeScratchGC(pGC); + free(c->data); + free(c); ++ c = old_closure; + err = BadAlloc; + goto bail; + } +-- +1.7.9.2 diff --git a/x11-base/xorg-server/files/xorg-server-1.12-cve-2015-3418.patch b/x11-base/xorg-server/files/xorg-server-1.12-cve-2015-3418.patch new file mode 100644 index 000000000000..4b6a6aeab29e --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.12-cve-2015-3418.patch @@ -0,0 +1,29 @@ +From dc777c346d5d452a53b13b917c45f6a1bad2f20b Mon Sep 17 00:00:00 2001 +From: Keith Packard <keithp@keithp.com> +Date: Sat, 3 Jan 2015 08:46:45 -0800 +Subject: dix: Allow zero-height PutImage requests + +The length checking code validates PutImage height and byte width by +making sure that byte-width >= INT32_MAX / height. If height is zero, +this generates a divide by zero exception. Allow zero height requests +explicitly, bypassing the INT32_MAX check. + +Signed-off-by: Keith Packard <keithp@keithp.com> +Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +diff --git a/dix/dispatch.c b/dix/dispatch.c +index 55b978d..9044ac7 100644 +--- a/dix/dispatch.c ++++ b/dix/dispatch.c +@@ -2000,7 +2000,7 @@ ProcPutImage(ClientPtr client) + tmpImage = (char *) &stuff[1]; + lengthProto = length; + +- if (lengthProto >= (INT32_MAX / stuff->height)) ++ if (stuff->height != 0 && lengthProto >= (INT32_MAX / stuff->height)) + return BadLength; + + if ((bytes_to_int32(lengthProto * stuff->height) + +-- +cgit v0.10.2 + diff --git a/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch new file mode 100644 index 000000000000..df43dbde8288 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch @@ -0,0 +1,11 @@ +diff -ur a/configure.ac b/configure.ac +--- a/configure.ac 2011-10-31 19:40:02.000000000 +0100 ++++ b/configure.ac 2011-10-31 19:41:02.372745481 +0100 +@@ -1624,7 +1624,6 @@ + linux_alpha=yes + ;; + i*86|amd64*|x86_64*|ia64*) +- linux_acpi="yes" + ;; + *) + ;; diff --git a/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch b/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch new file mode 100644 index 000000000000..24a5a02f4fd6 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch @@ -0,0 +1,60 @@ +diff -r --context xorg-server-1.12.3/hw/xfree86/common/compiler.h xorg-server-1.12.3-fix/hw/xfree86/common/compiler.h +*** xorg-server-1.12.3/hw/xfree86/common/compiler.h 2012-07-06 07:17:19.000000000 +0200 +--- xorg-server-1.12.3-fix/hw/xfree86/common/compiler.h 2012-08-29 00:14:39.000000000 +0200 +*************** +*** 421,426 **** +--- 421,474 ---- + #include <machine/pio.h> + #endif /* __NetBSD__ */ + ++ #elif defined(linux) && defined(__ia64__) ++ /* for Linux on ia64, we use the LIBC _inx/_outx routines */ ++ /* note that the appropriate setup via "ioperm" needs to be done */ ++ /* *before* any inx/outx is done. */ ++ ++ extern _X_EXPORT void _outb(unsigned char val, unsigned long port); ++ extern _X_EXPORT void _outw(unsigned short val, unsigned long port); ++ extern _X_EXPORT void _outl(unsigned int val, unsigned long port); ++ extern _X_EXPORT unsigned int _inb(unsigned long port); ++ extern _X_EXPORT unsigned int _inw(unsigned long port); ++ extern _X_EXPORT unsigned int _inl(unsigned long port); ++ ++ static __inline__ void ++ outb(unsigned long port, unsigned char val) ++ { ++ _outb(val, port); ++ } ++ ++ static __inline__ void ++ outw(unsigned long port, unsigned short val) ++ { ++ _outw(val, port); ++ } ++ ++ static __inline__ void ++ outl(unsigned long port, unsigned int val) ++ { ++ _outl(val, port); ++ } ++ ++ static __inline__ unsigned int ++ inb(unsigned long port) ++ { ++ return _inb(port); ++ } ++ ++ static __inline__ unsigned int ++ inw(unsigned long port) ++ { ++ return _inw(port); ++ } ++ ++ static __inline__ unsigned int ++ inl(unsigned long port) ++ { ++ return _inl(port); ++ } ++ + #elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__) + + #include <inttypes.h> diff --git a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch new file mode 100644 index 000000000000..57c7349da6a7 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch @@ -0,0 +1,53 @@ +diff -u13 -r xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c xorg-server-1.12.3/hw/xfree86/loader/loadmod.c +--- xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c 2012-09-05 18:26:42.000000000 +0200 ++++ xorg-server-1.12.3/hw/xfree86/loader/loadmod.c 2012-09-05 18:28:54.000000000 +0200 +@@ -1109,39 +1109,38 @@ + static void + RemoveChild(ModuleDescPtr child) + { + ModuleDescPtr mdp; + ModuleDescPtr prevsib; + ModuleDescPtr parent; + + if (!child->parent) + return; + + parent = child->parent; + if (parent->child == child) { + parent->child = child->sib; +- return; +- } +- +- prevsib = parent->child; +- mdp = prevsib->sib; +- while (mdp && mdp != child) { +- prevsib = mdp; +- mdp = mdp->sib; ++ } ++ else { ++ prevsib = parent->child; ++ mdp = prevsib->sib; ++ while (mdp && mdp != child) { ++ prevsib = mdp; ++ mdp = mdp->sib; ++ } ++ if (mdp == child) ++ prevsib->sib = child->sib; + } +- if (mdp == child) +- prevsib->sib = child->sib; + child->sib = NULL; +- return; + } + + void + LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin) + { + const char *msg; + MessageType type = X_ERROR; + + switch (errmaj) { + case LDR_NOERROR: + msg = "no error"; + break; + case LDR_NOMEM: diff --git a/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-0255-0.patch b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-0255-0.patch new file mode 100644 index 000000000000..9540e31694ea --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-0255-0.patch @@ -0,0 +1,102 @@ +From 81c90dc8f0aae3b65730409b1b615b5fa7280ebd Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan <ofourdan@redhat.com> +Date: Fri, 16 Jan 2015 20:08:59 +0100 +Subject: xkb: Don't swap XkbSetGeometry data in the input buffer + +The XkbSetGeometry request embeds data which needs to be swapped when the +server and the client have different endianess. + +_XkbSetGeometry() invokes functions that swap these data directly in the +input buffer. + +However, ProcXkbSetGeometry() may call _XkbSetGeometry() more than once +(if there is more than one keyboard), thus causing on swapped clients the +same data to be swapped twice in memory, further causing a server crash +because the strings lengths on the second time are way off bounds. + +To allow _XkbSetGeometry() to run reliably more than once with swapped +clients, do not swap the data in the buffer, use variables instead. + +Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +diff --git a/xkb/xkb.c b/xkb/xkb.c +index 15c7f34..b9a3ac4 100644 +--- a/xkb/xkb.c ++++ b/xkb/xkb.c +@@ -4961,14 +4961,13 @@ static char * + _GetCountedString(char **wire_inout, Bool swap) + { + char *wire, *str; +- CARD16 len, *plen; ++ CARD16 len; + + wire = *wire_inout; +- plen = (CARD16 *) wire; ++ len = *(CARD16 *) wire; + if (swap) { +- swaps(plen); ++ swaps(&len); + } +- len = *plen; + str = malloc(len + 1); + if (str) { + memcpy(str, &wire[2], len); +@@ -4985,25 +4984,28 @@ _CheckSetDoodad(char **wire_inout, + { + char *wire; + xkbDoodadWireDesc *dWire; ++ xkbAnyDoodadWireDesc any; ++ xkbTextDoodadWireDesc text; + XkbDoodadPtr doodad; + + dWire = (xkbDoodadWireDesc *) (*wire_inout); ++ any = dWire->any; + wire = (char *) &dWire[1]; + if (client->swapped) { +- swapl(&dWire->any.name); +- swaps(&dWire->any.top); +- swaps(&dWire->any.left); +- swaps(&dWire->any.angle); ++ swapl(&any.name); ++ swaps(&any.top); ++ swaps(&any.left); ++ swaps(&any.angle); + } + CHK_ATOM_ONLY(dWire->any.name); +- doodad = XkbAddGeomDoodad(geom, section, dWire->any.name); ++ doodad = XkbAddGeomDoodad(geom, section, any.name); + if (!doodad) + return BadAlloc; + doodad->any.type = dWire->any.type; + doodad->any.priority = dWire->any.priority; +- doodad->any.top = dWire->any.top; +- doodad->any.left = dWire->any.left; +- doodad->any.angle = dWire->any.angle; ++ doodad->any.top = any.top; ++ doodad->any.left = any.left; ++ doodad->any.angle = any.angle; + switch (doodad->any.type) { + case XkbOutlineDoodad: + case XkbSolidDoodad: +@@ -5026,12 +5028,13 @@ _CheckSetDoodad(char **wire_inout, + dWire->text.colorNdx); + return BadMatch; + } ++ text = dWire->text; + if (client->swapped) { +- swaps(&dWire->text.width); +- swaps(&dWire->text.height); ++ swaps(&text.width); ++ swaps(&text.height); + } +- doodad->text.width = dWire->text.width; +- doodad->text.height = dWire->text.height; ++ doodad->text.width = text.width; ++ doodad->text.height = text.height; + doodad->text.color_ndx = dWire->text.colorNdx; + doodad->text.text = _GetCountedString(&wire, client->swapped); + doodad->text.font = _GetCountedString(&wire, client->swapped); +-- +cgit v0.10.2 + diff --git a/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-0255-1.patch b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-0255-1.patch new file mode 100644 index 000000000000..be131c2762fd --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-0255-1.patch @@ -0,0 +1,138 @@ +From 20079c36cf7d377938ca5478447d8b9045cb7d43 Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan <ofourdan@redhat.com> +Date: Fri, 16 Jan 2015 08:44:45 +0100 +Subject: xkb: Check strings length against request size + +Ensure that the given strings length in an XkbSetGeometry request remain +within the limits of the size of the request. + +Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> +Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +diff --git a/xkb/xkb.c b/xkb/xkb.c +index b9a3ac4..f3988f9 100644 +--- a/xkb/xkb.c ++++ b/xkb/xkb.c +@@ -4957,25 +4957,29 @@ ProcXkbGetGeometry(ClientPtr client) + + /***====================================================================***/ + +-static char * +-_GetCountedString(char **wire_inout, Bool swap) ++static Status ++_GetCountedString(char **wire_inout, ClientPtr client, char **str) + { +- char *wire, *str; ++ char *wire, *next; + CARD16 len; + + wire = *wire_inout; + len = *(CARD16 *) wire; +- if (swap) { ++ if (client->swapped) { + swaps(&len); + } +- str = malloc(len + 1); +- if (str) { +- memcpy(str, &wire[2], len); +- str[len] = '\0'; +- } +- wire += XkbPaddedSize(len + 2); +- *wire_inout = wire; +- return str; ++ next = wire + XkbPaddedSize(len + 2); ++ /* Check we're still within the size of the request */ ++ if (client->req_len < ++ bytes_to_int32(next - (char *) client->requestBuffer)) ++ return BadValue; ++ *str = malloc(len + 1); ++ if (!*str) ++ return BadAlloc; ++ memcpy(*str, &wire[2], len); ++ *(*str + len) = '\0'; ++ *wire_inout = next; ++ return Success; + } + + static Status +@@ -4987,6 +4991,7 @@ _CheckSetDoodad(char **wire_inout, + xkbAnyDoodadWireDesc any; + xkbTextDoodadWireDesc text; + XkbDoodadPtr doodad; ++ Status status; + + dWire = (xkbDoodadWireDesc *) (*wire_inout); + any = dWire->any; +@@ -5036,8 +5041,14 @@ _CheckSetDoodad(char **wire_inout, + doodad->text.width = text.width; + doodad->text.height = text.height; + doodad->text.color_ndx = dWire->text.colorNdx; +- doodad->text.text = _GetCountedString(&wire, client->swapped); +- doodad->text.font = _GetCountedString(&wire, client->swapped); ++ status = _GetCountedString(&wire, client, &doodad->text.text); ++ if (status != Success) ++ return status; ++ status = _GetCountedString(&wire, client, &doodad->text.font); ++ if (status != Success) { ++ free (doodad->text.text); ++ return status; ++ } + break; + case XkbIndicatorDoodad: + if (dWire->indicator.onColorNdx >= geom->num_colors) { +@@ -5072,7 +5083,9 @@ _CheckSetDoodad(char **wire_inout, + } + doodad->logo.color_ndx = dWire->logo.colorNdx; + doodad->logo.shape_ndx = dWire->logo.shapeNdx; +- doodad->logo.logo_name = _GetCountedString(&wire, client->swapped); ++ status = _GetCountedString(&wire, client, &doodad->logo.logo_name); ++ if (status != Success) ++ return status; + break; + default: + client->errorValue = _XkbErrCode2(0x4F, dWire->any.type); +@@ -5304,18 +5317,20 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * req, ClientPtr client) + char *wire; + + wire = (char *) &req[1]; +- geom->label_font = _GetCountedString(&wire, client->swapped); ++ status = _GetCountedString(&wire, client, &geom->label_font); ++ if (status != Success) ++ return status; + + for (i = 0; i < req->nProperties; i++) { + char *name, *val; + +- name = _GetCountedString(&wire, client->swapped); +- if (!name) +- return BadAlloc; +- val = _GetCountedString(&wire, client->swapped); +- if (!val) { ++ status = _GetCountedString(&wire, client, &name); ++ if (status != Success) ++ return status; ++ status = _GetCountedString(&wire, client, &val); ++ if (status != Success) { + free(name); +- return BadAlloc; ++ return status; + } + if (XkbAddGeomProperty(geom, name, val) == NULL) { + free(name); +@@ -5349,9 +5364,9 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * req, ClientPtr client) + for (i = 0; i < req->nColors; i++) { + char *name; + +- name = _GetCountedString(&wire, client->swapped); +- if (!name) +- return BadAlloc; ++ status = _GetCountedString(&wire, client, &name); ++ if (status != Success) ++ return status; + if (!XkbAddGeomColor(geom, name, geom->num_colors)) { + free(name); + return BadAlloc; +-- +cgit v0.10.2 + diff --git a/x11-base/xorg-server/files/xorg-server-1.17.2-uninit-clientsWritable.patch b/x11-base/xorg-server/files/xorg-server-1.17.2-uninit-clientsWritable.patch new file mode 100644 index 000000000000..681819619ebc --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.17.2-uninit-clientsWritable.patch @@ -0,0 +1,65 @@ +https://bugs.gentoo.org/show_bug.cgi?id=555776 + +From 7cc7ffd25d5e50b54cb942d07d4cb160f20ff9c5 Mon Sep 17 00:00:00 2001 +From: Martin Peres <martin.peres@linux.intel.com> +Date: Fri, 17 Jul 2015 17:21:26 +0300 +Subject: [PATCH] os: make sure the clientsWritable fd_set is initialized + before use + +In WaitForSomething(), the fd_set clientsWritable may be used unitialized when +the boolean AnyClientsWriteBlocked is set in the WakeupHandler(). This leads to +a crash in FlushAllOutput() after x11proto's commit +2c94cdb453bc641246cc8b9a876da9799bee1ce7. + +The problem did not manifest before because both the XFD_SIZE and the maximum +number of clients were set to 256. As the connectionTranslation table was +initalized for the 256 clients to 0, the test on the index not being 0 was +aborting before dereferencing the client #0. + +As of commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7 in x11proto, the XFD_SIZE +got bumped to 512. This lead the OutputPending fd_set to have any fd above 256 +to be uninitialized which in turns lead to reading an index after the end of +the ConnectionTranslation table. This index would then be used to find the +client corresponding to the fd marked as pending writes and would also result +to an out-of-bound access which would usually be the fatal one. + +Fix this by zeroing the clientsWritable fd_set at the beginning of +WaitForSomething(). In this case, the bottom part of the loop, which would +indirectly call FlushAllOutput, will not do any work but the next call to +select will result in the execution of the right codepath. This is exactly what +we want because we need to know the writable clients before handling them. In +the end, it also makes sure that the fds above MaxClient are initialized, +preventing the crash in FlushAllOutput(). + +Thanks to everyone involved in tracking this one down! + +Reported-by: Karol Herbst <freedesktop@karolherbst.de> +Reported-by: Tobias Klausmann <tobias.klausmann@mni.thm.de> +Signed-off-by: Martin Peres <martin.peres@linux.intel.com> +Tested-by: Martin Peres <martin.peres@linux.intel.com> +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91316 +Cc: Ilia Mirkin <imirkin@alum.mit.edu> +Cc: Martin Peres <martin.peres@linux.intel.com> +Cc: Olivier Fourdan <ofourdan@redhat.com +Cc: Adam Jackson <ajax@redhat.com> +Cc: Alan Coopersmith <alan.coopersmith@oracle.com +Cc: Chris Wilson <chris@chris-wilson.co.uk> +--- + os/WaitFor.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/os/WaitFor.c b/os/WaitFor.c +index 431f1a6..993c14e 100644 +--- a/os/WaitFor.c ++++ b/os/WaitFor.c +@@ -158,6 +158,7 @@ WaitForSomething(int *pClientsReady) + Bool someReady = FALSE; + + FD_ZERO(&clientsReadable); ++ FD_ZERO(&clientsWritable); + + if (nready) + SmartScheduleStopTimer(); +-- +2.4.5 + diff --git a/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch new file mode 100644 index 000000000000..0a611456a1f7 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch @@ -0,0 +1,53 @@ +See http://lists.x.org/archives/xorg-devel/2015-February/045755.html + +diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c +index 849bf92..5cc3ec7 100644 +--- a/hw/xfree86/parser/Files.c ++++ b/hw/xfree86/parser/Files.c +@@ -76,14 +76,18 @@ static xf86ConfigSymTabRec FilesTab[] = { + #define CLEANUP xf86freeFiles + + XF86ConfFilesPtr +-xf86parseFilesSection(void) ++xf86parseFilesSection(XF86ConfFilesPtr ptr) + { + int i, j; + int k, l; + char *str; + int token; + +- parsePrologue(XF86ConfFilesPtr, XF86ConfFilesRec) ++ if (!ptr) { ++ if( (ptr=calloc(1,sizeof(XF86ConfFilesRec))) == NULL ) { ++ return NULL; ++ } ++ } + + while ((token = xf86getToken(FilesTab)) != ENDSECTION) { + switch (token) { +diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h +index 171f8e8..e8199fe 100644 +--- a/hw/xfree86/parser/configProcs.h ++++ b/hw/xfree86/parser/configProcs.h +@@ -36,7 +36,7 @@ void xf86freeDeviceList(XF86ConfDevicePtr ptr); + int xf86validateDevice(XF86ConfigPtr p); + + /* Files.c */ +-XF86ConfFilesPtr xf86parseFilesSection(void); ++XF86ConfFilesPtr xf86parseFilesSection(XF86ConfFilesPtr ptr); + void xf86printFileSection(FILE * cf, XF86ConfFilesPtr ptr); + void xf86freeFiles(XF86ConfFilesPtr p); + +diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c +index 327c02a..e0d6139 100644 +--- a/hw/xfree86/parser/read.c ++++ b/hw/xfree86/parser/read.c +@@ -110,7 +110,7 @@ xf86readConfigFile(void) + if (xf86nameCompare(xf86_lex_val.str, "files") == 0) { + free(xf86_lex_val.str); + xf86_lex_val.str = NULL; +- HANDLE_RETURN(conf_files, xf86parseFilesSection()); ++ HANDLE_RETURN(conf_files, xf86parseFilesSection(ptr->conf_files)); + } + else if (xf86nameCompare(xf86_lex_val.str, "serverflags") == 0) { + free(xf86_lex_val.str); diff --git a/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch b/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch new file mode 100644 index 000000000000..5a3dea366121 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch @@ -0,0 +1,59 @@ +From 1df7e4f5c1090631ff6584176f7d1370d08bc15e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz> +Date: Sat, 16 Apr 2016 13:04:59 +0200 +Subject: [PATCH] Include sys/sysmacros.h for major(3) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GNU major(3) manual page prescribes <sys/types.h>, but that does not work with +sys-libs/glibc-2.23-r1. + +https://bugs.gentoo.org/show_bug.cgi?id=580044 +Signed-off-by: Petr Písař <petr.pisar@atlas.cz> +--- + config/udev.c | 1 + + hw/xfree86/common/xf86Xinput.c | 2 ++ + hw/xfree86/os-support/linux/lnx_init.c | 1 + + 3 files changed, 4 insertions(+) + +diff --git a/config/udev.c b/config/udev.c +index 28c2658..62908f4 100644 +--- a/config/udev.c ++++ b/config/udev.c +@@ -30,6 +30,7 @@ + #include <libudev.h> + #include <ctype.h> + #include <unistd.h> ++#include <sys/sysmacros.h> + + #include "input.h" + #include "inputstr.h" +diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c +index c56a2b9..d33c165 100644 +--- a/hw/xfree86/common/xf86Xinput.c ++++ b/hw/xfree86/common/xf86Xinput.c +@@ -86,6 +86,8 @@ + #include <unistd.h> + #ifdef HAVE_SYS_MKDEV_H + #include <sys/mkdev.h> /* for major() & minor() on Solaris */ ++#else ++#include <sys/sysmacros.h> + #endif + + #include "mi.h" +diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c +index 1ed213c..6caf531 100644 +--- a/hw/xfree86/os-support/linux/lnx_init.c ++++ b/hw/xfree86/os-support/linux/lnx_init.c +@@ -38,6 +38,7 @@ + #include "xf86_OSlib.h" + + #include <sys/stat.h> ++#include <sys/sysmacros.h> + + #ifndef K_OFF + #define K_OFF 0x4 +-- +2.8.1 + diff --git a/x11-base/xorg-server/files/xorg-sets.conf b/x11-base/xorg-server/files/xorg-sets.conf new file mode 100644 index 000000000000..5cd8112f583c --- /dev/null +++ b/x11-base/xorg-server/files/xorg-sets.conf @@ -0,0 +1,6 @@ +# Rebuild all X11 modules (mostly useful after xorg-server ABI change). +[x11-module-rebuild] +class = portage.sets.dbapi.VariableSet +world-candidate = false +variable = CATEGORY +includes = x11-drivers diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml new file mode 100644 index 000000000000..8c8c243082ed --- /dev/null +++ b/x11-base/xorg-server/metadata.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> +</maintainer> +<use> + <flag name="dmx">Build the Distributed Multiheaded X server</flag> + <flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag> + <flag name="kdrive">Build the kdrive X servers</flag> + <flag name="tslib">Build with tslib support for touchscreen devices</flag> + <flag name="unwind">Enable libunwind usage for backtraces</flag> + <flag name="xcsecurity">Build Security extension</flag> + <flag name="xnest">Build the Xnest server</flag> + <flag name="xephyr">Build the Xephyr server</flag> + <flag name="xorg">Build the Xorg X server (HIGHLY RECOMMENDED)</flag> + <flag name="xvfb">Build the Xvfb server</flag> +</use> +<upstream> + <remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id> +</upstream> +</pkgmetadata> diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild new file mode 100644 index 000000000000..3948af492ead --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild @@ -0,0 +1,225 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic +EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" + +DESCRIPTION="X.Org X servers" +SLOT="0/${PV}" +KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" + +SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.12-cve-2014-8091..8103.patches.tar.xz" + +IUSE_SERVERS="dmx kdrive xnest xorg xvfb" +IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev" + +RDEPEND=">=app-eselect/eselect-opengl-1.3.0 + dev-libs/openssl:0= + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont-1.4.2 + <x11-libs/libXfont-1.5.0 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/pixman-0.21.8 + >=x11-libs/xtrans-1.2.2 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-10.3.7-r2[nptl=] + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=virtual/udev-150 ) + >=x11-apps/xinit-1.3 + selinux? ( sec-policy/selinux-xserver )" + +DEPEND="${RDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.0.2 + <x11-proto/fontsproto-2.1.3 + >=x11-proto/glproto-1.4.17-r1 + >=x11-proto/inputproto-2.1.99.3 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.2.99.3 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.0.2 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.1.99 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.22 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + >=x11-proto/dri2proto-2.6 + >=x11-libs/libdrm-2.4.20 + )" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + )" + +# Security patches taken from Debian from their 1.12 package +UPSTREAMED_PATCHES=( + "${WORKDIR}"/patches/${PN}-1.12-cve-2014-8091..8103.patch +) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-disable-acpi.patch + "${FILESDIR}"/${PN}-1.12-cve-2013-1940.patch + "${FILESDIR}"/${PN}-1.12-cve-2013-4396.patch + "${FILESDIR}"/${PN}-1.17-cve-2015-0255-0.patch + "${FILESDIR}"/${PN}-1.17-cve-2015-0255-1.patch + "${FILESDIR}"/${PN}-1.12-cve-2015-3418.patch + "${FILESDIR}"/${PN}-1.17.2-uninit-clientsWritable.patch +) + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." +} + +src_configure() { + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + # --enable-install-setuid needed because sparcs default off + # NOTE: fop is used for doc generating ; and i have no idea if gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable tslib) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal install-libxf86config) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable nptl glx-tls) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + --sysconfdir=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-fontrootdir=/usr/share/fonts + --with-xkb-output=/var/lib/xkb + --disable-config-hal + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + ) + + xorg-2_src_configure +} + +src_install() { + xorg-2_src_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-9 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +pkg_postinst() { + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old + + if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then + ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" + ewarn "because the ABI changed. If you cannot start X because" + ewarn "of module version mismatch errors, this is your problem." + + echo + ewarn "You can generate a list of all installed packages in the x11-drivers" + ewarn "category using this command:" + ewarn " emerge portage-utils; qlist -I -C x11-drivers/" + ewarn "or using sets from portage-2.2:" + ewarn " emerge @x11-module-rebuild" + fi +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules + fi +} + +server_based_install() { + if ! use xorg; then + rm "${D}"/usr/share/man/man1/Xserver.1x \ + "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${D}"/usr/share/man/man1/Xserver.1x + fi +} diff --git a/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild b/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild new file mode 100644 index 000000000000..9ba84cb401c9 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +XORG_EAUTORECONF=yes +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic +EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" + +DESCRIPTION="X.Org X servers" +SLOT="0/${PV}" +KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.16-cve-2014-8091..8103.patches.tar.xz" + +IUSE_SERVERS="dmx kdrive xnest xorg xvfb" +IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev unwind" + +CDEPEND=">=app-eselect/eselect-opengl-1.3.0 + dev-libs/openssl:0= + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libdrm-2.4.20 + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont-1.4.2 + <x11-libs/libXfont-1.5.0 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-libs/xtrans-1.3.2 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-10.3.7-r2[nptl=] + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=virtual/udev-150 ) + unwind? ( sys-libs/libunwind ) + >=x11-apps/xinit-1.3" + +DEPEND="${CDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.0.2 + <x11-proto/fontsproto-2.1.3 + >=x11-proto/glproto-1.4.17-r1 + >=x11-proto/inputproto-2.2.99.1 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.4.0 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.2.0 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.2.99.901 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.22 + >=x11-proto/presentproto-1.0 + >=x11-proto/dri3proto-1.0 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + >=x11-proto/dri2proto-2.8 + )" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-xserver ) +" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + )" + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." +} + +src_prepare() { + UPSTREAMED_PATCHES=( + "${WORKDIR}"/patches/*.patch + ) + PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch + "${FILESDIR}"/${PN}-1.17-cve-2015-0255-0.patch + "${FILESDIR}"/${PN}-1.17-cve-2015-0255-1.patch + "${FILESDIR}"/${PN}-1.17.2-uninit-clientsWritable.patch + ) + xorg-2_src_prepare +} + +src_configure() { + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + # NOTE: fop is used for doc generating ; and i have no idea if gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable suid install-setuid) + $(use_enable tslib) + $(use_enable unwind libunwind) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal install-libxf86config) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable nptl glx-tls) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + --enable-libdrm + --sysconfdir="${EPREFIX}"/etc/X11 + --localstatedir="${EPREFIX}"/var + --with-fontrootdir="${EPREFIX}"/usr/share/fonts + --with-xkb-output="${EPREFIX}"/var/lib/xkb + --disable-config-hal + --disable-linux-acpi + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + --with-sha1=libcrypto + ) + + xorg-2_src_configure +} + +src_install() { + xorg-2_src_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-11 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +pkg_postinst() { + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old + + if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then + ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" + ewarn "because the ABI changed. If you cannot start X because" + ewarn "of module version mismatch errors, this is your problem." + + echo + ewarn "You can rebuild all installed packages in the x11-drivers" + ewarn "category using this command:" + ewarn " emerge @x11-module-rebuild" + fi +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules + fi +} + +server_based_install() { + if ! use xorg; then + rm "${ED}"/usr/share/man/man1/Xserver.1x \ + "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${ED}"/usr/share/man/man1/Xserver.1x + fi +} diff --git a/x11-base/xorg-server/xorg-server-1.18.4.ebuild b/x11-base/xorg-server/xorg-server-1.18.4.ebuild new file mode 100644 index 000000000000..71b0bd02cf3a --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.18.4.ebuild @@ -0,0 +1,244 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic +EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" + +DESCRIPTION="X.Org X servers" +SLOT="0/${PV}" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind wayland" + +CDEPEND=">=app-eselect/eselect-opengl-1.3.0 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libdrm-2.4.46 + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont-1.4.2 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-libs/xtrans-1.3.5 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + glamor? ( + media-libs/libepoxy[X] + >=media-libs/mesa-10.3.4-r1[egl,gbm] + !x11-libs/glamor + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + xephyr? ( + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + xnest? ( + x11-libs/xcb-util-keysyms + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-10.3.4-r1 + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=virtual/udev-150 ) + unwind? ( sys-libs/libunwind ) + wayland? ( + >=dev-libs/wayland-1.3.0 + media-libs/libepoxy + ) + >=x11-apps/xinit-1.3.3-r1 + systemd? ( + sys-apps/dbus + sys-apps/systemd + )" + +DEPEND="${CDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.1.3 + >=x11-proto/glproto-1.4.17-r1 + >=x11-proto/inputproto-2.3 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.5.0 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.2.0 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.2.99.901 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.28 + >=x11-proto/presentproto-1.0 + >=x11-proto/dri2proto-2.8 + >=x11-proto/dri3proto-1.0 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + )" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-xserver ) + !x11-drivers/xf86-video-modesetting +" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + xephyr? ( kdrive )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch + # needed for new eselect-opengl, bug #541232 + "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch + "${FILESDIR}"/${PN}-1.18-sysmacros.patch #580044 +) + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." +} + +src_configure() { + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + # NOTE: fop is used for doc generating; and I have no idea if Gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable glamor) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable suid install-setuid) + $(use_enable tslib) + $(use_enable unwind libunwind) + $(use_enable wayland xwayland) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xephyr) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + $(use_with systemd systemd-daemon) + $(use_enable systemd systemd-logind) + --enable-libdrm + --sysconfdir="${EPREFIX}"/etc/X11 + --localstatedir="${EPREFIX}"/var + --with-fontrootdir="${EPREFIX}"/usr/share/fonts + --with-xkb-output="${EPREFIX}"/var/lib/xkb + --disable-config-hal + --disable-linux-acpi + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + --with-sha1=libcrypto + ) + + xorg-2_src_configure +} + +src_install() { + xorg-2_src_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-11 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +pkg_postinst() { + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules + fi +} + +server_based_install() { + if ! use xorg; then + rm "${ED}"/usr/share/man/man1/Xserver.1x \ + "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${ED}"/usr/share/man/man1/Xserver.1x + fi +} diff --git a/x11-base/xorg-server/xorg-server-1.19.2.ebuild b/x11-base/xorg-server/xorg-server-1.19.2.ebuild new file mode 100644 index 000000000000..f9fdfce1f608 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.19.2.ebuild @@ -0,0 +1,251 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +XORG_EAUTORECONF=true +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic +EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" + +DESCRIPTION="X.Org X servers" +SLOT="0/${PV}" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind" + +CDEPEND=">=app-eselect/eselect-opengl-1.3.0 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libdrm-2.4.46 + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont2-2.0.1 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-libs/xtrans-1.3.5 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + glamor? ( + media-libs/libepoxy[X] + >=media-libs/mesa-10.3.4-r1[egl,gbm] + !x11-libs/glamor + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + xephyr? ( + x11-libs/libxcb[xkb] + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-10.3.4-r1 + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=virtual/udev-150 ) + unwind? ( sys-libs/libunwind ) + wayland? ( + >=dev-libs/wayland-1.3.0 + media-libs/libepoxy + >=dev-libs/wayland-protocols-1.1 + ) + >=x11-apps/xinit-1.3.3-r1 + systemd? ( + sys-apps/dbus + sys-apps/systemd + )" + +DEPEND="${CDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.1.3 + >=x11-proto/glproto-1.4.17-r1 + >=x11-proto/inputproto-2.3 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.5.0 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.2.0 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.2.99.901 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.31 + >=x11-proto/presentproto-1.0 + >=x11-proto/dri2proto-2.8 + >=x11-proto/dri3proto-1.0 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + )" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-xserver ) + !x11-drivers/xf86-video-modesetting +" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + xephyr? ( kdrive )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch + # needed for new eselect-opengl, bug #541232 + "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch + "${FILESDIR}"/${PN}-1.18-sysmacros.patch #580044 +) + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." +} + +pkg_setup() { + if use wayland && ! use glamor; then + ewarn "glamor is necessary for acceleration under Xwayland." + ewarn "Performance may be unacceptable without it." + fi +} + +src_configure() { + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + # NOTE: fop is used for doc generating; and I have no idea if Gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable debug) + $(use_enable dmx) + $(use_enable glamor) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable suid install-setuid) + $(use_enable tslib) + $(use_enable unwind libunwind) + $(use_enable wayland xwayland) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xephyr) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + $(use_with systemd systemd-daemon) + $(use_enable systemd systemd-logind) + --enable-libdrm + --sysconfdir="${EPREFIX}"/etc/X11 + --localstatedir="${EPREFIX}"/var + --with-fontrootdir="${EPREFIX}"/usr/share/fonts + --with-xkb-output="${EPREFIX}"/var/lib/xkb + --disable-config-hal + --disable-linux-acpi + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + --with-sha1=libcrypto + ) + + xorg-2_src_configure +} + +src_install() { + xorg-2_src_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-11 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +pkg_postinst() { + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules + fi +} + +server_based_install() { + if ! use xorg; then + rm "${ED}"/usr/share/man/man1/Xserver.1x \ + "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${ED}"/usr/share/man/man1/Xserver.1x + fi +} diff --git a/x11-base/xorg-server/xorg-server-1.19.3.ebuild b/x11-base/xorg-server/xorg-server-1.19.3.ebuild new file mode 100644 index 000000000000..7f680f37c96c --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.19.3.ebuild @@ -0,0 +1,251 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic +EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" + +DESCRIPTION="X.Org X servers" +SLOT="0/${PV}" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity" + +CDEPEND=">=app-eselect/eselect-opengl-1.3.0 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libdrm-2.4.46 + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont2-2.0.1 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-libs/xtrans-1.3.5 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + glamor? ( + media-libs/libepoxy[X] + >=media-libs/mesa-10.3.4-r1[egl,gbm] + !x11-libs/glamor + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + xephyr? ( + x11-libs/libxcb[xkb] + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-10.3.4-r1 + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=virtual/udev-150 ) + unwind? ( sys-libs/libunwind ) + wayland? ( + >=dev-libs/wayland-1.3.0 + media-libs/libepoxy + >=dev-libs/wayland-protocols-1.1 + ) + >=x11-apps/xinit-1.3.3-r1 + systemd? ( + sys-apps/dbus + sys-apps/systemd + )" + +DEPEND="${CDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.1.3 + >=x11-proto/glproto-1.4.17-r1 + >=x11-proto/inputproto-2.3 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.5.0 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.2.0 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.2.99.901 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.31 + >=x11-proto/presentproto-1.0 + >=x11-proto/dri2proto-2.8 + >=x11-proto/dri3proto-1.0 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + )" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-xserver ) + !x11-drivers/xf86-video-modesetting +" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + xephyr? ( kdrive )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch + # needed for new eselect-opengl, bug #541232 + "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch + "${FILESDIR}"/${PN}-1.18-sysmacros.patch #580044 +) + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." +} + +pkg_setup() { + if use wayland && ! use glamor; then + ewarn "glamor is necessary for acceleration under Xwayland." + ewarn "Performance may be unacceptable without it." + fi +} + +src_configure() { + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + # NOTE: fop is used for doc generating; and I have no idea if Gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable debug) + $(use_enable dmx) + $(use_enable glamor) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable suid install-setuid) + $(use_enable tslib) + $(use_enable unwind libunwind) + $(use_enable wayland xwayland) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xcsecurity) + $(use_enable xephyr) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + $(use_with systemd systemd-daemon) + $(use_enable systemd systemd-logind) + --enable-libdrm + --sysconfdir="${EPREFIX}"/etc/X11 + --localstatedir="${EPREFIX}"/var + --with-fontrootdir="${EPREFIX}"/usr/share/fonts + --with-xkb-output="${EPREFIX}"/var/lib/xkb + --disable-config-hal + --disable-linux-acpi + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + --with-sha1=libcrypto + ) + + xorg-2_src_configure +} + +src_install() { + xorg-2_src_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-11 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +pkg_postinst() { + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules + fi +} + +server_based_install() { + if ! use xorg; then + rm "${ED}"/usr/share/man/man1/Xserver.1x \ + "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${ED}"/usr/share/man/man1/Xserver.1x + fi +} diff --git a/x11-base/xorg-server/xorg-server-1.19.4.ebuild b/x11-base/xorg-server/xorg-server-1.19.4.ebuild new file mode 100644 index 000000000000..bf4762405c48 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.19.4.ebuild @@ -0,0 +1,250 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic +EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" + +DESCRIPTION="X.Org X servers" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity" + +CDEPEND=">=app-eselect/eselect-opengl-1.3.0 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libdrm-2.4.46 + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont2-2.0.1 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-libs/xtrans-1.3.5 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + glamor? ( + media-libs/libepoxy[X] + >=media-libs/mesa-10.3.4-r1[egl,gbm] + !x11-libs/glamor + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + xephyr? ( + x11-libs/libxcb[xkb] + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-10.3.4-r1 + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=virtual/udev-150 ) + unwind? ( sys-libs/libunwind ) + wayland? ( + >=dev-libs/wayland-1.3.0 + media-libs/libepoxy + >=dev-libs/wayland-protocols-1.1 + ) + >=x11-apps/xinit-1.3.3-r1 + systemd? ( + sys-apps/dbus + sys-apps/systemd + )" + +DEPEND="${CDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.1.3 + >=x11-proto/glproto-1.4.17-r1 + >=x11-proto/inputproto-2.3 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.5.0 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.2.0 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.2.99.901 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.31 + >=x11-proto/presentproto-1.0 + >=x11-proto/dri2proto-2.8 + >=x11-proto/dri3proto-1.0 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + )" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-xserver ) + !x11-drivers/xf86-video-modesetting +" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + xephyr? ( kdrive )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch + # needed for new eselect-opengl, bug #541232 + "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch +) + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." +} + +pkg_setup() { + if use wayland && ! use glamor; then + ewarn "glamor is necessary for acceleration under Xwayland." + ewarn "Performance may be unacceptable without it." + fi +} + +src_configure() { + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + # NOTE: fop is used for doc generating; and I have no idea if Gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable debug) + $(use_enable dmx) + $(use_enable glamor) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable suid install-setuid) + $(use_enable tslib) + $(use_enable unwind libunwind) + $(use_enable wayland xwayland) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xcsecurity) + $(use_enable xephyr) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + $(use_with systemd systemd-daemon) + $(use_enable systemd systemd-logind) + --enable-libdrm + --sysconfdir="${EPREFIX}"/etc/X11 + --localstatedir="${EPREFIX}"/var + --with-fontrootdir="${EPREFIX}"/usr/share/fonts + --with-xkb-output="${EPREFIX}"/var/lib/xkb + --disable-config-hal + --disable-linux-acpi + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + --with-sha1=libcrypto + ) + + xorg-2_src_configure +} + +src_install() { + xorg-2_src_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-11 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +pkg_postinst() { + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules + fi +} + +server_based_install() { + if ! use xorg; then + rm "${ED}"/usr/share/man/man1/Xserver.1x \ + "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${ED}"/usr/share/man/man1/Xserver.1x + fi +} diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild new file mode 100644 index 000000000000..90f6ef88dff0 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic +EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" + +DESCRIPTION="X.Org X servers" +SLOT="0/${PV}" +KEYWORDS="" + +IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" + +CDEPEND=">=app-eselect/eselect-opengl-1.3.0 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libdrm-2.4.46 + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont2-2.0.1 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-libs/xtrans-1.3.5 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + glamor? ( + media-libs/libepoxy[X] + >=media-libs/mesa-10.3.4-r1[egl,gbm] + !x11-libs/glamor + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + xephyr? ( + x11-libs/libxcb[xkb] + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-10.3.4-r1 + ) + udev? ( >=virtual/udev-150 ) + unwind? ( sys-libs/libunwind ) + wayland? ( + >=dev-libs/wayland-1.3.0 + media-libs/libepoxy + >=dev-libs/wayland-protocols-1.1 + ) + >=x11-apps/xinit-1.3.3-r1 + systemd? ( + sys-apps/dbus + sys-apps/systemd + )" + +DEPEND="${CDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.1.3 + >=x11-proto/glproto-1.4.17-r1 + >=x11-proto/inputproto-2.3 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.5.0 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.2.0 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.2.99.901 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.31 + >=x11-proto/presentproto-1.0 + >=x11-proto/dri2proto-2.8 + >=x11-proto/dri3proto-1.0 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + )" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-xserver ) + !x11-drivers/xf86-video-modesetting +" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + xephyr? ( kdrive )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch + # needed for new eselect-opengl, bug #541232 + "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch +) + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." +} + +pkg_setup() { + if use wayland && ! use glamor; then + ewarn "glamor is necessary for acceleration under Xwayland." + ewarn "Performance may be unacceptable without it." + fi +} + +src_configure() { + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + # NOTE: fop is used for doc generating; and I have no idea if Gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable debug) + $(use_enable dmx) + $(use_enable glamor) + $(use_enable kdrive) + $(use_enable suid install-setuid) + $(use_enable unwind libunwind) + $(use_enable wayland xwayland) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xcsecurity) + $(use_enable xephyr) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + $(use_with systemd systemd-daemon) + $(use_enable systemd systemd-logind) + --enable-libdrm + --sysconfdir="${EPREFIX}"/etc/X11 + --localstatedir="${EPREFIX}"/var + --with-fontrootdir="${EPREFIX}"/usr/share/fonts + --with-xkb-output="${EPREFIX}"/var/lib/xkb + --disable-config-hal + --disable-linux-acpi + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + --with-sha1=libcrypto + ) + + xorg-2_src_configure +} + +src_install() { + xorg-2_src_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-11 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +pkg_postinst() { + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules + fi +} + +server_based_install() { + if ! use xorg; then + rm "${ED}"/usr/share/man/man1/Xserver.1x \ + "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${ED}"/usr/share/man/man1/Xserver.1x + fi +} diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest new file mode 100644 index 000000000000..6c932911a1fa --- /dev/null +++ b/x11-base/xorg-x11/Manifest @@ -0,0 +1,5 @@ +EBUILD xorg-x11-7.4-r2.ebuild 3552 SHA256 4013bd6c8b674946f64c51c3c2560036287ef073c5b7cbeaa09843c9371e3ceb SHA512 7347903377e36252b7bb306b3aa8027ee3892a04f3bfca280f8842888601707b526d96ed340fcff434ed8335e1fd0ea776e20b646bdff5a6841ab596c022bed1 WHIRLPOOL ec202b37ef919277c7b4ad3d30f9fc72077de81e02255d6d320d66d1958397ffafb13c7f29989c41d96d344941a432d27bd68850cafb4f7be870e72a518f9927 +MISC ChangeLog 2751 SHA256 a5d70f50b6da868b0ce89b26cc1b0b12cadd1e3b37408e0b599b41c375e03396 SHA512 cf5e5238d272e127790c8147bb49c8657d8d82cafb8cd52267fa439d87dafe6ffd5214b184d215ba7d470c22059e75a50e8ca4d0f619c774470364ad3edec432 WHIRLPOOL cdb3bc207e6d6db30440ae2f827e5cd0c7753c83b80b3c48ba4b0f11109141d92b55fd16335ec776ea7299cb333b390d702d8a410be75374f082570be4ebc64e +MISC ChangeLog-2005 112755 SHA256 99fa41385441d093a976da579ef62d816f636660cf5e1936ae885f6099746b75 SHA512 2447e9c302bbae7cf5ec887eca809926a689b82f1e89b13c0b11ef794457842c28b785f4785d27aefa93a1457b3d8d92c374a3466d92b92bea5baf135e8585f6 WHIRLPOOL 9fe74a2e906f21910d2162649bad5998793749ba77fda9bfc289916143858b4dbd3001a63421d49827d8e3e5698cce614823cd330633f4715d992c273f2d50a3 +MISC ChangeLog-2015 18429 SHA256 0431adb0dee3a991f08a549d761933959ab0418444e95343d4cd67af731110b6 SHA512 368328d739e9242fe948c07a858de921b43341dedeff1117aed032c48d0b0a9c8adec5984422bf13ee1cd4425d325dc76e3e5b7dd9974ab5e2a3a80a31a81c5a WHIRLPOOL ad1bee81427f2c0fc0c30321eafac53f582253895deda04235680b802373f6375e456fb235e061294a400542e7e267aecd8f4b79c92e460b917599409d7f655b +MISC metadata.xml 304 SHA256 3e5c2069e5f3bb7102d0336cfe054c665458dabac4cf8ac722b9cd13ba8e4eb0 SHA512 23ae82fc7cc9613c7e27dad6461cdcb5098981b67b7b3179de464af1ceeac08efb4dab11c2d578af542e933a77d51ca3f69427ff216d276f92e66d5bab1ae763 WHIRLPOOL 9a4f2002bc7e5a9d66a0a9ba89f6c74c26c98ce6c5d7bc92043e2083a53c964965c34d79d333046266b6760af461fb7b12c028d2ee74f3eb9f710ca77099fbf0 diff --git a/x11-base/xorg-x11/metadata.xml b/x11-base/xorg-x11/metadata.xml new file mode 100644 index 000000000000..61b88b3e701d --- /dev/null +++ b/x11-base/xorg-x11/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> +</maintainer> +<longdescription>X11 implementation by X.Org Foundation</longdescription> +</pkgmetadata> diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild new file mode 100644 index 000000000000..c10948f48d8d --- /dev/null +++ b/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="2" + +inherit eutils + +DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)" +HOMEPAGE="https://www.x.org/wiki/" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +# Server +RDEPEND="${RDEPEND} + x11-base/xorg-server[-minimal]" + +# Applications +RDEPEND="${RDEPEND} + x11-apps/appres + x11-apps/bitmap + x11-apps/iceauth + x11-apps/luit + x11-apps/mkfontdir + x11-apps/mkfontscale + x11-apps/sessreg + x11-apps/setxkbmap + x11-apps/smproxy + x11-apps/x11perf + x11-apps/xauth + x11-apps/xbacklight + x11-apps/xcmsdb + x11-apps/xcursorgen + x11-apps/xdpyinfo + x11-apps/xdriinfo + x11-apps/xev + x11-apps/xf86dga + x11-apps/xgamma + x11-apps/xhost + x11-apps/xinput + x11-apps/xkbcomp + x11-apps/xkbevd + x11-apps/xkbutils + x11-apps/xkill + x11-apps/xlsatoms + x11-apps/xlsclients + x11-apps/xmodmap + x11-apps/xpr + x11-apps/xprop + x11-apps/xrandr + x11-apps/xrdb + x11-apps/xrefresh + x11-apps/xset + x11-apps/xsetroot + x11-apps/xvinfo + x11-apps/xwd + x11-apps/xwininfo + x11-apps/xwud + " + +# Data +RDEPEND="${RDEPEND} + x11-misc/xbitmaps + x11-themes/xcursor-themes + " + +# Utilities +RDEPEND="${RDEPEND} + x11-misc/makedepend + x11-misc/util-macros + " + +# Fonts +RDEPEND="${RDEPEND} + media-fonts/font-adobe-100dpi + media-fonts/font-adobe-75dpi + media-fonts/font-adobe-utopia-100dpi + media-fonts/font-adobe-utopia-75dpi + media-fonts/font-adobe-utopia-type1 + media-fonts/font-alias + media-fonts/font-arabic-misc + media-fonts/font-bh-100dpi + media-fonts/font-bh-75dpi + media-fonts/font-bh-lucidatypewriter-100dpi + media-fonts/font-bh-lucidatypewriter-75dpi + media-fonts/font-bh-ttf + media-fonts/font-bh-type1 + media-fonts/font-bitstream-100dpi + media-fonts/font-bitstream-75dpi + media-fonts/font-bitstream-speedo + media-fonts/font-bitstream-type1 + media-fonts/font-cronyx-cyrillic + media-fonts/font-cursor-misc + media-fonts/font-daewoo-misc + media-fonts/font-dec-misc + media-fonts/font-ibm-type1 + media-fonts/font-isas-misc + media-fonts/font-jis-misc + media-fonts/font-micro-misc + media-fonts/font-misc-cyrillic + media-fonts/font-misc-ethiopic + media-fonts/font-misc-meltho + media-fonts/font-misc-misc + media-fonts/font-mutt-misc + media-fonts/font-schumacher-misc + media-fonts/font-screen-cyrillic + media-fonts/font-sony-misc + media-fonts/font-sun-misc + media-fonts/font-util + media-fonts/font-winitzki-cyrillic + media-fonts/font-xfree86-type1 + + media-fonts/font-alias + media-fonts/font-util + media-fonts/encodings + " + +DEPEND="${RDEPEND}" + +pkg_preinst() { + # Save xorg.conf because of bug #278268 + if [[ -f "${ROOT}etc/X11/xorg.conf" ]]; then + cp "${ROOT}etc/X11/xorg.conf" "${T}" + fi +} + +pkg_postinst() { + # Restore saved xorg.conf + if [[ -f "${T}/xorg.conf" ]]; then + cp "${T}/xorg.conf" "${ROOT}etc/X11/xorg.conf" + fi + + elog + elog "Please note that the xcursors are in ${ROOT}usr/share/cursors/${PN}." + elog "Any custom cursor sets should be placed in that directory." + elog + elog "If you wish to set system-wide default cursors, please create" + elog "${ROOT}usr/local/share/cursors/${PN}/default/index.theme" + elog "with content: \"Inherits=theme_name\" so that future" + elog "emerges will not overwrite those settings." + elog + elog "Listening on TCP is disabled by default with startx." + elog "To enable it, edit ${ROOT}usr/bin/startx." + elog + + # (#76985) + elog "Visit https://wiki.gentoo.org/wiki/Category:X.Org" + elog "for more information on configuring X." + elog +} |