[gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-intel/files/, x11-drivers/xf86-video-intel/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-intel/files/, x11-drivers/xf86-video-intel/
@ 2016-12-07  5:19 Mike Frysinger
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2016-12-07  5:19 UTC (permalink / raw
  To: gentoo-commits

commit:     7bfe70d0e1ac379f44661c7b783d482052dfe183
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  7 05:19:22 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 05:19:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bfe70d0

x11-drivers/xf86-video-intel: add missing config.h header to fix build w/newer glibc #575970

 .../xf86-video-intel-2.99.917-config-header.patch  | 27 ++++++++++++++++++++++
 .../xf86-video-intel-2.99.917_p20160621-r1.ebuild  |  4 ++++
 .../xf86-video-intel-2.99.917_p20161110.ebuild     |  4 ++++
 .../xf86-video-intel-2.99.917_p20161118.ebuild     |  4 ++++
 4 files changed, 39 insertions(+)

diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-config-header.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-config-header.patch
new file mode 100644
index 00000000..cf4e730
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-config-header.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/575970
+https://lists.freedesktop.org/archives/intel-gfx/2016-December/113685.html
+
+From 7cb250a3ce966dc0c96d167669922b0667160d1e Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 13 Apr 2016 21:35:37 -0400
+Subject: [PATCH] tools/backlight_helper: #include "config.h"
+
+---
+ tools/backlight_helper.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tools/backlight_helper.c b/tools/backlight_helper.c
+index a00f0d6bd8a2..aadb8fac92ba 100644
+--- a/tools/backlight_helper.c
++++ b/tools/backlight_helper.c
+@@ -1,3 +1,7 @@
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdarg.h>
+-- 
+2.11.0.rc2
+

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160621-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160621-r1.ebuild
index 5cbb4d7..77deca3 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160621-r1.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160621-r1.ebuild
@@ -45,6 +45,10 @@ DEPEND="${RDEPEND}
 	x11-proto/presentproto
 	x11-proto/resourceproto"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.99.917-config-header.patch #575970
+)
+
 src_configure() {
 	replace-flags -Os -O2
 	XORG_CONFIGURE_OPTIONS=(

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20161110.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20161110.ebuild
index 45158dc..1c05779 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20161110.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20161110.ebuild
@@ -45,6 +45,10 @@ DEPEND="${RDEPEND}
 	x11-proto/presentproto
 	x11-proto/resourceproto"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.99.917-config-header.patch #575970
+)
+
 src_configure() {
 	replace-flags -Os -O2
 	XORG_CONFIGURE_OPTIONS=(

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20161118.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20161118.ebuild
index d9d2e25..51b065a 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20161118.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20161118.ebuild
@@ -45,6 +45,10 @@ DEPEND="${RDEPEND}
 	x11-proto/presentproto
 	x11-proto/resourceproto"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.99.917-config-header.patch #575970
+)
+
 src_configure() {
 	replace-flags -Os -O2
 	XORG_CONFIGURE_OPTIONS=(


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-intel/files/, x11-drivers/xf86-video-intel/
@ 2019-04-26 21:20 Matt Turner
  0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2019-04-26 21:20 UTC (permalink / raw
  To: gentoo-commits

commit:     4e6ac224882527af7d365ef4b2bf909513504e4a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 26 21:17:27 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 21:20:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e6ac224

x11-drivers/xf86-video-intel: Version bump to 2.99.917_p20190301

Closes: https://bugs.gentoo.org/653320
Closes: https://bugs.gentoo.org/673040
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-drivers/xf86-video-intel/Manifest              |  1 +
 .../files/xf86-video-intel-gcc-pr65873.patch       | 12 +++
 .../xf86-video-intel-2.99.917_p20190301.ebuild     | 91 ++++++++++++++++++++++
 3 files changed, 104 insertions(+)

diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 057061291f1..65508b4a528 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1 +1,2 @@
 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

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 00000000000..ed05bce9a26
--- /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 00000000000..2f4d89bae8f
--- /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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-intel/files/, x11-drivers/xf86-video-intel/
@ 2020-03-10  0:31 Jason A. Donenfeld
  0 siblings, 0 replies; 5+ messages in thread
From: Jason A. Donenfeld @ 2020-03-10  0:31 UTC (permalink / raw
  To: gentoo-commits

commit:     0de74f598eef8ff70e9716abcd5bdf1083e2b54f
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 10 00:30:37 2020 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 10 00:31:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de74f59

x11-drivers/xf86-video-intel: bump to 20191206

Closes: https://bugs.gentoo.org/707918
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 x11-drivers/xf86-video-intel/Manifest              |  1 +
 .../files/xf86-video-intel-fno-common.patch        | 24 ++++++
 .../xf86-video-intel-2.99.917_p20191209.ebuild     | 91 ++++++++++++++++++++++
 3 files changed, 116 insertions(+)

diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 18eeaa30870..533a9327ce8 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1 +1,2 @@
 DIST xf86-video-intel-2.99.917_p20190301.tar.bz2 1247462 BLAKE2B 9047c7a05acaa2125db1527da58d6b4f18d1893e66413facf97b9136adf900cd2b806d149e484880a4361f4798ced52c03ef1b2054136e2896b60aefc3b5e319 SHA512 09ef78d002c6337a2b260999f07c70d9778aa7151f3252c7e2a186b0d1bf218192b616ac8363861e5285dec8fc8599b77eeb1a8195ca5029816f55189aee2b34
+DIST xf86-video-intel-2.99.917_p20191209.tar.bz2 1249789 BLAKE2B 69c4772d41283aaf2f635c48448c49f495c2ec443d8ac2ffdb8a3fe68024c31d769bd5d4fdb07cf6150906c44f9562ccb673ac52837fa6be540c61cbc5359ec8 SHA512 a6c9d19736fec794add638731966b8e5841f6b2d81576b5f978b5916cbd4b338aff93ed235c6f284ba86c11cf82a1ebbed2936fdfc539a124c5211436e5ae40c

diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-fno-common.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-fno-common.patch
new file mode 100644
index 00000000000..5c0640f9fac
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-fno-common.patch
@@ -0,0 +1,24 @@
+From 7ca3a0d0d9a2de49db30708d38195b6585df4ed8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hanno=20B=C3=B6ck?= <hanno@gentoo.org>
+Date: Sun, 2 Feb 2020 14:18:39 +0100
+Subject: [PATCH] Avoid duplicate definition of I810CopyROP in i810.h and
+ i810_accel.c, fixes compilation with -fno-common/gcc-10.
+
+---
+ src/legacy/i810/i810.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h
+index 347188c9..901b7e64 100644
+--- a/src/legacy/i810/i810.h
++++ b/src/legacy/i810/i810.h
+@@ -322,6 +322,5 @@ extern void I810InitMC(ScreenPtr pScreen);
+ extern const OptionInfoRec *I810AvailableOptions(int chipid, int busid);
+ 
+ extern const int I810CopyROP[16];
+-const int I810PatternROP[16];
+ 
+ #endif /* _I810_H_ */
+-- 
+2.24.1
+

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20191209.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20191209.ebuild
new file mode 100644
index 00000000000..fde4be0da90
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20191209.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 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="f66d39544bb8339130c96d282a80f87ca1606caf"
+	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}-fno-common.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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-intel/files/, x11-drivers/xf86-video-intel/
@ 2020-04-06 20:15 Matt Turner
  0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2020-04-06 20:15 UTC (permalink / raw
  To: gentoo-commits

commit:     7be17b8c63cd5a57e6ec222bf2bd2237ac4415d2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  6 20:14:14 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr  6 20:14:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be17b8c

x11-drivers/xf86-video-intel: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-drivers/xf86-video-intel/Manifest              |  2 -
 .../files/xf86-video-intel-fno-common.patch        | 24 ------
 .../xf86-video-intel-2.99.917_p20190301.ebuild     | 91 ----------------------
 .../xf86-video-intel-2.99.917_p20191209.ebuild     | 90 ---------------------
 4 files changed, 207 deletions(-)

diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index b7836f199b1..b367790c638 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,3 +1 @@
-DIST xf86-video-intel-2.99.917_p20190301.tar.bz2 1247462 BLAKE2B 9047c7a05acaa2125db1527da58d6b4f18d1893e66413facf97b9136adf900cd2b806d149e484880a4361f4798ced52c03ef1b2054136e2896b60aefc3b5e319 SHA512 09ef78d002c6337a2b260999f07c70d9778aa7151f3252c7e2a186b0d1bf218192b616ac8363861e5285dec8fc8599b77eeb1a8195ca5029816f55189aee2b34
-DIST xf86-video-intel-2.99.917_p20191209.tar.bz2 1249789 BLAKE2B 69c4772d41283aaf2f635c48448c49f495c2ec443d8ac2ffdb8a3fe68024c31d769bd5d4fdb07cf6150906c44f9562ccb673ac52837fa6be540c61cbc5359ec8 SHA512 a6c9d19736fec794add638731966b8e5841f6b2d81576b5f978b5916cbd4b338aff93ed235c6f284ba86c11cf82a1ebbed2936fdfc539a124c5211436e5ae40c
 DIST xf86-video-intel-2.99.917_p20200310.tar.bz2 1249330 BLAKE2B 7ba7566b946cf2c4ce60170912fe517f8c004a477a0edc2a1a9c4dbc476f3bdbea5b39a3ade4d15854cda2cc1146eca47d5fe8b311dfe36cd5ac39cf390142ea SHA512 764517e2413937ec8486d473e0cb0b98146fbaa2cff15cb01757f2263c29a2fa9279338fc801bdafe4e6b38428f8e771a7ee14fa223ba5711a4369e719258cd0

diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-fno-common.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-fno-common.patch
deleted file mode 100644
index 5c0640f9fac..00000000000
--- a/x11-drivers/xf86-video-intel/files/xf86-video-intel-fno-common.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 7ca3a0d0d9a2de49db30708d38195b6585df4ed8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hanno=20B=C3=B6ck?= <hanno@gentoo.org>
-Date: Sun, 2 Feb 2020 14:18:39 +0100
-Subject: [PATCH] Avoid duplicate definition of I810CopyROP in i810.h and
- i810_accel.c, fixes compilation with -fno-common/gcc-10.
-
----
- src/legacy/i810/i810.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h
-index 347188c9..901b7e64 100644
---- a/src/legacy/i810/i810.h
-+++ b/src/legacy/i810/i810.h
-@@ -322,6 +322,5 @@ extern void I810InitMC(ScreenPtr pScreen);
- extern const OptionInfoRec *I810AvailableOptions(int chipid, int busid);
- 
- extern const int I810CopyROP[16];
--const int I810PatternROP[16];
- 
- #endif /* _I810_H_ */
--- 
-2.24.1
-

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
deleted file mode 100644
index 45438b499af..00000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20190301.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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-2.99.917_p20191209.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20191209.ebuild
deleted file mode 100644
index 72061dfd12f..00000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20191209.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 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="f66d39544bb8339130c96d282a80f87ca1606caf"
-	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
-	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}-fno-common.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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-intel/files/, x11-drivers/xf86-video-intel/
@ 2021-12-02  5:16 Matt Turner
  0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2021-12-02  5:16 UTC (permalink / raw
  To: gentoo-commits

commit:     85205d08415c3360422c00bdd6d523104aa76a9f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  2 05:02:20 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Dec  2 05:16:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85205d08

x11-drivers/xf86-video-intel: Drop old

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-drivers/xf86-video-intel/Manifest              |  2 -
 .../files/xf86-video-intel-gcc-pr65873.patch       | 12 ---
 .../xf86-video-intel-2.99.917_p20200310.ebuild     | 97 ----------------------
 .../xf86-video-intel-2.99.917_p20200515.ebuild     | 97 ----------------------
 4 files changed, 208 deletions(-)

diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 8e5734ab79f7..2bcfebae8e8f 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,3 +1 @@
-DIST xf86-video-intel-2.99.917_p20200310.tar.bz2 1249330 BLAKE2B 7ba7566b946cf2c4ce60170912fe517f8c004a477a0edc2a1a9c4dbc476f3bdbea5b39a3ade4d15854cda2cc1146eca47d5fe8b311dfe36cd5ac39cf390142ea SHA512 764517e2413937ec8486d473e0cb0b98146fbaa2cff15cb01757f2263c29a2fa9279338fc801bdafe4e6b38428f8e771a7ee14fa223ba5711a4369e719258cd0
-DIST xf86-video-intel-2.99.917_p20200515.tar.bz2 1250303 BLAKE2B 81fca6a4ccfd01c49f70b741e80080e410044bcc51345ff886ec1d74e9ed1020263927ec1a67052ddcfded0f4027369a87b47ebcdbbf5066d813a7e82fae290f SHA512 29fea01332438ad7616bae56a926f5c6fa08f93f67c23a0bb38f775719f12b15fba5bcb096c0665948f80d3ff6b7c108f360e44aae008192ef6c9b21187b4bbb
 DIST xf86-video-intel-2.99.917_p20201215.tar.bz2 1250622 BLAKE2B ddcbd84ee125528fe82f0a369f8e768d218eb0d9c4fc00cbe4a921d6267a846eccc001e3dd765f8cdaf7a38c461357831cd9675acfdfd3cc6ac282ec4b6f4b67 SHA512 29526fe191a95c2df5a3e168150b8c7f759dfdc9a4912e28887ec51be05304a9f552d21c990a37a90d6299e64df4bb1fba051c1d0ad25606dc52f801cd30b60d

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
deleted file mode 100644
index ed05bce9a26c..000000000000
--- a/x11-drivers/xf86-video-intel/files/xf86-video-intel-gcc-pr65873.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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_p20200310.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200310.ebuild
deleted file mode 100644
index 7d746cb68ce2..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200310.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 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="652d93cbbdc159c0883f1b626ea48e28bac63ae3"
-	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
-	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-1.0.12-r1
-		>=x11-libs/libxcb-1.5
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gcc-pr65873.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	xorg-3_pkg_setup
-}
-
-src_configure() {
-	# bug #582910
-	replace-flags -Os -O2
-
-	local 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-2.99.917_p20200515.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200515.ebuild
deleted file mode 100644
index e8541630cea6..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200515.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 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="5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc"
-	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
-	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-1.0.12-r1
-		>=x11-libs/libxcb-1.5
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gcc-pr65873.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	xorg-3_pkg_setup
-}
-
-src_configure() {
-	# bug #582910
-	replace-flags -Os -O2
-
-	local 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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-12-02  5:16 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-02  5:16 [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-intel/files/, x11-drivers/xf86-video-intel/ Matt Turner
  -- strict thread matches above, loose matches on Subject: below --
2020-04-06 20:15 Matt Turner
2020-03-10  0:31 Jason A. Donenfeld
2019-04-26 21:20 Matt Turner
2016-12-07  5:19 Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox