* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-intel/, x11-drivers/xf86-video-intel/files/
@ 2019-02-22 1:54 Matt Turner
0 siblings, 0 replies; 2+ messages in thread
From: Matt Turner @ 2019-02-22 1:54 UTC (permalink / raw
To: gentoo-commits
commit: d8f5cedfaeeef0bbbea83c6497876b9fb0bf33c7
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 00:28:13 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 01:54:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8f5cedf
x11-drivers/xf86-video-intel: Fix build on x86
Closes: https://bugs.gentoo.org/655206
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
...ntel-2.99.917_p20180214-Fix-build-on-i686.patch | 47 +++++++++++
.../xf86-video-intel-2.99.917_p20180214-r2.ebuild | 96 ++++++++++++++++++++++
2 files changed, 143 insertions(+)
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
new file mode 100644
index 00000000000..279a61ae443
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917_p20180214-Fix-build-on-i686.patch
@@ -0,0 +1,47 @@
+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/xf86-video-intel-2.99.917_p20180214-r2.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214-r2.ebuild
new file mode 100644
index 00000000000..dbe8b81f933
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214-r2.ebuild
@@ -0,0 +1,96 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-intel/, x11-drivers/xf86-video-intel/files/
@ 2019-07-22 17:15 Matt Turner
0 siblings, 0 replies; 2+ messages in thread
From: Matt Turner @ 2019-07-22 17:15 UTC (permalink / raw
To: gentoo-commits
commit: cc56a16a6e47dde438d35ab2ade67b031d0cff84
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 17:13:25 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 17:15:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc56a16a
x11-drivers/xf86-video-intel: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-drivers/xf86-video-intel/Manifest | 1 -
...ntel-2.99.917_p20180214-Fix-build-on-i686.patch | 47 -----------
.../xf86-video-intel-2.99.917_p20180214-r1.ebuild | 92 ---------------------
.../xf86-video-intel-2.99.917_p20180214-r2.ebuild | 96 ----------------------
4 files changed, 236 deletions(-)
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 65508b4a528..18eeaa30870 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,2 +1 @@
-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-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 279a61ae443..00000000000
--- 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/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 b3cc3345b8d..00000000000
--- 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 dbe8b81f933..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-22 19:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-22 17:15 [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-intel/, x11-drivers/xf86-video-intel/files/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2019-02-22 1:54 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox