1 |
commit: e18892e3c3999a40df06e44cbac706ede58243e6 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 9 13:54:21 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 9 13:54:24 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e18892e3 |
7 |
|
8 |
x11-drivers/xf86-video-omap: fix build |
9 |
|
10 |
Closes: https://bugs.gentoo.org/707358 |
11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../files/xf86-video-omap-0.4.5-null-dereference.patch | 13 +++++++++++++ |
15 |
x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild | 6 +++++- |
16 |
2 files changed, 18 insertions(+), 1 deletion(-) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000000..8345a53105b |
21 |
--- /dev/null |
22 |
+++ b/x11-drivers/xf86-video-omap/files/xf86-video-omap-0.4.5-null-dereference.patch |
23 |
@@ -0,0 +1,13 @@ |
24 |
+https://sources.debian.org/patches/xf86-video-omap/0.4.5-1.1/null-dereference.patch/ |
25 |
+https://bugs.gentoo.org/707358 |
26 |
+--- a/src/omap_driver.c |
27 |
++++ v/src/omap_driver.c |
28 |
+@@ -542,7 +542,7 @@ OMAPPreInit(ScrnInfoPtr pScrn, int flags |
29 |
+ } |
30 |
+ |
31 |
+ if (!pScrn->chipset) { |
32 |
+- ERROR_MSG("Unknown chipset: %s", pScrn->chipset); |
33 |
++ ERROR_MSG("Unknown chipset"); |
34 |
+ goto fail; |
35 |
+ } |
36 |
+ |
37 |
|
38 |
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 |
39 |
index 778cdcfeccc..a28ec1b05d2 100644 |
40 |
--- a/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild |
41 |
+++ b/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild |
42 |
@@ -1,4 +1,4 @@ |
43 |
-# Copyright 1999-2017 Gentoo Foundation |
44 |
+# Copyright 1999-2021 Gentoo Authors |
45 |
# Distributed under the terms of the GNU General Public License v2 |
46 |
|
47 |
EAPI=5 |
48 |
@@ -12,3 +12,7 @@ KEYWORDS="arm" |
49 |
RDEPEND=">=x11-base/xorg-server-1.3 |
50 |
>=x11-libs/libdrm-2.4.36[video_cards_omap]" |
51 |
DEPEND="${RDEPEND}" |
52 |
+ |
53 |
+PATCHES=( |
54 |
+ "${FILESDIR}/${PN}-0.4.5-null-dereference.patch" |
55 |
+) |