diff options
Diffstat (limited to 'x11-drivers/xf86-video-intel')
5 files changed, 1 insertions, 242 deletions
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 <ajax@redhat.com> -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 @@ <name>X11</name> </maintainer> <use> - <flag name="dri3" restrict="<=x11-drivers/xf86-video-intel-2.99.917_p20160621">Enable DRI3 support</flag> - <flag name="dri3">Use DRI3 by default</flag> <flag name="sna">Enable SandyBridge's New Acceleration (useful on all chipsets, not just SandyBridge)</flag> <flag name="tools">Build the intel-virtual-output tool</flag> <flag name="uxa">Enable UMA Acceleration Architecture</flag> 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 -} |