Hello community,
here is the log from the commit of package xf86-video-intel for
openSUSE:Factory checked in at 2020-04-28 22:29:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-intel (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-intel.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-intel"
Tue Apr 28 22:29:07 2020 rev:82 rq:797215 version:2.99.917+git8674.25c9a2fcc
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-intel/xf86-video-intel.changes
2019-10-22 15:42:09.453491864 +0200
+++
/work/SRC/openSUSE:Factory/.xf86-video-intel.new.2738/xf86-video-intel.changes
2020-04-28 22:29:12.469399714 +0200
@@ -1,0 +2,5 @@
+Fri Apr 17 12:24:35 UTC 2020 - Martin Liška <[email protected]>
+
+- Add U_i810-multidef-fix.patch in order to fix boo#1169744.
+
+-------------------------------------------------------------------
New:
----
U_i810-multidef-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-intel.spec ++++++
--- /var/tmp/diff_new_pack.JRm3WQ/_old 2020-04-28 22:29:12.989400684 +0200
+++ /var/tmp/diff_new_pack.JRm3WQ/_new 2020-04-28 22:29:12.989400684 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xf86-video-intel
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
Summary: Intel video driver for the Xorg X server
License: MIT
Group: System/X11/Servers/XF86_4
-Url: http://x.org/wiki/IntelGraphicsDriver/
+URL: http://x.org/wiki/IntelGraphicsDriver/
#Git-Clone: git://anongit.freedesktop.org/xorg/driver/xf86-video-intel
#Git-Web: http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/
# http://xorg.freedesktop.org/releases/individual/driver/
@@ -33,6 +33,7 @@
Source0: %{name}-%{version}.tar.xz
Source99: baselibs.conf
Patch0: n_fix-build-on-i686.patch
+Patch1: U_i810-multidef-fix.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
@@ -140,6 +141,7 @@
# Applied only on 32bit architectures because only those need it to build with
# GCC8. It may slightly hurt performance, so lets not apply it where not
needed.
%patch0 -p1
+%patch1 -p1
%endif
%build
++++++ U_i810-multidef-fix.patch ++++++
>From 652d93cbbdc159c0883f1b626ea48e28bac63ae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hanno=20B=C3=B6ck?= <[email protected]>
Date: Sun, 2 Feb 2020 14:18:39 +0100
Subject: [PATCH] i810: Avoid duplicate definition of I810PatternROP
Signed-off-by: Chris Wilson <[email protected]>
---
src/legacy/i810/i810.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h
index 347188c9..19be049c 100644
--- a/src/legacy/i810/i810.h
+++ b/src/legacy/i810/i810.h
@@ -322,6 +322,6 @@ extern void I810InitMC(ScreenPtr pScreen);
extern const OptionInfoRec *I810AvailableOptions(int chipid, int busid);
extern const int I810CopyROP[16];
-const int I810PatternROP[16];
+extern const int I810PatternROP[16];
#endif /* _I810_H_ */
--
2.24.1
