gentoo resync : 22.01.2021

8 files changed, 109 insertions, 4 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index f9747f17467f..eb62b895de8a 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-input-elographics/Manifest b/x11-drivers/xf86-input-elographics/Manifest
index d8a9cfe4d7f5..b54c2dce0fa6 100644
--- a/x11-drivers/xf86-input-elographics/Manifest
+++ b/x11-drivers/xf86-input-elographics/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-elographics-1.4.2.tar.bz2 306167 BLAKE2B 1bd32ece8e1b3465542af539e5a83c75e23023125b8a21018a4e59b5eb9585e349371b346aa042f2ffcf4ce92d7a8616fa5d2a50224298f928e72a726df6ce22 SHA512 90e9eb3441a78288fbfbb2b108f212b8cfa3d5aaf25a0e88a5e40783cd36bc2d60e02ba390a5f0071eaa37f77e61f0d7ce6d9dbde4f6db21a86ca3294decff97
-EBUILD xf86-input-elographics-1.4.2.ebuild 260 BLAKE2B 34d9b4bd542438ac21f26a50288a1fb8399bd98b52c790e29ab3232dbebc405da07649a2785cc09aa161befe98c77ae60e14c7496c900103efc7b3c00d2796a7 SHA512 28b76ca2818670fd0517a316dce41ea30c8b29724f502ec5f683c5f697ea643be109ea3bd3a873e74e1b12b03b90e92406859eba352f3222309043a9cf9d5267
+EBUILD xf86-input-elographics-1.4.2.ebuild 243 BLAKE2B 238bf943d5a941bd1788c8feb83c9c37ef33e408c76e5186e5f64ecee99fe56372409bf770b7f5b26e7cde6b31227dc6c24eec95d899b7cc7f2eabdc3e5ac27a SHA512 cb85b161b9baf2e802a3843b9a963fcc7fa460600074a5a3e0cc93597c988dee7b61b55f914b4267281b1bdd71965a47e391d5a61aff4093739c5fb8ce4405a9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
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 074ebe955e09..c1de00c12f99 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
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-XORG_STATIC="no"
 inherit xorg-3
 
 DESCRIPTION="Elographics input driver"
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 1b177e6250ec..d61cbee4458e 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,7 +1,9 @@
 AUX xf86-video-intel-gcc-pr65873.patch 471 BLAKE2B 578e8aeffa803b127f436263773a139849ccc30afdf46a776538c7e23ea1a1577a6673eb4e39c6fc650c0b4b5b7db3466786452a711fd6cddcacc925d3c4ef6c SHA512 584ee7e954c69973ad00ae07f25199081b13636e6573eae2736f4521a7a238d88e3744cbe07daa7d4620b5124cefdfeb03204f097fd17794a12ffd36a90628b0
 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
 EBUILD xf86-video-intel-2.99.917_p20200310.ebuild 1989 BLAKE2B 431b15edc9df546042a6ef4d1fed6f99ec3fdc0f9793c90c8d8b0f59199b111d0aebd53f078f1fd83fb20c7e9d3b659bfacf73db846f4e181f2811ce463f883a SHA512 381b30272e8959ac4754efe7cb66d4ca1cf427a349728558159475dd68347b2b3a4049c92ca006d56dd535ec1b30916fe119ed24a8d00504df8d41159b0bf753
 EBUILD xf86-video-intel-2.99.917_p20200515.ebuild 1989 BLAKE2B 79fa3d1553678509ea27bd986ebba6b136c9f4138b48a750750cbb9335341732e7dca7cac60950428c4427738378d5afb4a85e6a6f1fb595d45ed7063db04e72 SHA512 7a418b091a51d62a4e80ec7062cbaa955f3dfaf86d09777fe4bb9172d3be74e73273e784dab7c26eacca101360101497a17202900d9a0fce826ec0037c3a5a94
+EBUILD xf86-video-intel-2.99.917_p20201215.ebuild 1939 BLAKE2B 78d38f49492071c6d04e433625c5a13a730e0db43999ea0a08ebf2762f33db46ee13f85ccfa05a3dd1bcbcef2789d546e2d2d020b9a33481e7f4972be52b44de SHA512 7fc53a96f9e293bd360e8d37c3d9c2b4278b06c59d07c079f471241fbbc0cc96cbfbd1b51f67b8161cf05128150a891a311c80c60468f8678b4b0d35055a4f07
 EBUILD xf86-video-intel-9999.ebuild 1899 BLAKE2B 07e79ee178cc079f07e75bc4d53d166d70b2d2893e8b148933334c314bb705493c60209952898279564399e6d2eabdc25f00012116c0568c648f8f9000ddd18f SHA512 9499b4b813b8b8c6d723f1082e87e3818eea2661ef28d2ce5b4c804171490a3643485d49c13b286244b4eec886fa70ec0ad58e815370da5004e0dd4b294e0163
 MISC metadata.xml 558 BLAKE2B f7903a6eb37ee7cf8a5d3ec54b56c4099e4770717e08e24d386ef41f7f7d4604470dee2a7d8735b119c5c7f8a4ee8b0f280ef036266c282faca2edcf2413c151 SHA512 89dc6b97c4dc2315848b264bce4219717cf3260f8b7fbeeb3e304ebc3482aed77522cf5b10c7a87c76bfd394e6076e7c08ef7735932e4c0aa9e03b6deea0f0ab
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20201215.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20201215.ebuild
new file mode 100644
index 000000000000..88500f06f4bf
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20201215.ebuild
@@ -0,0 +1,86 @@
+# 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="a511f22cdec56504913b457a2e60dafee8e2b570"
+	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"
+
+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-omap/Manifest b/x11-drivers/xf86-video-omap/Manifest
index 302ba1cf2d34..2431faf353e7 100644
--- a/x11-drivers/xf86-video-omap/Manifest
+++ b/x11-drivers/xf86-video-omap/Manifest
@@ -1,3 +1,4 @@
+AUX xf86-video-omap-0.4.5-null-dereference.patch 362 BLAKE2B e4ddeaedbf3ba964796529dc3638b9303e20324cc18e3ecc47022ce389f8020aa6a1abe1e9e29e45ab4f8454dd7faf9df74b4f76987ce81dacb1d3e7bba796df SHA512 092dcd4d19653d59d2409ca89bd2528de5e220cd9a88ff8e4080c4dd62adcf3e264ce5a3719571f1055cda59b7a0b6357d32916041c29b0c1c5725bf7565b42d
 DIST xf86-video-omap-0.4.5.tar.bz2 316765 BLAKE2B 981322d7e140c4948f3cc5ceb9a649f252c431b6755a0e201bde32c92a00bb2d0c0513fbd2638320100855c78e8c4897c5cbcff8527ef0ff045350a9e9ce505a SHA512 c8a21bf00d9ead73b5f66310f802d6071454132b69e20230d3b95635d8fb8351febf5c881640907eb36dd7aeec2d0823e45fb9955b1a9a32e3838ee717964ca2
-EBUILD xf86-video-omap-0.4.5.ebuild 297 BLAKE2B fb328a7f73355f2616aecf7b7ea473fc8a6ba4e2484fe372c73688d9ab0f84fcafd275464d7f4988f3fc30057241c254455e95fdabbf7f12b304878abbd40dce SHA512 2681a8551d1d1830d81f871603197952bd011392c674084fa269bd062e354f678f41c749705f6182d674a492a34e666a0e3a22c85887f876ada78e4465b8218a
+EBUILD xf86-video-omap-0.4.5.ebuild 357 BLAKE2B 063b3fd04d3568cc4ebcfd4629f985f8d97445e1eff0b3089934286f38bb410af68dfb9ad9451b46da3fd7649d91be009013c43d19fc9d21479a1e191e58c64f SHA512 bc1c0ce27c4778ee66bea1ad46efd7f0967ede49e8051976af5b07bdd481867e539101a4a806cd9db6a432ce4b97f9078938bbbef6027b93aec1f4f573d65f8a
 MISC metadata.xml 346 BLAKE2B 3c0b53d970c838680c81200bb24ea623a37d98ce92009c9e9eeeea189e77db94870b9fe16715fdeb91e6bf9e2b9a7e5dff6e3525c15b40b7b9f64acce43955fe SHA512 c42c74ad99ba4bfca1c89aac3bf76ccb50ebba85130c5eb81294c45fbd5992d376f27ddc4f758eb79cf95f6406d98d27ea5c1b56f75c2723fc271dc02ce0ca58
diff --git a/x11-drivers/xf86-video-omap/files/xf86-video-omap-0.4.5-null-dereference.patch b/x11-drivers/xf86-video-omap/files/xf86-video-omap-0.4.5-null-dereference.patch
new file mode 100644
index 000000000000..8345a53105b5
--- /dev/null
+++ b/x11-drivers/xf86-video-omap/files/xf86-video-omap-0.4.5-null-dereference.patch
@@ -0,0 +1,13 @@
+https://sources.debian.org/patches/xf86-video-omap/0.4.5-1.1/null-dereference.patch/
+https://bugs.gentoo.org/707358
+--- a/src/omap_driver.c
++++ v/src/omap_driver.c
+@@ -542,7 +542,7 @@ OMAPPreInit(ScrnInfoPtr pScrn, int flags
+ 	}
+ 
+ 	if (!pScrn->chipset) {
+-		ERROR_MSG("Unknown chipset: %s", pScrn->chipset);
++		ERROR_MSG("Unknown chipset");
+ 		goto fail;
+ 	}
+ 
diff --git a/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild b/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild
index 778cdcfeccc9..a28ec1b05d23 100644
--- a/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild
+++ b/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,3 +12,7 @@ KEYWORDS="arm"
 RDEPEND=">=x11-base/xorg-server-1.3
 	>=x11-libs/libdrm-2.4.36[video_cards_omap]"
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.5-null-dereference.patch"
+)