summaryrefslogtreecommitdiff
path: root/x11-drivers/xf86-video-intel
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-04-28 09:54:45 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-04-28 09:54:45 +0100
commitb7ebc951da8800f711142f69d9d958bde67a112d (patch)
treee318514216845acb8f2e49fff7a5cba4027e9d91 /x11-drivers/xf86-video-intel
parentdc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
gentoo resync : 28.04.2019
Diffstat (limited to 'x11-drivers/xf86-video-intel')
-rw-r--r--x11-drivers/xf86-video-intel/Manifest5
-rw-r--r--x11-drivers/xf86-video-intel/files/xf86-video-intel-gcc-pr65873.patch12
-rw-r--r--x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20190301.ebuild91
-rw-r--r--x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild19
4 files changed, 114 insertions, 13 deletions
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index bb5cf84adf17..bf4a7e358807 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,6 +1,9 @@
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-9999.ebuild 1987 BLAKE2B ce39a415b579cb439f26d5e3ad3b96a5dc5e51fcb34e248b4b193a9fe2749a564e13ecaaca96c99ca706316212cf266479138c6b60649b10d6af4e1eeb754be9 SHA512 a89624aba7cd9fe0ed9467cb35fd7230a99bc14eb96fd7aef71597f3b067b0021da194a1fbb73361191813751e8002da0a821bdcc85c32c185a779baa9181e9e
+EBUILD xf86-video-intel-2.99.917_p20190301.ebuild 2018 BLAKE2B 803c99fd8306c273088ac151e32507e62808ee19435885f245784957f88c81525dd3b743ad4a9fc7fed4156c1dbdb23bbe37f15f8d58c997fd4b8ad48f36b5c9 SHA512 88032d3933b532d9574e9c3f61cf5f3fa52d11c4cb4214d9037ed5e55227aefb77f1b2eaf937bdb089128294d21828582e8d3a86a8bffae5c4c9dbc5e5e77291
+EBUILD xf86-video-intel-9999.ebuild 1926 BLAKE2B f8666e045cccdcaad447d553fde200d9aacc9e7ee1cd69c2be76faf82225003ad6f7e5418972a575357ccd8eaa9bfe66ceb90b5dd39e01a3336a8bb7c16137bb SHA512 8b404f9e3247c3239318e25fcf24c11b8286775381d3a9b29b52349e2cebe355cede1261f8bacec4a8dd441ca3ea8616e94b26006eb61560e8bff687facbdc3f
MISC metadata.xml 716 BLAKE2B 9c0d0d8f69b50931cdc0cbb9de69722531918bec055e0bf460dd00dd1fc551054233a99f479856036b2ce129adda1dc4468879eb2903a97e8b1a682004e9265c SHA512 11c95d0fd78c1c38b8398fbeb1b8fd2c6e3e02b0aca2e771cabf6a935e3ef40ec344f0a906268e39094496782ba530a6004c5d7527e6ecce009ef384302c258d
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-gcc-pr65873.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-gcc-pr65873.patch
new file mode 100644
index 000000000000..ed05bce9a26c
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-gcc-pr65873.patch
@@ -0,0 +1,12 @@
+diff -up xf86-video-intel-20150520/src/sna/compiler.h.jx xf86-video-intel-20150520/src/sna/compiler.h
+--- xf86-video-intel-20150520/src/sna/compiler.h.jx 2015-05-19 07:44:26.000000000 -0400
++++ xf86-video-intel-20150520/src/sna/compiler.h 2015-05-20 12:53:54.797918726 -0400
+@@ -64,7 +64,7 @@
+ #endif
+
+ #if HAS_GCC(4, 6) && defined(__OPTIMIZE__)
+-#define fast __attribute__((optimize("Ofast")))
++#define fast __attribute__((optimize("O3")))
+ #else
+ #define fast
+ #endif
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20190301.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20190301.ebuild
new file mode 100644
index 000000000000..2f4d89bae8fd
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20190301.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DRI=dri
+XORG_EAUTORECONF=yes
+inherit linux-info xorg-3 flag-o-matic
+
+if [[ ${PV} == 9999* ]]; then
+ SRC_URI=""
+else
+ KEYWORDS="~amd64 ~x86"
+ COMMIT_ID="6afed33b2d673d88674f0c76efe500ae414e8e1b"
+ SRC_URI="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/${COMMIT_ID}/${P}.tar.bz2"
+ S="${WORKDIR}/${PN}-${COMMIT_ID}"
+fi
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+IUSE="debug +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]
+ >=x11-base/xorg-server-1.18
+ !<=media-libs/mesa-12.0.4
+ 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}"/${PN}-gcc-pr65873.patch
+)
+
+src_configure() {
+ replace-flags -Os -O2
+ XORG_CONFIGURE_OPTIONS=(
+ --disable-dri1
+ $(use_enable debug)
+ $(use_enable dri)
+ $(use_enable dri dri3)
+ $(usex dri "--with-default-dri=3")
+ $(use_enable sna)
+ $(use_enable tools)
+ $(use_enable udev)
+ $(use_enable uxa)
+ $(use_enable xvmc)
+ )
+ xorg-3_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-9999.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
index c2b892bbc428..3b4fa32db6bb 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
XORG_DRI=dri
XORG_EAUTORECONF=yes
-inherit linux-info xorg-2 flag-o-matic
+inherit linux-info xorg-3 flag-o-matic
if [[ ${PV} == 9999* ]]; then
SRC_URI=""
@@ -18,7 +18,7 @@ fi
DESCRIPTION="X.Org driver for Intel cards"
-IUSE="debug dri3 +sna tools +udev uxa xvmc"
+IUSE="debug +sna tools +udev uxa xvmc"
REQUIRED_USE="
|| ( sna uxa )
@@ -29,13 +29,8 @@ RDEPEND="
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
- )
+ >=x11-base/xorg-server-1.18
+ !<=media-libs/mesa-12.0.4
tools? (
x11-libs/libX11
x11-libs/libxcb
@@ -66,14 +61,14 @@ src_configure() {
$(use_enable debug)
$(use_enable dri)
$(use_enable dri dri3)
- $(usex dri3 "--with-default-dri=3")
+ $(usex dri "--with-default-dri=3")
$(use_enable sna)
$(use_enable tools)
$(use_enable udev)
$(use_enable uxa)
$(use_enable xvmc)
)
- xorg-2_src_configure
+ xorg-3_src_configure
}
pkg_postinst() {