diff options
Diffstat (limited to 'user/xf86-video-intel')
| -rw-r--r-- | user/xf86-video-intel/APKBUILD | 7 | ||||
| -rw-r--r-- | user/xf86-video-intel/fno-common.patch | 24 |
2 files changed, 29 insertions, 2 deletions
diff --git a/user/xf86-video-intel/APKBUILD b/user/xf86-video-intel/APKBUILD index a7eb064bb..c172ed53e 100644 --- a/user/xf86-video-intel/APKBUILD +++ b/user/xf86-video-intel/APKBUILD @@ -15,7 +15,9 @@ makedepends="xorg-server-dev libxi-dev libdrm-dev mesa-dev libxvmc-dev libxv-dev " subpackages="$pkgname-doc" -source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.gz" +source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.gz + fno-common.patch + " giturl="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git" reporev="f66d39544bb8339130c96d282a80f87ca1606caf" @@ -42,4 +44,5 @@ package() { rm "$pkgdir"/usr/libexec/xf86-video-intel-backlight-helper } -sha512sums="cb853076238cbde61faeb7dd1a07c5edc5325361dc3109acd9c142c1bf66566ee8c19f8e709bde34456e4198353ac72d337bc6a43dbcc80a4546762541be6eb9 xf86-video-intel-2.99.917_git20200224.tar.gz" +sha512sums="cb853076238cbde61faeb7dd1a07c5edc5325361dc3109acd9c142c1bf66566ee8c19f8e709bde34456e4198353ac72d337bc6a43dbcc80a4546762541be6eb9 xf86-video-intel-2.99.917_git20200224.tar.gz +2290b7d1773ccff902b1300448513dd1be4db45db234a726b4a533430c9fb62a9802f306440f751e864e7a8fb5304468719a020fc86181465501b5b2d93f1390 fno-common.patch" diff --git a/user/xf86-video-intel/fno-common.patch b/user/xf86-video-intel/fno-common.patch new file mode 100644 index 000000000..5c0640f9f --- /dev/null +++ b/user/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 + |