diff --git a/0001-Fix-build-on-F28-and-later.patch b/0001-Fix-build-on-F28-and-later.patch new file mode 100644 index 0000000000000000000000000000000000000000..ca525eccc9eb24f650f1a3acc8f3ce293b12028f --- /dev/null +++ b/0001-Fix-build-on-F28-and-later.patch @@ -0,0 +1,101 @@ +From 9c1151b4d65c356f0d25d952fe1a10c89fdb834a Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 5 Mar 2018 11:03:18 -0500 +Subject: [PATCH] Fix build on F28 and later + +Newer gcc complains that it doesn't know how to always-inline memcpy(): + + /usr/include/bits/string_fortified.h:31:1: error: inlining failed in + call to always_inline 'memcpy': target specific option mismatch + +This is because we need to wrap our declaration of memcpy() in the +options we're trying to push at the top of blt.c. So: include compiler.h +to define sse2, then push options, then include everything else. + +However if you do that, the word 'nonnull' collides with the usage in +. I'm too lazy to fix that properly, just expand it to +the __attribute__ form in the few places we say it. + +Signed-off-by: Adam Jackson +--- + src/sna/blt.c | 6 ++++-- + src/sna/compiler.h | 2 -- + src/sna/gen6_common.h | 6 +++--- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/sna/blt.c b/src/sna/blt.c +index cb90437a..fb357d35 100644 +--- a/src/sna/blt.c ++++ b/src/sna/blt.c +@@ -29,13 +29,15 @@ + #include "config.h" + #endif + +-#include "sna.h" +-#include ++#include "compiler.h" + + #if defined(sse2) + #pragma GCC push_options + #pragma GCC target("sse2,inline-all-stringops,fpmath=sse") + #pragma GCC optimize("Ofast") ++ ++#include ++#include "sna.h" + #include + + #if __x86_64__ +diff --git a/src/sna/compiler.h b/src/sna/compiler.h +index 0f3775ec..3c176a16 100644 +--- a/src/sna/compiler.h ++++ b/src/sna/compiler.h +@@ -39,7 +39,6 @@ + #define pure __attribute__((pure)) + #define tightly_packed __attribute__((__packed__)) + #define flatten __attribute__((flatten)) +-#define nonnull __attribute__((nonnull)) + #define page_aligned __attribute__((aligned(4096))) + #else + #define likely(expr) (expr) +@@ -52,7 +51,6 @@ + #define pure + #define tighly_packed + #define flatten +-#define nonnull + #define page_aligned + #endif + +diff --git a/src/sna/gen6_common.h b/src/sna/gen6_common.h +index b53ec0c9..119a2d5d 100644 +--- a/src/sna/gen6_common.h ++++ b/src/sna/gen6_common.h +@@ -133,7 +133,7 @@ inline static bool force_blt_ring(struct sna *sna, struct kgem_bo *bo) + return false; + } + +-nonnull inline static bool ++__attribute__((nonnull)) inline static bool + prefer_blt_ring(struct sna *sna, struct kgem_bo *bo, unsigned flags) + { + if (PREFER_RENDER) +@@ -148,7 +148,7 @@ prefer_blt_ring(struct sna *sna, struct kgem_bo *bo, unsigned flags) + return can_switch_to_blt(sna, bo, flags); + } + +-nonnull inline static bool ++__attribute__((nonnull)) inline static bool + prefer_render_ring(struct sna *sna, struct kgem_bo *bo) + { + if (sna->kgem.ring == KGEM_RENDER) +@@ -191,7 +191,7 @@ prefer_blt_composite(struct sna *sna, struct sna_composite_op *tmp) + return prefer_blt_bo(sna, tmp->src.bo, tmp->dst.bo); + } + +-nonnull static inline bool ++__attribute__((nonnull)) static inline bool + prefer_blt_fill(struct sna *sna, struct kgem_bo *bo, unsigned flags) + { + if (PREFER_RENDER) +-- +2.16.2 + diff --git a/0001-Fix-build-on-i686.patch b/0001-Fix-build-on-i686.patch new file mode 100644 index 0000000000000000000000000000000000000000..0851fbe4b1f71943bd0084256c1a112478562cf8 --- /dev/null +++ b/0001-Fix-build-on-i686.patch @@ -0,0 +1,49 @@ +From a414d4e24461da1cb4cef8ee910bc57bab360ceb Mon Sep 17 00:00:00 2001 +From: Adam Jackson +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. + +- ajax +--- + 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 3c176a16..bc447c7a 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 + #define fastcall __attribute__((regparm(3))) + #define must_check __attribute__((warn_unused_result)) + #define constant __attribute__((const)) +-- +2.16.2 + diff --git a/0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch b/0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch new file mode 100644 index 0000000000000000000000000000000000000000..cb279a786f7ac5c56da13407458d52ff602b4ebb --- /dev/null +++ b/0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch @@ -0,0 +1,47 @@ +From 09bf64d69d97172f22fe08eb495bf50f920ae9ec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= +Date: Tue, 31 May 2016 11:11:21 +0300 +Subject: [PATCH] sna: Avoid clobbering output physical size with + xf86OutputSetEDID() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Ville Syrjälä +--- + src/sna/sna_display.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c +index 10d33f2..57de410 100644 +--- a/src/sna/sna_display.c ++++ b/src/sna/sna_display.c +@@ -3576,6 +3576,7 @@ sna_output_attach_edid(xf86OutputPtr output) + { + struct sna *sna = to_sna(output->scrn); + struct sna_output *sna_output = output->driver_private; ++ unsigned old_mm_width, old_mm_height; + struct drm_mode_get_blob blob; + void *old, *raw = NULL; + xf86MonPtr mon = NULL; +@@ -3678,12 +3679,17 @@ skip_read: + } + + done: ++ output = sna_output->base; ++ old_mm_width = output->mm_width; ++ old_mm_height = output->mm_height; + sna_output_set_parsed_edid(output, mon); + if (raw) { + sna_output->edid_raw = raw; + sna_output->edid_len = blob.length; + sna_output->edid_blob_id = blob.blob_id; + } ++ output->mm_width = old_mm_width; ++ output->mm_height = old_mm_height; + } + + static void +-- +2.7.4 + diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 64b0453eecc0f73314016782e8d5231deb281e94..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# xorg-x11-drv-intel - -#### Description -X.org X11 Intel video driver - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 84fb5910e23c81fdb16e67e3035c6a8f1204830f..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# xorg-x11-drv-intel - -#### 介绍 -X.org X11 Intel video driver - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/intel-gcc-pr65873.patch b/intel-gcc-pr65873.patch new file mode 100644 index 0000000000000000000000000000000000000000..ed05bce9a26c15b61fc16abf0b094d1d7a60538f --- /dev/null +++ b/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/make-git-snapshot.sh b/make-git-snapshot.sh new file mode 100644 index 0000000000000000000000000000000000000000..4d1ec9f9aa13d615d3f5859605b9dd78da06f1e3 --- /dev/null +++ b/make-git-snapshot.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# Usage: ./make-git-snapshot.sh [COMMIT] +# +# to make a snapshot of the given tag/branch. Defaults to HEAD. +# Point env var REF to a local mesa repo to reduce clone time. + +DIRNAME=xf86-video-intel-$( date +%Y%m%d ) + +echo REF ${REF:+--reference $REF} +echo DIRNAME $DIRNAME +echo HEAD ${1:-HEAD} + +rm -rf $DIRNAME + +git clone ${REF:+--reference $REF} \ + git://git.freedesktop.org/git/xorg/driver/xf86-video-intel $DIRNAME + +GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \ + | bzip2 > $DIRNAME.tar.bz2 + +# rm -rf $DIRNAME diff --git a/xf86-video-intel-20180618.tar.bz2 b/xf86-video-intel-20180618.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..3e25979d25c42ac586b27aa32c11f8f3107d97e6 Binary files /dev/null and b/xf86-video-intel-20180618.tar.bz2 differ diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec new file mode 100644 index 0000000000000000000000000000000000000000..7f35a35a8d6bbc24933570b96af3a8c79dbe6379 --- /dev/null +++ b/xorg-x11-drv-intel.spec @@ -0,0 +1,65 @@ +%define moduledir %(pkg-config xorg-server --variable=moduledir ) +%define driverdir %{moduledir}/drivers + +Name: xorg-x11-drv-intel +Version: 2.99.917 +Release: 42 +Summary: Xorg X11 Intel video driver +License: MIT +URL: http://www.x.org +Source0: https://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-20180618.tar.bz2 +Source1: make-git-snapshot.sh + +ExclusiveArch: %{ix86} x86_64 ia64 +BuildRequires: autoconf automake libtool xorg-x11-server-devel libX11-devel libXinerama-devel +BuildRequires: libXcursor-devel libXdamage-devel libXext-devel libXfixes-devel libXrandr-devel +BuildRequires: libXrender-devel libXtst-devel libXvMC-devel libXfont2-devel mesa-libGL-devel +BuildRequires: libdrm-devel kernel-headers libudev-devel libxcb-devel xcb-util-devel python3 +BuildRequires: cairo-devel libXScrnSaver-devel libXScrnSaver libXext-devel pixman-devel + +Requires: Xorg %(xserver-sdk-abi-requires ansic) polkit +Requires: Xorg %(xserver-sdk-abi-requires videodrv) + +Patch0000: intel-gcc-pr65873.patch +Patch0001: 0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch +Patch0002: 0001-Fix-build-on-F28-and-later.patch +Patch0003: 0001-Fix-build-on-i686.patch + +%description +X.Org X11 Intel video driver. + +%package_help + +%prep +%autosetup -n xf86-video-intel-20180618 -p1 + +%build +autoreconf -f -i -v +%configure --enable-kms-only --with-default-dri=3 --enable-tools +%make_build V=1 + +%install +%make_install +%delete_la +rm -f %{buildroot}%{_libdir}/libI*XvMC.so + +%ldconfig_scriptlets + +%files +%defattr(-,root,root) +%doc AUTHORS +%license COPYING +%{driverdir}/intel_drv.so +%{_bindir}/intel-virtual-output +%{_libdir}/libIntelXvMC.so.1* +%{_libexecdir}/xf86-video-intel-backlight-helper +%{_datadir}/polkit-1/actions/org.x.xf86-video-intel.backlight-helper.policy + +%files help +%defattr(-,root,root) +%doc README NEWS +%{_mandir}/man4/i* + +%changelog +* Tue Mar 10 2020 songnannan - 2.99.9.917-43 +- Package init