From b24bd25253fe093f722ab576d29fdc41d04cb1ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Aug 2019 19:14:55 +0100 Subject: gentoo resync : 02.08.2019 --- x11-drivers/Manifest.gz | Bin 5349 -> 5343 bytes x11-drivers/nvidia-drivers/Manifest | 6 +- .../nvidia-drivers/nvidia-drivers-430.26.ebuild | 585 --------------------- .../nvidia-drivers/nvidia-drivers-430.34.ebuild | 2 +- x11-drivers/xf86-input-elographics/Manifest | 4 +- .../xf86-input-elographics-1.4.1.ebuild | 14 - .../xf86-input-elographics-1.4.2.ebuild | 2 +- x11-drivers/xf86-input-mtrack/Manifest | 2 +- .../xf86-input-mtrack-0.5.0.ebuild | 2 +- x11-drivers/xf86-video-intel/Manifest | 6 +- ...ntel-2.99.917_p20180214-Fix-build-on-i686.patch | 47 -- x11-drivers/xf86-video-intel/metadata.xml | 2 - .../xf86-video-intel-2.99.917_p20180214-r1.ebuild | 92 ---- .../xf86-video-intel-2.99.917_p20180214-r2.ebuild | 96 ---- 14 files changed, 7 insertions(+), 853 deletions(-) delete mode 100644 x11-drivers/nvidia-drivers/nvidia-drivers-430.26.ebuild delete mode 100644 x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.1.ebuild delete mode 100644 x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917_p20180214-Fix-build-on-i686.patch delete mode 100644 x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214-r1.ebuild delete mode 100644 x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214-r2.ebuild (limited to 'x11-drivers') diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz index 8e26aaaa2770..68d4ff7b728d 100644 Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 4088d4e52529..2117ff9deadd 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -19,7 +19,6 @@ DIST NVIDIA-FreeBSD-x86_64-390.116.tar.gz 63651658 BLAKE2B ae1714b5b279dd6f552ed DIST NVIDIA-FreeBSD-x86_64-410.104.tar.gz 61995820 BLAKE2B 281b7567fcba6e7457bcaf5a91759670ca6f5f041efbd407237852a31dbd6d13f1df18d54cede17b0f8acd4a66fdded123de91691938dee03be077f1cf50e29d SHA512 77097ec2bc446a18f98a8da93964033054cab2e79759d296f12d1392fd65aec51c279c2823e3bebf0ccb3bb1130c5f03998f71ea1d6b245af1daf890ec8f3304 DIST NVIDIA-FreeBSD-x86_64-415.27.tar.gz 62389955 BLAKE2B 39ac5970ef1a6ffbb03abe8b758a6f5d7eaca787231845fa4b4bff5f26aa770fb7c695bbd5585d919c934c65b9ed0cfe42f9674bcaabd796c9bd8b89cea87ee6 SHA512 857d1523bad2fca21c75b45c29066be0f530afa8ca124806bcaa36509ac5135df1c4037e6b09e5718c701f085b3608925e2b1fea45d0681e69a99ef709c307d0 DIST NVIDIA-FreeBSD-x86_64-418.74.tar.gz 61802318 BLAKE2B 97eedee0a47bc7d2173d40a02e076ea18b5d40b9593660b0fd0dce561377e66f676bd1071ea613c3eab9d587f557ec7be09c3ceec08d75ee5a816133cbde0082 SHA512 96ccb4c97819730310886292314382c3d2ff5cd19d77ceefa12e0de4975e1a95625df60d6d4676252991aa507e72971de9931bd70e4d5f5f3210e53f4bbe315f -DIST NVIDIA-FreeBSD-x86_64-430.26.tar.gz 62467649 BLAKE2B 2febd88bcecfd1daa034663421a2ee864ea500526d5de227e9aef89db33898edde71e93529aaa67607e79b60e64b06c7e2525a801c4c1aedf4279e7634df9e58 SHA512 4fcd9aacdb96cfe1618e44fc897cb1d1adecd568dc7cf3a2153ed5aae59d5172e7d792149128e9613804e58a54740e738e3c014a08ab2a33684b00cfb5b2dc70 DIST NVIDIA-FreeBSD-x86_64-430.34.tar.gz 62489085 BLAKE2B 2d6107ed8e97cf0acd32316daf6da58ee8a2cd59b70ecbc74937a1b9305eba69e17cb1b4b28f8585bc249e3bff7aa8af55d032c3a69477af8b7c9dd73f352fb4 SHA512 8bd2244245f326f8391a8470307f79a9d0ea73dee61c882fe168838c0509d4e902abbf9004435c6f19e7494b7f9b1eb60dee903cb3e474355b7eb4edfd82f57a DIST NVIDIA-Linux-armv7l-gnueabihf-390.116.run 28852021 BLAKE2B 82eb44ea1bd50610218c9ffe4f7e586d2541cb7d0ca6692feeb7a26ea323d7304e2d09e77a20e02fb529b19d2ca75f0819df07c3cd27d72a5b6d9ceac6984fa8 SHA512 7aa93f42a36aa910388f901879659e0b03ec8a272cee3caac553b960603417e5b23f1bd88d9dd5892f3509d7a029a29c067200c8ed577ed98aa24f034dd66475 DIST NVIDIA-Linux-x86-340.107.run 39016798 BLAKE2B 2632c8f257d0cf7c5b9294eb2c0b763eee6feb60eacc316024655971e4d067c4af6548aab3b7b2b295792b064f3f3ac3e6403a2ecfa096761d308dfb6b2569b8 SHA512 0add713942bcdb639d19b5c36f5e0cea14f9e07490191d46dfeba0515ede7700fd8e9467ec531d38329fe1e76bf45905e70e0d440e7bc2dc79c1d767eab03338 @@ -29,20 +28,17 @@ DIST NVIDIA-Linux-x86_64-390.116.run 82282245 BLAKE2B 4dc5a1455eca985be5831e8670 DIST NVIDIA-Linux-x86_64-410.104.run 106042115 BLAKE2B 2f977d6afd5484fb630e2eeeca3c7394f9e4c65e471ad426ee450cfb61eeed149938735107f166e10acae320fd71c020fcb74662fb350fa6f9dc384fe68744dc SHA512 fe21a4d89f4ed74fb597c529d45964b9b5aca6ac58729a0a5bb8d6a3a00eb8f44a20807d12ad778989a7cb120943c8ee537dcfaa63881d121d96df110cc3b419 DIST NVIDIA-Linux-x86_64-415.27.run 108399659 BLAKE2B 05fb81a4ab8626d0170a30b70ed114c639ba7f0e5ac260d2f38cb5042a4d6052e40ada51cf2feff6bae0f394781d77cb70014f390873a715b7d9495b86918bf1 SHA512 5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6 DIST NVIDIA-Linux-x86_64-418.74.run 107038305 BLAKE2B 46101bed797c9fc83d335ac3584dd4001182c1ed62a1594e86eaf390da04e2fdb96d305088949f3d6f76a1824cb0a625ab51618bafb08f76c6bed2b424413809 SHA512 485d94f0a328c117f86c7b2d8e14885aa1e498755bcc7285aaba1cf5e8f4672feaece7c87a7d0f835c55ff4022d0be6b023ffee262f0a3073ccf88ca1f39201f -DIST NVIDIA-Linux-x86_64-430.26.run 110600229 BLAKE2B 091579e97a35fc40b0b68f91135edaa85d9e9e0d757a241e9df6c0fb405d639756f789aea4b829e9e93fb8419f86a811008f1aa85ca5f47ed156923d06c1f6e8 SHA512 34ff46659e1d68874dd7ac933fcc6a5dbdbd240e433e5c76c4cb74242001f427848406148fc12035a60d35395c19c81a758ec1ea810d239b15dd72e2d15f884b DIST NVIDIA-Linux-x86_64-430.34.run 110148373 BLAKE2B 300dbc3edc30048717f4a9643981a2846552fd310dd0651c497664c7979f7afde6f9e77e5b9fa45bea22ffe6562999cd305e4f3b878b8e39af19f8b3ee1c3f1a SHA512 a1548dce6e092e61fdc3e54bba7568087ec61b179bbd4572377a21cf7552e73c04a85da819f33f3f0c4f4ca0f49ef11400aef3f1d8dedf2aaf4a7f67097f871e DIST nvidia-settings-340.107.tar.bz2 1549413 BLAKE2B 127442ee2c35ceec47ab4f103bdd2d0278c621fcb9be47051111f6f8728ef5699bdc95fe33a3812a807c38c4868b04c2176e2ed218a422171d2a88ac0c00de96 SHA512 593e7e83aa350a3a7beaaa32aca8660d7e203f6f2e460a6e6eabcdc092087f9917ee4e6d141e37ad4e3b0a1b9908c085e4a71d2f579e481a03bbd1c6f75ca776 DIST nvidia-settings-390.116.tar.bz2 1109033 BLAKE2B ddcb74c9ecd2134ae39b6d08a81f0d6e454e00274a28d85cc7946961ab361a97cb1e7f94c1771cdab4b2d1b20f0da070ab4ae6acb906d407aa6fb22e9e5de1db SHA512 7ae0d326b4704986b17a53c5278219e3496c11ad0ee38a50bffbb56c70412f68c135354fc13d390737131a9df4c0fbeeb3bea7effcceac1f3b71016c60d760c5 DIST nvidia-settings-410.104.tar.bz2 1120639 BLAKE2B 75554b0cca7c022a0f1cc02091f81ccd930e30e1dd5f674cf35b0cfed83c5e235c360b0f28701d39d42017b35b816f975ff177398eb9f59280851c0b8bfd57d3 SHA512 08d938117fca4d471bdff451219e6772fdd1e9c37c0ed623be8506c1cb5ce7ccde4d073848ade9f5bfca14b1a3cf9eb90b4b4bf44375bff43d023815b622b424 DIST nvidia-settings-415.27.tar.bz2 1128013 BLAKE2B 36513252ff3d5f2036c80250e012d79bebfc14daff56fdaabb032856f5f78ce77cf4ce32d6eaee5fe4c1a18db63d5c69d6848517f025c711f133e28b3e509396 SHA512 5ac3b673c41194a1952ec10cd3c961aefd281bb044ecae5c9d11cb55d4555fed44e6056b5a2e97b5b87687743cd7f702f33ce7e0f841f04c8175d63693a24594 DIST nvidia-settings-418.74.tar.bz2 1127986 BLAKE2B 152413a6030f05795c248aed4a122aefea941be28b19cb4fb79c237817693ca5c30b724e5276a144c6de83574e921329c9eb6a79f2dff105021176a6ee7ec439 SHA512 7be0c355373765ba52af4bb3f146bbf6265d9626bf420b8e15e08a198ffeb45fb9f1ab9a91390c53d48eac125e3956c646883716a16a22dc34bf847b9804143a -DIST nvidia-settings-430.26.tar.bz2 1130223 BLAKE2B d8a3c8a80a669357b2c8ccd460eaf3c624bde2380ed906cc7f8c050199341c8bfce8aedb9d3d720879012844c8cb15208fb7482f08bdea89b92bf65eb8842946 SHA512 60226b7429d2f2062a85616eb81aceb2db9993b083cfe69641ec1e8de4f0d2cfc900eee9348d78a1d48f84f3b1def39e99a9bb1ad69c46d94b47117bdcf08087 DIST nvidia-settings-430.34.tar.bz2 1130140 BLAKE2B eb89ab5e814108c52a7f1742a71441e57594b35907c5ffb4023265851280d8b26f3f124728d298acc27fd257fa8cae50ef9690d1aecb542a5b0aa01d8b8cb90a SHA512 4fe968b81941b090321ba7da75e7feca0c8a61d28b1c6345b78fe29589fae87088f63ffdc19688a8c2190711aec3927d479f45739a4103175767e4433b5a7b13 EBUILD nvidia-drivers-340.107-r1.ebuild 14337 BLAKE2B 9d69d838adcbb2bcc20d69ae60156cb99baa4b5030c9f895def311f561b1fe8066936aa9d4fe7863e55077fdc00a7d136e51c463edb4472431e15d046f77f118 SHA512 ff1bd377e6eef99415eb245a1027ad6c2645edaa8a341305884147d36a7d0347c40baa5053bb807237d28c6ce25d8d130f3f00e062333f3c1397e97ccf8cc46c EBUILD nvidia-drivers-390.116-r2.ebuild 16279 BLAKE2B 591e6f9faedcfe4d4922d84a131b1d9e41fee6110dc5e1a33cafb56fd834228dcbe32cbc2a3ef8d6dc8da79df021433e956a25fcb13704cb32aed6e72d3fce8a SHA512 c60e5161a2c6514106db87924874bc5beab75b2daad6709ec4288e1f436a4796396903cca817147ee09f97abb191a100674ec8f31b26a26c5d51ab5c3061c745 EBUILD nvidia-drivers-410.104-r2.ebuild 16168 BLAKE2B 8087579f48a012b3045e01ad0a3a7137df515b22c5775b3acb1e43ca3d449af539e6f95b767884bde57a814b555c430b509024b2cdba115ad3643643054811b1 SHA512 4112f8727e141e5a074bae84f70a18d0c175827fdcff3624f2caf8301b192c8bec138af7d502614908d283db912c5470be1d99a7c7c055e981ddfb9bf6bea091 EBUILD nvidia-drivers-415.27-r2.ebuild 16179 BLAKE2B 5a22bb5a3fadaf892565f5f6c4c61bb504d0ea293796f530609662a75f4f793907fdac3e713cf3eae7dff4a9a2d7f121ea65b60a8faddd124a26196982a48eb0 SHA512 6decb715a64616c8dd1d32aae21a7f511968b12c167f0e375d997ee8a1729f4d82721fbd595944f536186429b0fc98a53df01f3d51cd81d81e3710cdbdfaa7dc EBUILD nvidia-drivers-418.74.ebuild 16026 BLAKE2B 63b5d60e270b91e4555e743d206f01dc4a79d4ea5fef88df81660f5f625e79f056f9622610bdd348bdb02ac364fa23c4984745dd620ba44c5eea7149fd7f69bb SHA512 5c935dc5dbd9fa8d0b3a4d0d0bd9264b24f42be0c92f190f5824760f86462d2300398df78776f4a2c0a75f51ed3278adb3f1882d1f291dbba7bd72351c8e8032 -EBUILD nvidia-drivers-430.26.ebuild 15841 BLAKE2B 1b18946c96999a975c1356f14b14be1c89b92ef218291553fe893fbc84eba4c8e3faf739f291a06433adbd0fbbe0a0957d1d46bbd265b5a53486a03fc1ffc332 SHA512 092c0b41af44315f149074c089c660b022a7851c7bab17add8aeb588da6e9e4fb975fe6e60554c8c3fce3bf0e9eab6bbcc675c35463ec939a0717f0b5867f9b7 -EBUILD nvidia-drivers-430.34.ebuild 15842 BLAKE2B f597a9406443e15198bf764cf1134e8b448bab9627cb7f7eb9582d734f2fee2ea1b059de2e927b9b8deec974ccf864b98cdff9a836fab732ac8433f003f25464 SHA512 f4837423f6fca91463ad28039747e01b03cf55b4bd42844f29fde626db69c276a71ad86a2c6e42c0c22fe89d0609eb2137b6728831087c5ba7065ca63e928ee8 +EBUILD nvidia-drivers-430.34.ebuild 15841 BLAKE2B 1b18946c96999a975c1356f14b14be1c89b92ef218291553fe893fbc84eba4c8e3faf739f291a06433adbd0fbbe0a0957d1d46bbd265b5a53486a03fc1ffc332 SHA512 092c0b41af44315f149074c089c660b022a7851c7bab17add8aeb588da6e9e4fb975fe6e60554c8c3fce3bf0e9eab6bbcc675c35463ec939a0717f0b5867f9b7 MISC metadata.xml 1207 BLAKE2B 6fd00cf82a2940c84a3802484c9c752e5bd9786158f6f6e983cf5fe56f5018b7f1f90108525234bf8c98b0f63abba54a468509609f34b9e7647f7bfa7491bea1 SHA512 2a3274c9c81c05f1d722974a5f73dfec9ae778745092c4441e441d87f2554cb0c4822e8ce63c89a90e11d7237e6dc5a3a11ca12cdfd9813054e3abf75e7f9ba1 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.26.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.26.ebuild deleted file mode 100644 index f9c6da276441..000000000000 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.26.ebuild +++ /dev/null @@ -1,585 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \ - portability toolchain-funcs unpacker user udev - -DESCRIPTION="NVIDIA Accelerated Graphics Driver" -HOMEPAGE="https://www.nvidia.com/" - -AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}" -AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" -ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}" - -NV_URI="https://us.download.nvidia.com/XFree86/" -SRC_URI=" - amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz ) - amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run ) - tools? ( - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2 - ) -" - -LICENSE="GPL-2 NVIDIA-r2" -SLOT="0/${PV%.*}" -KEYWORDS="-* amd64 ~amd64-fbsd" -RESTRICT="bindist mirror" -EMULTILIB_PKG="true" - -IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X" -REQUIRED_USE=" - tools? ( X ) - static-libs? ( tools ) -" -RESTRICT="test" - -COMMON=" - app-eselect/eselect-opencl - kernel_linux? ( >=sys-libs/glibc-2.6.1 ) - tools? ( - dev-libs/atk - dev-libs/glib:2 - dev-libs/jansson - gtk3? ( - x11-libs/gtk+:3 - ) - x11-libs/cairo - x11-libs/gdk-pixbuf[X] - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXv - x11-libs/libXxf86vm - x11-libs/pango[X] - ) - X? ( - >=app-eselect/eselect-opengl-1.0.9 - app-misc/pax-utils - ) -" -DEPEND=" - ${COMMON} - kernel_linux? ( virtual/linux-sources ) - tools? ( sys-apps/dbus ) -" -RDEPEND=" - ${COMMON} - acpi? ( sys-power/acpid ) - tools? ( !media-video/nvidia-settings ) - wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) - X? ( - =x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - ) -" -QA_PREBUILT="opt/* usr/lib*" -S=${WORKDIR}/ - -nvidia_drivers_versions_check() { - if use amd64 && has_multilib_profile && \ - [ "${DEFAULT_ABI}" != "amd64" ]; then - eerror "This ebuild doesn't currently support changing your default ABI" - die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" - fi - - if use kernel_linux && kernel_is ge 5 3; then - ewarn "Gentoo supports kernels which are supported by NVIDIA" - ewarn "which are limited to the following kernels:" - ewarn " "${T}"/nvidia-rmmod.conf || die - doins "${T}"/nvidia-rmmod.conf - fi - - # Ensures that our device nodes are created when not using X - exeinto "$(get_udevdir)" - newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh - udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules - elif use kernel_FreeBSD; then - if use x86-fbsd; then - insinto /boot/modules - doins "${S}/src/nvidia.kld" - fi - - exeinto /boot/modules - doexe "${S}/src/nvidia.ko" - fi - - # NVIDIA kernel <-> userspace driver config lib - donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER} - - # NVIDIA framebuffer capture library - donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER} - - # NVIDIA video encode/decode <-> CUDA - if use kernel_linux; then - donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER} - donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER} - fi - - if use X; then - # Xorg DDX driver - insinto /usr/$(get_libdir)/xorg/modules/drivers - doins ${NV_X11}/nvidia_drv.so - - # Xorg GLX driver - donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \ - /usr/$(get_libdir)/xorg/modules/extensions - - # Xorg nvidia.conf - if has_version '>=x11-base/xorg-server-1.16'; then - insinto /usr/share/X11/xorg.conf.d - newins {,50-}nvidia-drm-outputclass.conf - fi - - insinto /usr/share/glvnd/egl_vendor.d - doins ${NV_X11}/10_nvidia.json - fi - - if use wayland; then - insinto /usr/share/egl/egl_external_platform.d - doins ${NV_X11}/10_nvidia_wayland.json - fi - - # OpenCL ICD for NVIDIA - if use kernel_linux; then - insinto /etc/OpenCL/vendors - doins ${NV_OBJ}/nvidia.icd - fi - - # Helper Apps - exeinto /opt/bin/ - - if use X; then - doexe ${NV_OBJ}/nvidia-xconfig - - insinto /etc/vulkan/icd.d - doins nvidia_icd.json - fi - - if use kernel_linux; then - doexe ${NV_OBJ}/nvidia-cuda-mps-control - doexe ${NV_OBJ}/nvidia-cuda-mps-server - doexe ${NV_OBJ}/nvidia-debugdump - doexe ${NV_OBJ}/nvidia-persistenced - doexe ${NV_OBJ}/nvidia-smi - - # install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092) - doexe ${NV_OBJ}/nvidia-modprobe - fowners root:video /opt/bin/nvidia-modprobe - fperms 4710 /opt/bin/nvidia-modprobe - dosym /{opt,usr}/bin/nvidia-modprobe - - doman nvidia-cuda-mps-control.1 - doman nvidia-modprobe.1 - doman nvidia-persistenced.1 - newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi - newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced - newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced - fi - - if use tools; then - emake -C "${S}"/nvidia-settings-${PV}/src/ \ - DESTDIR="${D}" \ - DO_STRIP= \ - GTK3_AVAILABLE=$(usex gtk3 1 0) \ - LIBDIR="${D}/usr/$(get_libdir)" \ - NV_USE_BUNDLED_LIBJANSSON=0 \ - NV_VERBOSE=1 \ - OUTPUTDIR=. \ - PREFIX=/usr \ - install - - if use static-libs; then - dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a - - insinto /usr/include/NVCtrl - doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h - fi - - insinto /usr/share/nvidia/ - doins nvidia-application-profiles-${PV}-key-documentation - - insinto /etc/nvidia - newins \ - nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc - - # There is no icon in the FreeBSD tarball. - use kernel_FreeBSD || \ - doicon ${NV_OBJ}/nvidia-settings.png - - domenu "${FILESDIR}"/nvidia-settings.desktop - - exeinto /etc/X11/xinit/xinitrc.d - newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings - fi - - dobin ${NV_OBJ}/nvidia-bug-report.sh - - if has_multilib_profile && use multilib; then - local OABI=${ABI} - for ABI in $(get_install_abis); do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs - fi - - is_final_abi || die "failed to iterate through all ABIs" - - # Documentation - if use kernel_FreeBSD; then - dodoc "${NV_DOC}/README" - use X && doman "${NV_MAN}"/nvidia-xconfig.1 - use tools && doman "${NV_MAN}"/nvidia-settings.1 - else - # Docs - newdoc "${NV_DOC}/README.txt" README - dodoc "${NV_DOC}/NVIDIA_Changelog" - doman "${NV_MAN}"/nvidia-smi.1 - use X && doman "${NV_MAN}"/nvidia-xconfig.1 - use tools && doman "${NV_MAN}"/nvidia-settings.1 - doman "${NV_MAN}"/nvidia-cuda-mps-control.1 - fi - - readme.gentoo_create_doc - - docinto html - dodoc -r ${NV_DOC}/html/* -} - -src_install-libs() { - local inslibdir=$(get_libdir) - local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib" - local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia" - local nv_libdir="${NV_OBJ}" - - if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then - nv_libdir="${NV_OBJ}"/32 - fi - - if use X; then - NV_GLX_LIBRARIES=( - "libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}" - "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}" - "libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}" - "libGLESv1_CM.so.1.2.0 ${GL_ROOT}" - "libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}" - "libGLESv2.so.2.1.0 ${GL_ROOT}" - "libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}" - "libGLX.so.0 ${GL_ROOT}" - "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}" - "libGLdispatch.so.0 ${GL_ROOT}" - "libOpenCL.so.1.0.0 ${CL_ROOT}" - "libOpenGL.so.0 ${GL_ROOT}" - "libcuda.so.${NV_SOVER}" - "libnvcuvid.so.${NV_SOVER}" - "libnvidia-compiler.so.${NV_SOVER}" - "libnvidia-eglcore.so.${NV_SOVER}" - "libnvidia-encode.so.${NV_SOVER}" - "libnvidia-fatbinaryloader.so.${NV_SOVER}" - "libnvidia-fbc.so.${NV_SOVER}" - "libnvidia-glcore.so.${NV_SOVER}" - "libnvidia-glsi.so.${NV_SOVER}" - "libnvidia-glvkspirv.so.${NV_SOVER}" - "libnvidia-ifr.so.${NV_SOVER}" - "libnvidia-opencl.so.${NV_SOVER}" - "libnvidia-ptxjitcompiler.so.${NV_SOVER}" - "libvdpau_nvidia.so.${NV_SOVER}" - ) - - if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]]; - then - NV_GLX_LIBRARIES+=( - "libnvidia-egl-wayland.so.1.1.2" - ) - fi - - if use kernel_FreeBSD; then - NV_GLX_LIBRARIES+=( - "libnvidia-tls.so.${NV_SOVER}" - ) - fi - - if use kernel_linux; then - NV_GLX_LIBRARIES+=( - "libnvidia-ml.so.${NV_SOVER}" - "libnvidia-tls.so.${NV_SOVER}" - ) - fi - - if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]]; - then - NV_GLX_LIBRARIES+=( - "libnvidia-cbl.so.${NV_SOVER}" - "libnvidia-rtcore.so.${NV_SOVER}" - "libnvoptix.so.${NV_SOVER}" - ) - fi - - for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do - donvidia "${nv_libdir}"/${NV_LIB} - done - fi -} - -pkg_preinst() { - if use driver && use kernel_linux; then - linux-mod_pkg_preinst - - local videogroup="$(egetent group video | cut -d ':' -f 3)" - if [ -z "${videogroup}" ]; then - eerror "Failed to determine the video group gid" - die "Failed to determine the video group gid" - else - sed -i \ - -e "s:PACKAGE:${PF}:g" \ - -e "s:VIDEOGID:${videogroup}:" \ - "${D}"/etc/modprobe.d/nvidia.conf || die - fi - fi - - # Clean the dynamic libGL stuff's home to ensure - # we dont have stale libs floating around - if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then - rm -rf "${ROOT}"/usr/lib/opengl/nvidia/* - fi - # Make sure we nuke the old nvidia-glx's env.d file - if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then - rm -f "${ROOT}"/etc/env.d/09nvidia - fi -} - -pkg_postinst() { - use driver && use kernel_linux && linux-mod_pkg_postinst - - # Switch to the nvidia implementation - use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia - "${ROOT}"/usr/bin/eselect opencl set --use-old nvidia - - readme.gentoo_print_elog - - if ! use X; then - elog "You have elected to not install the X.org driver. Along with" - elog "this the OpenGL libraries and VDPAU libraries were not" - elog "installed. Additionally, once the driver is loaded your card" - elog "and fan will run at max speed which may not be desirable." - elog "Use the 'nvidia-smi' init script to have your card and fan" - elog "speed scale appropriately." - elog - fi - if ! use tools; then - elog "USE=tools controls whether the nvidia-settings application" - elog "is installed. If you would like to use it, enable that" - elog "flag and re-emerge this ebuild. Optionally you can install" - elog "media-video/nvidia-settings" - elog - fi -} - -pkg_prerm() { - use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} - -pkg_postrm() { - use driver && use kernel_linux && linux-mod_pkg_postrm - use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.34.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.34.ebuild index 79f8ea7a600e..f9c6da276441 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.34.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.34.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="GPL-2 NVIDIA-r2" SLOT="0/${PV%.*}" -KEYWORDS="-* ~amd64 ~amd64-fbsd" +KEYWORDS="-* amd64 ~amd64-fbsd" RESTRICT="bindist mirror" EMULTILIB_PKG="true" diff --git a/x11-drivers/xf86-input-elographics/Manifest b/x11-drivers/xf86-input-elographics/Manifest index 9e0a2bd62408..473ae94a941c 100644 --- a/x11-drivers/xf86-input-elographics/Manifest +++ b/x11-drivers/xf86-input-elographics/Manifest @@ -1,5 +1,3 @@ -DIST xf86-input-elographics-1.4.1.tar.bz2 280311 BLAKE2B b1eff3ee03fb25617357cd5019ff210f8258973641555e50c7eb6a20822030a93a46cf7221691db1d957dc3cb8ffefab63bfc442cf922da0a400d331beada0c6 SHA512 94248fbd256ab32af3d6a72179c261231a710b39731e59626e6aa45ade65abb865fb5e62da0b835d52edfe5d9fcc46c03076e0179a8de9a89341d852103195ad DIST xf86-input-elographics-1.4.2.tar.bz2 306167 BLAKE2B 1bd32ece8e1b3465542af539e5a83c75e23023125b8a21018a4e59b5eb9585e349371b346aa042f2ffcf4ce92d7a8616fa5d2a50224298f928e72a726df6ce22 SHA512 90e9eb3441a78288fbfbb2b108f212b8cfa3d5aaf25a0e88a5e40783cd36bc2d60e02ba390a5f0071eaa37f77e61f0d7ce6d9dbde4f6db21a86ca3294decff97 -EBUILD xf86-input-elographics-1.4.1.ebuild 319 BLAKE2B 3a846cb16677c64aee610c9422e9c931ee821db35a7d9fcd289a195f62319f6bef9006793f00f2b1f9ad6458d88dfe50adebb5792a2ceb1a4a2faadcbe3f1e88 SHA512 f156d5c5048d1c44a9456c425ffc3d37d286c857aedcdb7f8d760020f444ad0d6686f3b135e4790a498a84108312ef30b45a8ec26fa92a44b5ee652e514ca8c4 -EBUILD xf86-input-elographics-1.4.2.ebuild 284 BLAKE2B a4171729213182a7cc837acc215421b892c26de6833873fa256a3eee60ad692b073788f7579400e47cca4d37d47bd9795a96802a1091373ca183f17026a9511a SHA512 e09b00ded68820a8ab480428c434841be4fd6392ce440c1e11d97175b34aef41b9e5cde6b7c45a3b7aa730de1531b0e74f43143a0b13bd44945c9116bea7ecf4 +EBUILD xf86-input-elographics-1.4.2.ebuild 283 BLAKE2B acd2161fd731b0c3ccae7b8660a9dcff497950d1f6cec6a9d1e47c258bec8b4a2198ca4feaa01b9aa29427057d03aadf0a771d5c5b1d8b19300f963e88f9583e SHA512 3ca6fe8782408bfb9fbaf78a08145e64a46ae7abd5b84817b3140b1f171cb84ffea778b2850ed5b0baa03a34f3c3bbf37d339f9d45a82e39c8a59b453469be93 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.1.ebuild b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.1.ebuild deleted file mode 100644 index 0c5dc6164825..000000000000 --- a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.1.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -XORG_STATIC="no" -inherit xorg-2 - -DESCRIPTION="Elographics input driver" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild index f472a14cd6da..30ccd4c8806a 100644 --- a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild +++ b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild @@ -7,5 +7,5 @@ XORG_STATIC="no" inherit xorg-3 DESCRIPTION="Elographics input driver" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="" diff --git a/x11-drivers/xf86-input-mtrack/Manifest b/x11-drivers/xf86-input-mtrack/Manifest index 79586160db2f..3053599049fa 100644 --- a/x11-drivers/xf86-input-mtrack/Manifest +++ b/x11-drivers/xf86-input-mtrack/Manifest @@ -1,3 +1,3 @@ DIST xf86-input-mtrack-0.5.0.tar.gz 392992 BLAKE2B 7b0697dde374d558eec304a5b26b50d62fe85c8a0bbde916096ae0296b6bae372c499138a4ca8500e4b6bfeaf7782a18512813c60013476decd2ae6a4a838aa6 SHA512 d30551e0b8be47af336fa3d5207537eb115586f0bb078b2eb6d823fed695a2157e2e63bf145757f04b09359b94206211df817dc2d1182813a3f6370a2a126846 -EBUILD xf86-input-mtrack-0.5.0.ebuild 926 BLAKE2B 61359d0569184d2fe345078f3c34cd724c8d2dbc128ce5fdefee7de1be0627a99645c4c1463216b5298db9afa6cd356ee7c832cea4bc4e0bfa99204e4c4ee590 SHA512 1df08d2140d1e067b4c106cb243ff01c29b3b184c0dc9d5f247d372e7b6cbc5e83870b54c41b73fa11732ab04552b89af1d6f14f65312c783018e8de405931ce +EBUILD xf86-input-mtrack-0.5.0.ebuild 933 BLAKE2B e41899316367a8a5ab28b4e703e0b1cf0b6716803269cfa961e1b8ddac622024701df4b969aa9d1be64e6df6446a1fa6db84ec69c5329914e557552c389e8b61 SHA512 e91ea2c69c081d64623d622d63b14644bf665e9ea448dcf3ef808aa8904e710968f28ab101d4127f4f571e87b385d7e8ff251238b92b32de765b348e2f1f00cf MISC metadata.xml 338 BLAKE2B ee56383414c84d6bcf018537f7fc1e44dd31db002639568c2cf7e5e02439dcd28cd93f01547ed8afeee2a01871788d24e1f3c167eb0ffcb97658ee282480aa6e SHA512 fecb11e3d6179589887afc269de0a37cc20a4a555372d7dfc875570458e27c89e1574f2b0ec8bc2a9e60e66f437261318887404b0d445794715b9a940db8f448 diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild index d8bb80ed22c3..bc216855779b 100644 --- a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild +++ b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild @@ -7,7 +7,7 @@ inherit vcs-snapshot DESCRIPTION="Xorg Driver for Multitouch Trackpads" HOMEPAGE="https://github.com/p2rkw/xf86-input-mtrack" -SRC_URI="https://github.com/p2rkw/xf86-input-mtrack/tarball/v${PV/_/-} -> ${P}.tar.gz" +SRC_URI="https://github.com/p2rkw/xf86-input-mtrack/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" IUSE="debug" LICENSE="GPL-2" diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest index efceacf63680..227f4a3d7a6f 100644 --- a/x11-drivers/xf86-video-intel/Manifest +++ b/x11-drivers/xf86-video-intel/Manifest @@ -1,9 +1,5 @@ -AUX xf86-video-intel-2.99.917_p20180214-Fix-build-on-i686.patch 2118 BLAKE2B da1e75d81f226dc060cffe94525664ea2c89e5388de87bd39bbe191db243003195f5332d6192f92e554f40288f87a177bfed8f5d5169f0c54f425be2b712a76b SHA512 37f8314671ba596aaa72072259bc5a7750055a7c144e443633266f0248ee87883c66a2af7a9ff74455ad93c5162c6d716d8131a4302d2cce5a2454b49f926f36 AUX xf86-video-intel-gcc-pr65873.patch 471 BLAKE2B 578e8aeffa803b127f436263773a139849ccc30afdf46a776538c7e23ea1a1577a6673eb4e39c6fc650c0b4b5b7db3466786452a711fd6cddcacc925d3c4ef6c SHA512 584ee7e954c69973ad00ae07f25199081b13636e6573eae2736f4521a7a238d88e3744cbe07daa7d4620b5124cefdfeb03204f097fd17794a12ffd36a90628b0 -DIST xf86-video-intel-2.99.917_p20180214.tar.xz 951544 BLAKE2B 57df523168c6bf650ddf6ca27bbc799a8a9d183c9a6a4d2e232288124b57bfff7bb36a8fcc55e2845c4ece2653d39c0830c4ea2ecef4f1968a3ee7413506bae3 SHA512 afc8a4db550aa5567fa6f5eb9b480fac7c3e496eb62ae62a6a7b7e317515e24d21bf78bf1b03ba90cfd909dd37a5f65247c7aa2314234aec3d575e53db825912 DIST xf86-video-intel-2.99.917_p20190301.tar.bz2 1247462 BLAKE2B 9047c7a05acaa2125db1527da58d6b4f18d1893e66413facf97b9136adf900cd2b806d149e484880a4361f4798ced52c03ef1b2054136e2896b60aefc3b5e319 SHA512 09ef78d002c6337a2b260999f07c70d9778aa7151f3252c7e2a186b0d1bf218192b616ac8363861e5285dec8fc8599b77eeb1a8195ca5029816f55189aee2b34 -EBUILD xf86-video-intel-2.99.917_p20180214-r1.ebuild 2026 BLAKE2B 61cb8f491ad304dd6b3ba64d15de7f7ef4abc6a5e54a6764fc053767fd41db7588f004aafde7b552ed93b370a2e5075139fc269162a96ecdca79dd295e28bedf SHA512 e2ab7cb810c25d4f48b911f69f6da3b7b6243355d717f876f1cfbe5775a525eeed483f8cb901224cbc62dc563d08ac23128bd4c4c20641e5565748659598e3e3 -EBUILD xf86-video-intel-2.99.917_p20180214-r2.ebuild 2080 BLAKE2B 8fdd40b499e5768d23b301320d5fab26e54a61e7aab9f49328834750978492006d6d77bbee25331eb5d9eb2f96b9e91645a05bb6166013b599a0025d8daad08e SHA512 040041cd9aad80d1a01224ff5d76bd83e0292b4d38210755736d020e8b94e483d3467dd2295d0ede7154c517da48ab21fa8d2ae69b2d0f2ec339a03a4c139a58 EBUILD xf86-video-intel-2.99.917_p20190301.ebuild 2016 BLAKE2B 3a04e7c87441500ff71225cf3790f1a53dfb677e0dc6845eb7d75a6a628b89e0d0f22a8190d46432cb19cdba61df78d247318f982176a0dc42220e88edac57d4 SHA512 908a8ece1e7377b3cfe5c2ee02f9b32e644ca2b5cf44b68233117010f9491bb2df18fcb07f0867c29e044e0485801f4be3b3ef43b296c5a2ef8e4a9c411ca55f EBUILD xf86-video-intel-9999.ebuild 1926 BLAKE2B f8666e045cccdcaad447d553fde200d9aacc9e7ee1cd69c2be76faf82225003ad6f7e5418972a575357ccd8eaa9bfe66ceb90b5dd39e01a3336a8bb7c16137bb SHA512 8b404f9e3247c3239318e25fcf24c11b8286775381d3a9b29b52349e2cebe355cede1261f8bacec4a8dd441ca3ea8616e94b26006eb61560e8bff687facbdc3f -MISC metadata.xml 716 BLAKE2B 9c0d0d8f69b50931cdc0cbb9de69722531918bec055e0bf460dd00dd1fc551054233a99f479856036b2ce129adda1dc4468879eb2903a97e8b1a682004e9265c SHA512 11c95d0fd78c1c38b8398fbeb1b8fd2c6e3e02b0aca2e771cabf6a935e3ef40ec344f0a906268e39094496782ba530a6004c5d7527e6ecce009ef384302c258d +MISC metadata.xml 558 BLAKE2B f7903a6eb37ee7cf8a5d3ec54b56c4099e4770717e08e24d386ef41f7f7d4604470dee2a7d8735b119c5c7f8a4ee8b0f280ef036266c282faca2edcf2413c151 SHA512 89dc6b97c4dc2315848b264bce4219717cf3260f8b7fbeeb3e304ebc3482aed77522cf5b10c7a87c76bfd394e6076e7c08ef7735932e4c0aa9e03b6deea0f0ab diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917_p20180214-Fix-build-on-i686.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917_p20180214-Fix-build-on-i686.patch deleted file mode 100644 index 279a61ae4439..000000000000 --- a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917_p20180214-Fix-build-on-i686.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9e6e003e3468dca674ac848e2669af973da02fd4 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 6 Mar 2018 12:07:46 -0500 -Subject: [PATCH] Fix build on i686 - -Presumably this only matters for i686 because amd64 implies sse2, but: - -BUILDSTDERR: In file included from gen4_vertex.c:34: -BUILDSTDERR: gen4_vertex.c: In function 'emit_vertex': -BUILDSTDERR: sna_render_inline.h:40:26: error: inlining failed in call to always_inline 'vertex_emit_2s': target specific option mismatch -BUILDSTDERR: static force_inline void vertex_emit_2s(struct sna *sna, int16_t x, int16_t y) -BUILDSTDERR: ^~~~~~~~~~~~~~ -BUILDSTDERR: gen4_vertex.c:308:25: note: called from here -BUILDSTDERR: #define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y) /* XXX assert(!too_large(x, y)); */ -BUILDSTDERR: ^~~~~~~~~~~~~~~~~~~~~~~~ -BUILDSTDERR: gen4_vertex.c:360:2: note: in expansion of macro 'OUT_VERTEX' -BUILDSTDERR: OUT_VERTEX(dstX, dstY); -BUILDSTDERR: ^~~~~~~~~~ - -The bug here appears to be that emit_vertex() is declared 'sse2' but -vertex_emit_2s is merely always_inline. gcc8 decides that since you said -always_inline you need to have explicitly cloned it for every -permutation of targets. Merely saying inline seems to do the job of -cloning vertex_emit_2s as much as necessary. - -So to reiterate: if you say always-inline, it won't, but if you just say -maybe inline, it will. Thanks gcc, that's helpful. ---- - src/sna/compiler.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sna/compiler.h b/src/sna/compiler.h -index 0f3775ec..2e579b15 100644 ---- a/src/sna/compiler.h -+++ b/src/sna/compiler.h -@@ -32,7 +32,7 @@ - #define likely(expr) (__builtin_expect (!!(expr), 1)) - #define unlikely(expr) (__builtin_expect (!!(expr), 0)) - #define noinline __attribute__((noinline)) --#define force_inline inline __attribute__((always_inline)) -+#define force_inline inline /* __attribute__((always_inline)) */ - #define fastcall __attribute__((regparm(3))) - #define must_check __attribute__((warn_unused_result)) - #define constant __attribute__((const)) --- -2.19.2 - diff --git a/x11-drivers/xf86-video-intel/metadata.xml b/x11-drivers/xf86-video-intel/metadata.xml index ba66807bf03d..9b1003085204 100644 --- a/x11-drivers/xf86-video-intel/metadata.xml +++ b/x11-drivers/xf86-video-intel/metadata.xml @@ -6,8 +6,6 @@ X11 - Enable DRI3 support - Use DRI3 by default Enable SandyBridge's New Acceleration (useful on all chipsets, not just SandyBridge) Build the intel-virtual-output tool Enable UMA Acceleration Architecture diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214-r1.ebuild deleted file mode 100644 index b3cc3345b8dd..000000000000 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214-r1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_DRI=dri -XORG_EAUTORECONF=yes -inherit linux-info xorg-2 flag-o-matic - -if [[ ${PV} == 9999* ]]; then - SRC_URI="" -else - KEYWORDS="amd64 x86" - COMMIT_ID="75795523003798d789d417e82aaa81c7ea1ed616" - SRC_URI="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz" - S=${WORKDIR}/${COMMIT_ID} -fi - -DESCRIPTION="X.Org driver for Intel cards" - -IUSE="debug dri3 +sna tools +udev uxa xvmc" - -REQUIRED_USE=" - || ( sna uxa ) -" -RDEPEND=" - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXScrnSaver - >=x11-libs/pixman-0.27.1 - >=x11-libs/libdrm-2.4.52[video_cards_intel] - dri3? ( - >=x11-base/xorg-server-1.18 - !<=media-libs/mesa-12.0.4 - ) - sna? ( - >=x11-base/xorg-server-1.10 - ) - tools? ( - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libxshmfence - x11-libs/libXtst - ) - udev? ( - virtual/libudev:= - ) - xvmc? ( - x11-libs/libXvMC - >=x11-libs/libxcb-1.5 - x11-libs/xcb-util - ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -src_configure() { - replace-flags -Os -O2 - XORG_CONFIGURE_OPTIONS=( - --disable-dri1 - $(use_enable debug) - $(use_enable dri) - $(use_enable dri dri3) - $(usex dri3 "--with-default-dri=3") - $(use_enable sna) - $(use_enable tools) - $(use_enable udev) - $(use_enable uxa) - $(use_enable xvmc) - ) - xorg-2_src_configure -} - -pkg_postinst() { - if linux_config_exists && \ - kernel_is -lt 4 3 && ! linux_chkconfig_present DRM_I915_KMS; then - echo - ewarn "This driver requires KMS support in your kernel" - ewarn " Device Drivers --->" - ewarn " Graphics support --->" - ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->" - ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->" - ewarn " i915 driver" - ewarn " [*] Enable modesetting on intel by default" - echo - fi -} diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214-r2.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214-r2.ebuild deleted file mode 100644 index dbe8b81f9331..000000000000 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214-r2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_DRI=dri -XORG_EAUTORECONF=yes -inherit linux-info xorg-2 flag-o-matic - -if [[ ${PV} == 9999* ]]; then - SRC_URI="" -else - KEYWORDS="amd64 x86" - COMMIT_ID="75795523003798d789d417e82aaa81c7ea1ed616" - SRC_URI="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz" - S=${WORKDIR}/${COMMIT_ID} -fi - -DESCRIPTION="X.Org driver for Intel cards" - -IUSE="debug dri3 +sna tools +udev uxa xvmc" - -REQUIRED_USE=" - || ( sna uxa ) -" -RDEPEND=" - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXScrnSaver - >=x11-libs/pixman-0.27.1 - >=x11-libs/libdrm-2.4.52[video_cards_intel] - dri3? ( - >=x11-base/xorg-server-1.18 - !<=media-libs/mesa-12.0.4 - ) - sna? ( - >=x11-base/xorg-server-1.10 - ) - tools? ( - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libxshmfence - x11-libs/libXtst - ) - udev? ( - virtual/libudev:= - ) - xvmc? ( - x11-libs/libXvMC - >=x11-libs/libxcb-1.5 - x11-libs/xcb-util - ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}"/${P}-Fix-build-on-i686.patch -) - -src_configure() { - replace-flags -Os -O2 - XORG_CONFIGURE_OPTIONS=( - --disable-dri1 - $(use_enable debug) - $(use_enable dri) - $(use_enable dri dri3) - $(usex dri3 "--with-default-dri=3") - $(use_enable sna) - $(use_enable tools) - $(use_enable udev) - $(use_enable uxa) - $(use_enable xvmc) - ) - xorg-2_src_configure -} - -pkg_postinst() { - if linux_config_exists && \ - kernel_is -lt 4 3 && ! linux_chkconfig_present DRM_I915_KMS; then - echo - ewarn "This driver requires KMS support in your kernel" - ewarn " Device Drivers --->" - ewarn " Graphics support --->" - ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->" - ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->" - ewarn " i915 driver" - ewarn " [*] Enable modesetting on intel by default" - echo - fi -} -- cgit v1.2.3