Gentoo Archives: gentoo-commits

From: Markus Meier <maekke@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/maekke:master commit in: x11-drivers/xf86-video-armsoc/files/, x11-drivers/xf86-video-armsoc/
Date: Sun, 11 Oct 2015 10:15:34
Message-Id: 1444558519.13977a7eef23a0169dec7da588260ff8d058afa1.maekke@gentoo
1 commit: 13977a7eef23a0169dec7da588260ff8d058afa1
2 Author: Markus Meier <maekke <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 11 10:15:19 2015 +0000
4 Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 11 10:15:19 2015 +0000
6 URL: https://gitweb.gentoo.org/dev/maekke.git/commit/?id=13977a7e
7
8 x11-drivers/xf86-video-armsoc: fix build issue with xorg includes
9
10 Signed-off-by: Markus Meier <maekke <AT> gentoo.org>
11
12 x11-drivers/xf86-video-armsoc/Manifest | 3 ++-
13 .../xf86-video-armsoc_xorg-server-includes.patch | 22 ++++++++++++++++++++++
14 .../xf86-video-armsoc-9999.ebuild | 1 +
15 3 files changed, 25 insertions(+), 1 deletion(-)
16
17 diff --git a/x11-drivers/xf86-video-armsoc/Manifest b/x11-drivers/xf86-video-armsoc/Manifest
18 index 88f12c7..96e3013 100644
19 --- a/x11-drivers/xf86-video-armsoc/Manifest
20 +++ b/x11-drivers/xf86-video-armsoc/Manifest
21 @@ -1,3 +1,4 @@
22 AUX xf86-video-armsoc_compat.patch 1503 SHA256 e4bb1a6389fd886118954854365c239074485fb12c384ac6fd0d91fc5e57a607 SHA512 d5b1148ce69391130a45615e213f3be0db39c5dd8acde90e4374832ce2ed6be927d8dd10d0d70b6ffd30df62d7c56ab484689a91298ef17bf8057b6ff3709330 WHIRLPOOL 50a883674b29e1ef40c5cfeb09f1777014903434918a5cf3d1515e751cb1938dbdef05320248fea2a97233aa3ae990e2472e4d71e574a2d227e276f9481b441a
23 -EBUILD xf86-video-armsoc-9999.ebuild 716 SHA256 80b6b34180371d8bc72aa7dc08800b30369e9e2f969dfe26093b6a7677791873 SHA512 a521f747d7594c6273b82c23a2fceb5d87f5131b60c3ed4f8cebc48c5fc622e20d04ccc827b60a30a5b93f5f30659ed1ad2c1e6c500f197c0e17ff0c7e90de97 WHIRLPOOL 350b38b73dbb57fd836fb362b438dde442c5c3b49cf78d35b5d6035283a69dc9fb086979e2f53bae395b626b73934467440612d870e4591a632cc700bf20a0ce
24 +AUX xf86-video-armsoc_xorg-server-includes.patch 839 SHA256 1fa268c3e8dcf22b456f1926712609422a46df9a3982f51926ef40b7dad1f299 SHA512 cc051a1a020cf3d345ea4efed827343d842a40b478902e24fa39f1b68db86c3ce31b6ffa5b3f94d6eb4e6233b553615b94fdbda46d87cddbd3fa08cb94d0bdd5 WHIRLPOOL 1ac50185d2e95ccff876dc1c79931b2ad01616b6c70ef039667cd027cac0640eb15034533d5661141e07556d4437266c701588d58a824f0e4419fd470112487a
25 +EBUILD xf86-video-armsoc-9999.ebuild 764 SHA256 69f149e08389e2410898e75f8e85da9640c0294adebba057c45f22da2695c53c SHA512 3c7ab4b8e44c57a6795346bf7904d801ffd3ac8ede2c3323e00a372fb156c9ec109a17f32b797aca0c7733ed897144b99b88001dd4f538ad6eaf420b02000c9e WHIRLPOOL 077ce3097af2984d77e4376c0818f9ddcad6a91f955ed001eb76afc42a7fd12df86ec5c820c63607193b9a45c0d8c836e6023e2876e3c4619ef82ffa1cff69e0
26 MISC metadata.xml 272 SHA256 4d007409f67a06f02a0148ea00ef1f0ce92b9025bcce073ec492c6c370476826 SHA512 01e4d83e346f72d1416eacddae22d86446707c2abdc5bd76fd3eca6028891dc43f448844cc4ebfef87bd6a962b8a5e4af7207a0af7927b086dd83021766a4721 WHIRLPOOL f366b39fbe28c1f4c85a4600d6f8d0ddf305a7f58d65c0fddf8be113c1bb9367fdf0f184922b99cd195aab973d42935e38501f907e8daa1b214620022208c874
27
28 diff --git a/x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc_xorg-server-includes.patch b/x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc_xorg-server-includes.patch
29 new file mode 100644
30 index 0000000..82ef615
31 --- /dev/null
32 +++ b/x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc_xorg-server-includes.patch
33 @@ -0,0 +1,22 @@
34 +diff -ru xf86-video-armsoc-9999.orig/src/bo_exynos.c xf86-video-armsoc-9999/src/bo_exynos.c
35 +--- xf86-video-armsoc-9999.orig/src/bo_exynos.c 2015-10-11 11:40:12.343087923 +0200
36 ++++ xf86-video-armsoc-9999/src/bo_exynos.c 2015-10-11 11:51:24.233088004 +0200
37 +@@ -24,6 +24,7 @@
38 + #include <sys/mman.h>
39 + #include <assert.h>
40 + #include <errno.h>
41 ++#include <xorg-server.h>
42 + #include <xf86.h>
43 + #include <xf86drm.h>
44 + #include <xf86drmMode.h>
45 +diff -ru xf86-video-armsoc-9999.orig/src/omap_dumb.c xf86-video-armsoc-9999/src/omap_dumb.c
46 +--- xf86-video-armsoc-9999.orig/src/omap_dumb.c 2015-10-11 11:40:12.343087923 +0200
47 ++++ xf86-video-armsoc-9999/src/omap_dumb.c 2015-10-11 11:45:36.983087962 +0200
48 +@@ -26,6 +26,7 @@
49 + #include <assert.h>
50 + #include <errno.h>
51 +
52 ++#include <xorg-server.h>
53 + #include <xf86.h>
54 + #include <xf86drm.h>
55 + #include <xf86drmMode.h>
56
57 diff --git a/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild b/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild
58 index 13a3bbb..f33b71d 100644
59 --- a/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild
60 +++ b/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild
61 @@ -23,6 +23,7 @@ RDEPEND="${DEPEND}"
62
63 PATCHES=(
64 "${FILESDIR}"/${PN}_compat.patch
65 + "${FILESDIR}"/${PN}_xorg-server-includes.patch
66 )
67
68 XORG_CONFIGURE_OPTIONS=(