* [gentoo-commits] dev/maekke:master commit in: x11-drivers/xf86-video-armsoc/files/, x11-drivers/xf86-video-armsoc/
@ 2012-12-16 16:04 Markus Meier
0 siblings, 0 replies; 4+ messages in thread
From: Markus Meier @ 2012-12-16 16:04 UTC (permalink / raw
To: gentoo-commits
commit: e431bc97af079c0570725a43c451f3cc9fe741a2
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 16:02:39 2012 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 16:07:52 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=e431bc97
add xf86-video-armsoc driver
---
x11-drivers/xf86-video-armsoc/Manifest | 2 +
...paste-from-omap-driver-to-get-it-compiled.patch | 397 ++++++++++++++++++++
.../xf86-video-armsoc-9999.ebuild | 25 ++
3 files changed, 424 insertions(+), 0 deletions(-)
diff --git a/x11-drivers/xf86-video-armsoc/Manifest b/x11-drivers/xf86-video-armsoc/Manifest
new file mode 100644
index 0000000..1f62dc1
--- /dev/null
+++ b/x11-drivers/xf86-video-armsoc/Manifest
@@ -0,0 +1,2 @@
+AUX 0001-copy-paste-from-omap-driver-to-get-it-compiled.patch 13279 SHA256 f2cbd9e1f5768257070e07d0780ffccc19b911ce5de32be44161a0139e2d485c SHA512 14d3de131b219ba0dd1cb69bdc49b672091b2e7b8b59096444191a25b9c5b08ff9dcc731324bf53ef01bb74007d981fad2b4116eb5512e9530976d2a529a1c8d WHIRLPOOL 090ff889d0e5ff660d1adbc2d09824096df88932c56c00d20a658ebb8007f5c542e261ce0e19561d41a6211892f6dfc64795019658781b6cbb55315497d1dbee
+EBUILD xf86-video-armsoc-9999.ebuild 436 SHA256 67d967fd0257ccff8930e44f29d355797eaac92bb6461b71d6f6701567fbb8dc SHA512 0dfbc4087bd1bcd47efcaa447eb3095f4daf87628989055c9b48d1614d6b04e7bedf9c4fa2735079945931c2344d8f1735c4df09f06f622cdc5b9ceae82cd02f WHIRLPOOL 1d4854e0d36a55a09be41a141251f4bcca66d943c7495469f956525d1cb19abdcc5d79c9df0cf042fc53eb9bbd7879e7a5a8d59c62f825c614083a99c2029064
diff --git a/x11-drivers/xf86-video-armsoc/files/0001-copy-paste-from-omap-driver-to-get-it-compiled.patch b/x11-drivers/xf86-video-armsoc/files/0001-copy-paste-from-omap-driver-to-get-it-compiled.patch
new file mode 100644
index 0000000..a6be2bb
--- /dev/null
+++ b/x11-drivers/xf86-video-armsoc/files/0001-copy-paste-from-omap-driver-to-get-it-compiled.patch
@@ -0,0 +1,397 @@
+From 13c5cf601786c81424fa86b2180bd97e515cb51a Mon Sep 17 00:00:00 2001
+From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
+Date: Thu, 1 Nov 2012 00:16:58 +0100
+Subject: [PATCH] copy/paste from omap driver to armsoc compiled
+
+---
+ src/compat-api.h | 99 +++++++++++++++++++++++++++++++++++++++++++++++++
+ src/drmmode_display.c | 4 +-
+ src/omap_driver.c | 67 ++++++++++++++++-----------------
+ src/omap_driver.h | 3 +-
+ src/omap_exa.h | 6 ++-
+ src/omap_exa_null.c | 4 +-
+ 6 files changed, 139 insertions(+), 44 deletions(-)
+ create mode 100644 src/compat-api.h
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+new file mode 100644
+index 0000000..ad15fa3
+--- /dev/null
++++ b/src/compat-api.h
+@@ -0,0 +1,99 @@
++/*
++ * Copyright 2012 Red Hat, Inc.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the next
++ * paragraph) shall be included in all copies or substantial portions of the
++ * Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS IN THE SOFTWARE.
++ *
++ * Author: Dave Airlie <airlied@redhat.com>
++ */
++
++/* this file provides API compat between server post 1.13 and pre it,
++ it should be reused inside as many drivers as possible */
++#ifndef COMPAT_API_H
++#define COMPAT_API_H
++
++#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
++#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
++#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
++#endif
++
++#ifndef XF86_HAS_SCRN_CONV
++#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
++#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
++#endif
++
++#ifndef XF86_SCRN_INTERFACE
++
++#define SCRN_ARG_TYPE int
++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
++
++#define SCREEN_ARG_TYPE int
++#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
++
++#define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScreen, int argc, char **argv
++
++#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
++#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
++
++#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
++#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
++
++#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
++
++#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
++
++#define FREE_SCREEN_ARGS_DECL int arg, int flags
++#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0
++
++#define VT_FUNC_ARGS_DECL int arg, int flags
++#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags)
++
++#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
++#else
++#define SCRN_ARG_TYPE ScrnInfoPtr
++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
++
++#define SCREEN_ARG_TYPE ScreenPtr
++#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
++
++#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
++
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
++#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++
++#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
++#define CLOSE_SCREEN_ARGS pScreen
++// old ones just because
++//#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
++//#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
++
++#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
++#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
++
++#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
++#define FREE_SCREEN_ARGS(x) (x)
++
++#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
++#define VT_FUNC_ARGS(flags) pScrn
++
++#define XF86_ENABLEDISABLEFB_ARG(x) (x)
++
++#endif
++
++#endif
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index 297bd62..28aefad 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
+@@ -1524,8 +1524,6 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
+
+ TRACE_ENTER();
+
+- pScrn->canDoBGNoneRoot = TRUE;
+-
+ drmmode = calloc(1, sizeof *drmmode);
+ drmmode->fd = fd;
+
+@@ -1564,7 +1562,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
+ }
+
+ void
+-drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y, int flags)
++drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y)
+ {
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+ xf86OutputPtr output = config->output[config->compat_output];
+diff --git a/src/omap_driver.c b/src/omap_driver.c
+index 0200990..f2b2e37 100644
+--- a/src/omap_driver.c
++++ b/src/omap_driver.c
+@@ -47,19 +47,17 @@ static const OptionInfoRec *OMAPAvailableOptions(int chipid, int busid);
+ static void OMAPIdentify(int flags);
+ static Bool OMAPProbe(DriverPtr drv, int flags);
+ static Bool OMAPPreInit(ScrnInfoPtr pScrn, int flags);
+-static Bool OMAPScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
+- char **argv);
++static Bool OMAPScreenInit(SCREEN_INIT_ARGS_DECL);
+ static void OMAPLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
+ LOCO * colors, VisualPtr pVisual);
+-static Bool OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen);
++static Bool OMAPCloseScreen(CLOSE_SCREEN_ARGS_DECL);
+ static Bool OMAPCreateScreenResources(ScreenPtr pScreen);
+-static void OMAPBlockHandler(int i, pointer blockData, pointer pTimeout,
+- pointer pReadmask);
+-static Bool OMAPSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+-static void OMAPAdjustFrame(int scrnIndex, int x, int y, int flags);
+-static Bool OMAPEnterVT(int scrnIndex, int flags);
+-static void OMAPLeaveVT(int scrnIndex, int flags);
+-static void OMAPFreeScreen(int scrnIndex, int flags);
++static void OMAPBlockHandler(BLOCKHANDLER_ARGS_DECL);
++static Bool OMAPSwitchMode(SWITCH_MODE_ARGS_DECL);
++static void OMAPAdjustFrame(ADJUST_FRAME_ARGS_DECL);
++static Bool OMAPEnterVT(VT_FUNC_ARGS_DECL);
++static void OMAPLeaveVT(VT_FUNC_ARGS_DECL);
++static void OMAPFreeScreen(FREE_SCREEN_ARGS_DECL);
+
+
+
+@@ -668,7 +666,7 @@ OMAPAccelInit(ScreenPtr pScreen)
+ * save state, initialize the mode, etc.
+ */
+ static Bool
+-OMAPScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
++OMAPScreenInit(SCREEN_INIT_ARGS_DECL)
+ {
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ OMAPPtr pOMAP = OMAPPTR(pScrn);
+@@ -786,10 +784,7 @@ OMAPScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ /* Take over the virtual terminal from the console, set the desired mode,
+ * etc.:
+ */
+- if (!OMAPEnterVT(scrnIndex, 0)) {
+- ERROR_MSG("OMAPEnterVT() failed!");
+- goto fail;
+- }
++ OMAPEnterVT(VT_FUNC_ARGS(0));
+
+ /* Do some XRandR initialization: */
+ if (!xf86CrtcScreenInit(pScreen)) {
+@@ -856,9 +851,9 @@ OMAPLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
+ * held by pScrn).
+ */
+ static Bool
+-OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen)
++OMAPCloseScreen(CLOSE_SCREEN_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ OMAPPtr pOMAP = OMAPPTR(pScrn);
+
+ TRACE_ENTER();
+@@ -866,12 +861,12 @@ OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen)
+ drmmode_screen_fini(pScrn);
+
+ if (pScrn->vtSema == TRUE) {
+- OMAPLeaveVT(scrnIndex, 0);
++ OMAPLeaveVT(VT_FUNC_ARGS(0));
+ }
+
+ if (pOMAP->pOMAPEXA) {
+ if (pOMAP->pOMAPEXA->CloseScreen) {
+- pOMAP->pOMAPEXA->CloseScreen(scrnIndex, pScreen);
++ pOMAP->pOMAPEXA->CloseScreen(CLOSE_SCREEN_ARGS);
+ }
+ }
+
+@@ -893,7 +888,7 @@ OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen)
+
+ TRACE_EXIT();
+
+- return (*pScreen->CloseScreen)(scrnIndex, pScreen);
++ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
+ }
+
+
+@@ -920,14 +915,14 @@ OMAPCreateScreenResources(ScreenPtr pScreen)
+
+
+ static void
+-OMAPBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
++OMAPBlockHandler(BLOCKHANDLER_ARGS_DECL)
+ {
+- ScreenPtr pScreen = screenInfo.screens[i];
+- ScrnInfoPtr pScrn = xf86Screens[i];
++ SCREEN_PTR(arg);
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ OMAPPtr pOMAP = OMAPPTR(pScrn);
+
+ swap(pOMAP, pScreen, BlockHandler);
+- (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
++ (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
+ swap(pOMAP, pScreen, BlockHandler);
+
+ /* TODO OMAPVideoBlockHandler(), etc.. */
+@@ -940,9 +935,9 @@ OMAPBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
+ * Screen.
+ */
+ static Bool
+-OMAPSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
++OMAPSwitchMode(SWITCH_MODE_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++ SCRN_INFO_PTR(arg);
+ return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
+ }
+
+@@ -954,10 +949,10 @@ OMAPSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+ * buffer within the "viewport" of the monitor.
+ */
+ static void
+-OMAPAdjustFrame(int scrnIndex, int x, int y, int flags)
++OMAPAdjustFrame(ADJUST_FRAME_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+- drmmode_adjust_frame(pScrn, x, y, flags);
++ SCRN_INFO_PTR(arg);
++ drmmode_adjust_frame(pScrn, x, y);
+ }
+
+
+@@ -969,9 +964,9 @@ OMAPAdjustFrame(int scrnIndex, int x, int y, int flags)
+ * HW state as needed by the X server.
+ */
+ static Bool
+-OMAPEnterVT(int scrnIndex, int flags)
++OMAPEnterVT(VT_FUNC_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++ SCRN_INFO_PTR(arg);
+ OMAPPtr pOMAP = OMAPPTR(pScrn);
+ int i, ret;
+
+@@ -1004,9 +999,9 @@ OMAPEnterVT(int scrnIndex, int flags)
+ * need to restore the console's HW state.
+ */
+ static void
+-OMAPLeaveVT(int scrnIndex, int flags)
++OMAPLeaveVT(VT_FUNC_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++ SCRN_INFO_PTR(arg);
+ OMAPPtr pOMAP = OMAPPTR(pScrn);
+ int i, ret;
+
+@@ -1033,9 +1028,9 @@ OMAPLeaveVT(int scrnIndex, int flags)
+ * up-to-and-including an unsuccessful ScreenInit() call.
+ */
+ static void
+-OMAPFreeScreen(int scrnIndex, int flags)
++OMAPFreeScreen(FREE_SCREEN_ARGS_DECL)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++ SCRN_INFO_PTR(arg);
+ OMAPPtr pOMAP = OMAPPTR(pScrn);
+
+ TRACE_ENTER();
+@@ -1047,7 +1042,7 @@ OMAPFreeScreen(int scrnIndex, int flags)
+
+ if (pOMAP->pOMAPEXA) {
+ if (pOMAP->pOMAPEXA->FreeScreen) {
+- pOMAP->pOMAPEXA->FreeScreen(scrnIndex, flags);
++ pOMAP->pOMAPEXA->FreeScreen(FREE_SCREEN_ARGS(pScrn));
+ }
+ free(pOMAP->pOMAPEXA);
+ }
+diff --git a/src/omap_driver.h b/src/omap_driver.h
+index f24479e..d27d2da 100644
+--- a/src/omap_driver.h
++++ b/src/omap_driver.h
+@@ -61,6 +61,7 @@
+
+ #include <errno.h>
+
++#include "compat-api.h"
+ #include "omap_exa.h"
+
+
+@@ -236,7 +237,7 @@ static inline Bool has_dmm(OMAPPtr pOMAP)
+ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
+ void drmmode_screen_init(ScrnInfoPtr pScrn);
+ void drmmode_screen_fini(ScrnInfoPtr pScrn);
+-void drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y, int flags);
++void drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y);
+ int drmmode_page_flip(DrawablePtr draw, uint32_t fb_id, void *priv);
+ void drmmode_wait_for_event(ScrnInfoPtr pScrn);
+ Bool drmmode_cursor_init(ScreenPtr pScreen);
+diff --git a/src/omap_exa.h b/src/omap_exa.h
+index 9980858..2c76807 100644
+--- a/src/omap_exa.h
++++ b/src/omap_exa.h
+@@ -37,6 +37,8 @@
+ #include "omap_util.h"
+ #include "exa.h"
+
++#include "compat-api.h"
++
+ /**
+ * A per-Screen structure used to communicate and coordinate between the OMAP X
+ * driver and an external EXA sub-module (if loaded).
+@@ -50,14 +52,14 @@ typedef struct _OMAPEXARec
+ * generation to free per-Screen data structures (except those held by
+ * pScrn).
+ */
+- Bool (*CloseScreen)(int scrnIndex, ScreenPtr pScreen);
++ Bool (*CloseScreen)(CLOSE_SCREEN_ARGS_DECL);
+
+ /**
+ * Called by X driver's FreeScreen() function at the end of each server
+ * lifetime to free per-ScrnInfoRec data structures, to close any external
+ * connections (e.g. with PVR2D, DRM), etc.
+ */
+- void (*FreeScreen)(int scrnIndex, int flags);
++ void (*FreeScreen)(FREE_SCREEN_ARGS_DECL);
+
+ /** get formats supported by PutTextureImage() (for dri2 video..) */
+ #define MAX_FORMATS 16
+diff --git a/src/omap_exa_null.c b/src/omap_exa_null.c
+index 7d1f295..3c1e683 100644
+--- a/src/omap_exa_null.c
++++ b/src/omap_exa_null.c
+@@ -77,7 +77,7 @@ PrepareCompositeFail(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
+ }
+
+ static Bool
+-CloseScreen(int scrnIndex, ScreenPtr pScreen)
++CloseScreen(CLOSE_SCREEN_ARGS_DECL)
+ {
+ #if 0 // TODO need to change CloseScreen/FreeScreen ..
+ exaDriverFini(pScreen);
+@@ -87,7 +87,7 @@ CloseScreen(int scrnIndex, ScreenPtr pScreen)
+ }
+
+ static void
+-FreeScreen(int scrnIndex, int flags)
++FreeScreen(FREE_SCREEN_ARGS_DECL)
+ {
+ }
+
+--
+1.7.10.4
+
diff --git a/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild b/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild
new file mode 100644
index 0000000..2a1682b
--- /dev/null
+++ b/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+EGIT_REPO_URI="https://git.chromium.org/git/chromiumos/third_party/xf86-video-armsoc.git"
+
+inherit xorg-2
+
+DESCRIPTION=""
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~arm"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/0001-copy-paste-from-omap-driver-to-get-it-compiled.patch
+)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/maekke:master commit in: x11-drivers/xf86-video-armsoc/files/, x11-drivers/xf86-video-armsoc/
@ 2013-05-02 17:19 Markus Meier
0 siblings, 0 replies; 4+ messages in thread
From: Markus Meier @ 2013-05-02 17:19 UTC (permalink / raw
To: gentoo-commits
commit: ece81a3c8af1202998d93b87a050486e5b8692ab
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu May 2 17:24:43 2013 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Thu May 2 17:24:43 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=ece81a3c
update xf86-video-armsoc ebuild and patch
---
x11-drivers/xf86-video-armsoc/Manifest | 4 +-
...mpiled.patch => xf86-video-armsoc_compat.patch} | 177 ++++++++++----------
.../xf86-video-armsoc-9999.ebuild | 6 +-
3 files changed, 93 insertions(+), 94 deletions(-)
diff --git a/x11-drivers/xf86-video-armsoc/Manifest b/x11-drivers/xf86-video-armsoc/Manifest
index 1f62dc1..ad2c600 100644
--- a/x11-drivers/xf86-video-armsoc/Manifest
+++ b/x11-drivers/xf86-video-armsoc/Manifest
@@ -1,2 +1,2 @@
-AUX 0001-copy-paste-from-omap-driver-to-get-it-compiled.patch 13279 SHA256 f2cbd9e1f5768257070e07d0780ffccc19b911ce5de32be44161a0139e2d485c SHA512 14d3de131b219ba0dd1cb69bdc49b672091b2e7b8b59096444191a25b9c5b08ff9dcc731324bf53ef01bb74007d981fad2b4116eb5512e9530976d2a529a1c8d WHIRLPOOL 090ff889d0e5ff660d1adbc2d09824096df88932c56c00d20a658ebb8007f5c542e261ce0e19561d41a6211892f6dfc64795019658781b6cbb55315497d1dbee
-EBUILD xf86-video-armsoc-9999.ebuild 436 SHA256 67d967fd0257ccff8930e44f29d355797eaac92bb6461b71d6f6701567fbb8dc SHA512 0dfbc4087bd1bcd47efcaa447eb3095f4daf87628989055c9b48d1614d6b04e7bedf9c4fa2735079945931c2344d8f1735c4df09f06f622cdc5b9ceae82cd02f WHIRLPOOL 1d4854e0d36a55a09be41a141251f4bcca66d943c7495469f956525d1cb19abdcc5d79c9df0cf042fc53eb9bbd7879e7a5a8d59c62f825c614083a99c2029064
+AUX xf86-video-armsoc_compat.patch 12967 SHA256 7c959a226253caca2022bc4dd84ccde6beb5e8dfd21ccc6603d74f10c2b9a817 SHA512 793643a1d91f1a35146e382a20b736a66bad3ed6087e11cf3ee942b62b1444c875d90360622254db8ab981a24cba6d5635b1d55f60888415770b0290c971a5c7 WHIRLPOOL c3158272fdd9dfb8173d9bd5e4a76f1f4112e58ef577d3b87eeff7a904ce3217283c554cd49b0c6472d6ca0a6e21c9e7040d47044f5bdcee1ea97e61bca4200a
+EBUILD xf86-video-armsoc-9999.ebuild 516 SHA256 1ef0daf3cee5e623229005ab677eccdc67e0f965b484aa30051ddeeaf1efa5ba SHA512 3954298eae125eb156636e52a1ebdf3b7c5ffeed3bd70042152213227003e1de93e455c1d30eec9c5cba29706f62d37129765aa9cc245e328b751ac4fe25c597 WHIRLPOOL 51142835cbe02cb68846f10b0cf50865cc3bc87fa19fb42f1caaf3a546cc3a017716a9d841948a06c948291f5fd17beede550e1006c4666c532436e77d3d8ac8
diff --git a/x11-drivers/xf86-video-armsoc/files/0001-copy-paste-from-omap-driver-to-get-it-compiled.patch b/x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc_compat.patch
similarity index 74%
rename from x11-drivers/xf86-video-armsoc/files/0001-copy-paste-from-omap-driver-to-get-it-compiled.patch
rename to x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc_compat.patch
index a6be2bb..5cdc525 100644
--- a/x11-drivers/xf86-video-armsoc/files/0001-copy-paste-from-omap-driver-to-get-it-compiled.patch
+++ b/x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc_compat.patch
@@ -1,24 +1,7 @@
-From 13c5cf601786c81424fa86b2180bd97e515cb51a Mon Sep 17 00:00:00 2001
-From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
-Date: Thu, 1 Nov 2012 00:16:58 +0100
-Subject: [PATCH] copy/paste from omap driver to armsoc compiled
-
----
- src/compat-api.h | 99 +++++++++++++++++++++++++++++++++++++++++++++++++
- src/drmmode_display.c | 4 +-
- src/omap_driver.c | 67 ++++++++++++++++-----------------
- src/omap_driver.h | 3 +-
- src/omap_exa.h | 6 ++-
- src/omap_exa_null.c | 4 +-
- 6 files changed, 139 insertions(+), 44 deletions(-)
- create mode 100644 src/compat-api.h
-
-diff --git a/src/compat-api.h b/src/compat-api.h
-new file mode 100644
-index 0000000..ad15fa3
---- /dev/null
-+++ b/src/compat-api.h
-@@ -0,0 +1,99 @@
+diff -Nru xf86-video-armsoc-9999.orig/src/compat-api.h xf86-video-armsoc-9999/src/compat-api.h
+--- xf86-video-armsoc-9999.orig/src/compat-api.h 1970-01-01 01:00:00.000000000 +0100
++++ xf86-video-armsoc-9999/src/compat-api.h 2013-03-13 20:24:17.465046225 +0100
+@@ -0,0 +1,101 @@
+/*
+ * Copyright 2012 Red Hat, Inc.
+ *
@@ -67,7 +50,7 @@ index 0000000..ad15fa3
+#define SCREEN_ARG_TYPE int
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
+
-+#define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScreen, int argc, char **argv
++#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
@@ -76,8 +59,10 @@ index 0000000..ad15fa3
+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
+
+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
++#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
+
+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
++#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
+
+#define FREE_SCREEN_ARGS_DECL int arg, int flags
+#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0
@@ -100,12 +85,12 @@ index 0000000..ad15fa3
+
+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS pScreen
-+// old ones just because
-+//#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
-+//#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
+
+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
++#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
++
+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
++#define SWITCH_MODE_ARGS(arg, m) arg, m
+
+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
+#define FREE_SCREEN_ARGS(x) (x)
@@ -118,20 +103,26 @@ index 0000000..ad15fa3
+#endif
+
+#endif
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 297bd62..28aefad 100644
---- a/src/drmmode_display.c
-+++ b/src/drmmode_display.c
-@@ -1524,8 +1524,6 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
+diff -Nru xf86-video-armsoc-9999.orig/src/drmmode_display.c xf86-video-armsoc-9999/src/drmmode_display.c
+--- xf86-video-armsoc-9999.orig/src/drmmode_display.c 2013-03-13 20:17:55.875045541 +0100
++++ xf86-video-armsoc-9999/src/drmmode_display.c 2013-03-13 20:55:19.385046528 +0100
+@@ -59,7 +59,6 @@
+ #include "mipointer.h"
+
+ /* All drivers implementing backing store need this */
+-#include "mibstore.h"
+
+ #include "micmap.h"
+
+@@ -1524,7 +1523,6 @@
TRACE_ENTER();
- pScrn->canDoBGNoneRoot = TRUE;
--
+
drmmode = calloc(1, sizeof *drmmode);
drmmode->fd = fd;
-
-@@ -1564,7 +1562,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
+@@ -1564,7 +1562,7 @@
}
void
@@ -140,11 +131,19 @@ index 297bd62..28aefad 100644
{
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
xf86OutputPtr output = config->output[config->compat_output];
-diff --git a/src/omap_driver.c b/src/omap_driver.c
-index 0200990..f2b2e37 100644
---- a/src/omap_driver.c
-+++ b/src/omap_driver.c
-@@ -47,19 +47,17 @@ static const OptionInfoRec *OMAPAvailableOptions(int chipid, int busid);
+diff -Nru xf86-video-armsoc-9999.orig/src/omap_driver.c xf86-video-armsoc-9999/src/omap_driver.c
+--- xf86-video-armsoc-9999.orig/src/omap_driver.c 2013-03-13 20:17:55.875045541 +0100
++++ xf86-video-armsoc-9999/src/omap_driver.c 2013-03-13 21:23:07.335047492 +0100
+@@ -37,6 +37,8 @@
+
+ #include "omap_driver.h"
+
++#include "compat-api.h"
++
+
+ Bool omapDebug = 0;
+
+@@ -47,19 +49,17 @@
static void OMAPIdentify(int flags);
static Bool OMAPProbe(DriverPtr drv, int flags);
static Bool OMAPPreInit(ScrnInfoPtr pScrn, int flags);
@@ -172,7 +171,7 @@ index 0200990..f2b2e37 100644
-@@ -668,7 +666,7 @@ OMAPAccelInit(ScreenPtr pScreen)
+@@ -668,7 +668,7 @@
* save state, initialize the mode, etc.
*/
static Bool
@@ -181,19 +180,24 @@ index 0200990..f2b2e37 100644
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
OMAPPtr pOMAP = OMAPPTR(pScrn);
-@@ -786,10 +784,7 @@ OMAPScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+@@ -762,7 +762,6 @@
+ OMAPAccelInit(pScreen);
+
+ /* Initialize backing store: */
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+
+ /* Cause the cursor position to be updated by the mouse signal handler: */
+@@ -786,7 +785,7 @@
/* Take over the virtual terminal from the console, set the desired mode,
* etc.:
*/
- if (!OMAPEnterVT(scrnIndex, 0)) {
-- ERROR_MSG("OMAPEnterVT() failed!");
-- goto fail;
-- }
-+ OMAPEnterVT(VT_FUNC_ARGS(0));
-
- /* Do some XRandR initialization: */
- if (!xf86CrtcScreenInit(pScreen)) {
-@@ -856,9 +851,9 @@ OMAPLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
++ if (!OMAPEnterVT(VT_FUNC_ARGS(0))) {
+ ERROR_MSG("OMAPEnterVT() failed!");
+ goto fail;
+ }
+@@ -856,9 +855,9 @@
* held by pScrn).
*/
static Bool
@@ -205,7 +209,7 @@ index 0200990..f2b2e37 100644
OMAPPtr pOMAP = OMAPPTR(pScrn);
TRACE_ENTER();
-@@ -866,12 +861,12 @@ OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -866,12 +865,12 @@
drmmode_screen_fini(pScrn);
if (pScrn->vtSema == TRUE) {
@@ -220,7 +224,7 @@ index 0200990..f2b2e37 100644
}
}
-@@ -893,7 +888,7 @@ OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -893,7 +892,7 @@
TRACE_EXIT();
@@ -229,7 +233,7 @@ index 0200990..f2b2e37 100644
}
-@@ -920,14 +915,14 @@ OMAPCreateScreenResources(ScreenPtr pScreen)
+@@ -920,14 +919,14 @@
static void
@@ -248,7 +252,7 @@ index 0200990..f2b2e37 100644
swap(pOMAP, pScreen, BlockHandler);
/* TODO OMAPVideoBlockHandler(), etc.. */
-@@ -940,9 +935,9 @@ OMAPBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
+@@ -940,9 +939,9 @@
* Screen.
*/
static Bool
@@ -260,7 +264,7 @@ index 0200990..f2b2e37 100644
return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
}
-@@ -954,10 +949,10 @@ OMAPSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -954,10 +953,10 @@
* buffer within the "viewport" of the monitor.
*/
static void
@@ -274,7 +278,7 @@ index 0200990..f2b2e37 100644
}
-@@ -969,9 +964,9 @@ OMAPAdjustFrame(int scrnIndex, int x, int y, int flags)
+@@ -969,9 +968,9 @@
* HW state as needed by the X server.
*/
static Bool
@@ -286,7 +290,7 @@ index 0200990..f2b2e37 100644
OMAPPtr pOMAP = OMAPPTR(pScrn);
int i, ret;
-@@ -1004,9 +999,9 @@ OMAPEnterVT(int scrnIndex, int flags)
+@@ -1005,9 +1004,9 @@
* need to restore the console's HW state.
*/
static void
@@ -298,7 +302,7 @@ index 0200990..f2b2e37 100644
OMAPPtr pOMAP = OMAPPTR(pScrn);
int i, ret;
-@@ -1033,9 +1028,9 @@ OMAPLeaveVT(int scrnIndex, int flags)
+@@ -1034,9 +1033,9 @@
* up-to-and-including an unsuccessful ScreenInit() call.
*/
static void
@@ -310,7 +314,7 @@ index 0200990..f2b2e37 100644
OMAPPtr pOMAP = OMAPPTR(pScrn);
TRACE_ENTER();
-@@ -1047,7 +1042,7 @@ OMAPFreeScreen(int scrnIndex, int flags)
+@@ -1048,7 +1047,7 @@
if (pOMAP->pOMAPEXA) {
if (pOMAP->pOMAPEXA->FreeScreen) {
@@ -319,41 +323,38 @@ index 0200990..f2b2e37 100644
}
free(pOMAP->pOMAPEXA);
}
-diff --git a/src/omap_driver.h b/src/omap_driver.h
-index f24479e..d27d2da 100644
---- a/src/omap_driver.h
-+++ b/src/omap_driver.h
-@@ -61,6 +61,7 @@
-
- #include <errno.h>
-
-+#include "compat-api.h"
- #include "omap_exa.h"
-
-
-@@ -236,7 +237,7 @@ static inline Bool has_dmm(OMAPPtr pOMAP)
+diff -Nru xf86-video-armsoc-9999.orig/src/omap_driver.h xf86-video-armsoc-9999/src/omap_driver.h
+--- xf86-video-armsoc-9999.orig/src/omap_driver.h 2013-03-13 20:17:55.875045541 +0100
++++ xf86-video-armsoc-9999/src/omap_driver.h 2013-03-13 21:03:22.575046705 +0100
+@@ -40,7 +40,6 @@
+ * XXX - figure out what can be removed..
+ */
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "micmap.h"
+ #include "colormapst.h"
+ #include "xf86cmap.h"
+@@ -240,7 +239,7 @@
Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
void drmmode_screen_init(ScrnInfoPtr pScrn);
void drmmode_screen_fini(ScrnInfoPtr pScrn);
-void drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y, int flags);
+void drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y);
- int drmmode_page_flip(DrawablePtr draw, uint32_t fb_id, void *priv);
+ int drmmode_page_flip(DrawablePtr draw, uint32_t fb_id, void *priv,
+ int* num_flipped);
void drmmode_wait_for_event(ScrnInfoPtr pScrn);
- Bool drmmode_cursor_init(ScreenPtr pScreen);
-diff --git a/src/omap_exa.h b/src/omap_exa.h
-index 9980858..2c76807 100644
---- a/src/omap_exa.h
-+++ b/src/omap_exa.h
-@@ -37,6 +37,8 @@
+diff -Nru xf86-video-armsoc-9999.orig/src/omap_exa.h xf86-video-armsoc-9999/src/omap_exa.h
+--- xf86-video-armsoc-9999.orig/src/omap_exa.h 2013-03-13 20:17:55.875045541 +0100
++++ xf86-video-armsoc-9999/src/omap_exa.h 2013-03-13 20:41:08.060045938 +0100
+@@ -36,6 +36,7 @@
+ #include "omap_drmif_fb.h"
#include "omap_util.h"
#include "exa.h"
-
+#include "compat-api.h"
-+
+
/**
* A per-Screen structure used to communicate and coordinate between the OMAP X
- * driver and an external EXA sub-module (if loaded).
-@@ -50,14 +52,14 @@ typedef struct _OMAPEXARec
+@@ -50,14 +51,14 @@
* generation to free per-Screen data structures (except those held by
* pScrn).
*/
@@ -370,11 +371,10 @@ index 9980858..2c76807 100644
/** get formats supported by PutTextureImage() (for dri2 video..) */
#define MAX_FORMATS 16
-diff --git a/src/omap_exa_null.c b/src/omap_exa_null.c
-index 7d1f295..3c1e683 100644
---- a/src/omap_exa_null.c
-+++ b/src/omap_exa_null.c
-@@ -77,7 +77,7 @@ PrepareCompositeFail(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
+diff -Nru xf86-video-armsoc-9999.orig/src/omap_exa_null.c xf86-video-armsoc-9999/src/omap_exa_null.c
+--- xf86-video-armsoc-9999.orig/src/omap_exa_null.c 2013-03-13 20:17:55.875045541 +0100
++++ xf86-video-armsoc-9999/src/omap_exa_null.c 2013-03-13 20:41:57.880046345 +0100
+@@ -77,7 +77,7 @@
}
static Bool
@@ -383,7 +383,7 @@ index 7d1f295..3c1e683 100644
{
#if 0 // TODO need to change CloseScreen/FreeScreen ..
exaDriverFini(pScreen);
-@@ -87,7 +87,7 @@ CloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -87,7 +87,7 @@
}
static void
@@ -392,6 +392,3 @@ index 7d1f295..3c1e683 100644
{
}
---
-1.7.10.4
-
diff --git a/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild b/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild
index 2a1682b..ebb29c5 100644
--- a/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild
+++ b/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild
@@ -17,9 +17,11 @@ SLOT="0"
KEYWORDS="~arm"
IUSE=""
-DEPEND=""
+DEPEND="!x11-drivers/xf86-video-armsoc-linaro"
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}"/0001-copy-paste-from-omap-driver-to-get-it-compiled.patch
+ "${FILESDIR}"/${PN}_compat.patch
)
+
+XORG_CONFIGURE_OPTIONS=( "--disable-silent-rules" "--disable-selective-werror" )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/maekke:master commit in: x11-drivers/xf86-video-armsoc/files/, x11-drivers/xf86-video-armsoc/
@ 2013-08-18 15:27 Markus Meier
0 siblings, 0 replies; 4+ messages in thread
From: Markus Meier @ 2013-08-18 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 6cbdda1314b1ea3e28168d747c29d48f4424374d
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 15:32:53 2013 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 15:32:53 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=6cbdda13
update compat patch
Package-Manager: portage-2.1.13.5
Manifest-Sign-Key: 072AD062
---
x11-drivers/xf86-video-armsoc/Manifest | 8 +-
.../files/xf86-video-armsoc_compat.patch | 375 +--------------------
2 files changed, 15 insertions(+), 368 deletions(-)
diff --git a/x11-drivers/xf86-video-armsoc/Manifest b/x11-drivers/xf86-video-armsoc/Manifest
index f7f58f9..40f8026 100644
--- a/x11-drivers/xf86-video-armsoc/Manifest
+++ b/x11-drivers/xf86-video-armsoc/Manifest
@@ -1,13 +1,13 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX xf86-video-armsoc_compat.patch 12967 SHA256 7c959a226253caca2022bc4dd84ccde6beb5e8dfd21ccc6603d74f10c2b9a817 SHA512 793643a1d91f1a35146e382a20b736a66bad3ed6087e11cf3ee942b62b1444c875d90360622254db8ab981a24cba6d5635b1d55f60888415770b0290c971a5c7 WHIRLPOOL c3158272fdd9dfb8173d9bd5e4a76f1f4112e58ef577d3b87eeff7a904ce3217283c554cd49b0c6472d6ca0a6e21c9e7040d47044f5bdcee1ea97e61bca4200a
+AUX xf86-video-armsoc_compat.patch 1503 SHA256 e4bb1a6389fd886118954854365c239074485fb12c384ac6fd0d91fc5e57a607 SHA512 d5b1148ce69391130a45615e213f3be0db39c5dd8acde90e4374832ce2ed6be927d8dd10d0d70b6ffd30df62d7c56ab484689a91298ef17bf8057b6ff3709330 WHIRLPOOL 50a883674b29e1ef40c5cfeb09f1777014903434918a5cf3d1515e751cb1938dbdef05320248fea2a97233aa3ae990e2472e4d71e574a2d227e276f9481b441a
EBUILD xf86-video-armsoc-9999.ebuild 657 SHA256 91e0197bb565a928a175697392e09510550616b20b97eebaa8e61f95d4e2d120 SHA512 8e6edeca9ea61405d4bf31f9bf6e8ac633e78d333b6c4dad493bee0238f044a90d6bb60f825d92df5d33f9e1ee6e572436ba2be5d9bf2a00f7526074b5331569 WHIRLPOOL 5d6189e9154cffd0c0e5ba5a7fc8927466c9e8e00e44f2cd0f4c5ca9d0dfe4db0192833d2d6990cd85048402e1073d6348866e4735d6fb94d30316a66423577a
MISC metadata.xml 272 SHA256 4d007409f67a06f02a0148ea00ef1f0ce92b9025bcce073ec492c6c370476826 SHA512 01e4d83e346f72d1416eacddae22d86446707c2abdc5bd76fd3eca6028891dc43f448844cc4ebfef87bd6a962b8a5e4af7207a0af7927b086dd83021766a4721 WHIRLPOOL f366b39fbe28c1f4c85a4600d6f8d0ddf305a7f58d65c0fddf8be113c1bb9367fdf0f184922b99cd195aab973d42935e38501f907e8daa1b214620022208c874
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iEYEAREIAAYFAlHzpaQACgkQkKaRLQcq0GLMzwCgo/AdJaj+GOlvjhf0F2QyHgfV
-TFQAnRgtRqXTqwxdglNcR9xOD9Xdfgpa
-=a6PF
+iEYEAREIAAYFAlIQ6SUACgkQkKaRLQcq0GJuCwCeJiu/bennGII7uQN6E8L46+9x
+4BUAn1eHuZrhtg6UCuBfhhaqlcVV25pg
+=1NEl
-----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc_compat.patch b/x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc_compat.patch
index 5cdc525..ec294a0 100644
--- a/x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc_compat.patch
+++ b/x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc_compat.patch
@@ -1,111 +1,6 @@
-diff -Nru xf86-video-armsoc-9999.orig/src/compat-api.h xf86-video-armsoc-9999/src/compat-api.h
---- xf86-video-armsoc-9999.orig/src/compat-api.h 1970-01-01 01:00:00.000000000 +0100
-+++ xf86-video-armsoc-9999/src/compat-api.h 2013-03-13 20:24:17.465046225 +0100
-@@ -0,0 +1,101 @@
-+/*
-+ * Copyright 2012 Red Hat, Inc.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ *
-+ * Author: Dave Airlie <airlied@redhat.com>
-+ */
-+
-+/* this file provides API compat between server post 1.13 and pre it,
-+ it should be reused inside as many drivers as possible */
-+#ifndef COMPAT_API_H
-+#define COMPAT_API_H
-+
-+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
-+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
-+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
-+#endif
-+
-+#ifndef XF86_HAS_SCRN_CONV
-+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
-+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
-+#endif
-+
-+#ifndef XF86_SCRN_INTERFACE
-+
-+#define SCRN_ARG_TYPE int
-+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
-+
-+#define SCREEN_ARG_TYPE int
-+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
-+
-+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
-+
-+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
-+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
-+
-+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
-+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
-+
-+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
-+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
-+
-+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
-+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
-+
-+#define FREE_SCREEN_ARGS_DECL int arg, int flags
-+#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0
-+
-+#define VT_FUNC_ARGS_DECL int arg, int flags
-+#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags)
-+
-+#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
-+#else
-+#define SCRN_ARG_TYPE ScrnInfoPtr
-+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
-+
-+#define SCREEN_ARG_TYPE ScreenPtr
-+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
-+
-+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
-+
-+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
-+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
-+
-+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
-+#define CLOSE_SCREEN_ARGS pScreen
-+
-+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
-+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
-+
-+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
-+#define SWITCH_MODE_ARGS(arg, m) arg, m
-+
-+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
-+#define FREE_SCREEN_ARGS(x) (x)
-+
-+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
-+#define VT_FUNC_ARGS(flags) pScrn
-+
-+#define XF86_ENABLEDISABLEFB_ARG(x) (x)
-+
-+#endif
-+
-+#endif
-diff -Nru xf86-video-armsoc-9999.orig/src/drmmode_display.c xf86-video-armsoc-9999/src/drmmode_display.c
---- xf86-video-armsoc-9999.orig/src/drmmode_display.c 2013-03-13 20:17:55.875045541 +0100
-+++ xf86-video-armsoc-9999/src/drmmode_display.c 2013-03-13 20:55:19.385046528 +0100
+diff -ru xf86-video-armsoc-9999.orig/src/drmmode_display.c xf86-video-armsoc-9999/src/drmmode_display.c
+--- xf86-video-armsoc-9999.orig/src/drmmode_display.c 2013-08-18 17:14:53.969483312 +0200
++++ xf86-video-armsoc-9999/src/drmmode_display.c 2013-08-18 17:17:55.964483402 +0200
@@ -59,7 +59,6 @@
#include "mipointer.h"
@@ -114,7 +9,7 @@ diff -Nru xf86-video-armsoc-9999.orig/src/drmmode_display.c xf86-video-armsoc-99
#include "micmap.h"
-@@ -1524,7 +1523,6 @@
+@@ -1540,7 +1539,6 @@
TRACE_ENTER();
@@ -122,65 +17,10 @@ diff -Nru xf86-video-armsoc-9999.orig/src/drmmode_display.c xf86-video-armsoc-99
drmmode = calloc(1, sizeof *drmmode);
drmmode->fd = fd;
-@@ -1564,7 +1562,7 @@
- }
-
- void
--drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y, int flags)
-+drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y)
- {
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- xf86OutputPtr output = config->output[config->compat_output];
-diff -Nru xf86-video-armsoc-9999.orig/src/omap_driver.c xf86-video-armsoc-9999/src/omap_driver.c
---- xf86-video-armsoc-9999.orig/src/omap_driver.c 2013-03-13 20:17:55.875045541 +0100
-+++ xf86-video-armsoc-9999/src/omap_driver.c 2013-03-13 21:23:07.335047492 +0100
-@@ -37,6 +37,8 @@
-
- #include "omap_driver.h"
-
-+#include "compat-api.h"
-+
-
- Bool omapDebug = 0;
-
-@@ -47,19 +49,17 @@
- static void OMAPIdentify(int flags);
- static Bool OMAPProbe(DriverPtr drv, int flags);
- static Bool OMAPPreInit(ScrnInfoPtr pScrn, int flags);
--static Bool OMAPScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
-- char **argv);
-+static Bool OMAPScreenInit(SCREEN_INIT_ARGS_DECL);
- static void OMAPLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
- LOCO * colors, VisualPtr pVisual);
--static Bool OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen);
-+static Bool OMAPCloseScreen(CLOSE_SCREEN_ARGS_DECL);
- static Bool OMAPCreateScreenResources(ScreenPtr pScreen);
--static void OMAPBlockHandler(int i, pointer blockData, pointer pTimeout,
-- pointer pReadmask);
--static Bool OMAPSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
--static void OMAPAdjustFrame(int scrnIndex, int x, int y, int flags);
--static Bool OMAPEnterVT(int scrnIndex, int flags);
--static void OMAPLeaveVT(int scrnIndex, int flags);
--static void OMAPFreeScreen(int scrnIndex, int flags);
-+static void OMAPBlockHandler(BLOCKHANDLER_ARGS_DECL);
-+static Bool OMAPSwitchMode(SWITCH_MODE_ARGS_DECL);
-+static void OMAPAdjustFrame(ADJUST_FRAME_ARGS_DECL);
-+static Bool OMAPEnterVT(VT_FUNC_ARGS_DECL);
-+static void OMAPLeaveVT(VT_FUNC_ARGS_DECL);
-+static void OMAPFreeScreen(FREE_SCREEN_ARGS_DECL);
-
-
-
-@@ -668,7 +668,7 @@
- * save state, initialize the mode, etc.
- */
- static Bool
--OMAPScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-+OMAPScreenInit(SCREEN_INIT_ARGS_DECL)
- {
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- OMAPPtr pOMAP = OMAPPTR(pScrn);
-@@ -762,7 +762,6 @@
+diff -ru xf86-video-armsoc-9999.orig/src/omap_driver.c xf86-video-armsoc-9999/src/omap_driver.c
+--- xf86-video-armsoc-9999.orig/src/omap_driver.c 2013-08-18 17:14:53.969483312 +0200
++++ xf86-video-armsoc-9999/src/omap_driver.c 2013-08-18 17:19:09.919483437 +0200
+@@ -760,7 +760,6 @@
OMAPAccelInit(pScreen);
/* Initialize backing store: */
@@ -188,144 +28,9 @@ diff -Nru xf86-video-armsoc-9999.orig/src/omap_driver.c xf86-video-armsoc-9999/s
xf86SetBackingStore(pScreen);
/* Cause the cursor position to be updated by the mouse signal handler: */
-@@ -786,7 +785,7 @@
- /* Take over the virtual terminal from the console, set the desired mode,
- * etc.:
- */
-- if (!OMAPEnterVT(scrnIndex, 0)) {
-+ if (!OMAPEnterVT(VT_FUNC_ARGS(0))) {
- ERROR_MSG("OMAPEnterVT() failed!");
- goto fail;
- }
-@@ -856,9 +855,9 @@
- * held by pScrn).
- */
- static Bool
--OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen)
-+OMAPCloseScreen(CLOSE_SCREEN_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- OMAPPtr pOMAP = OMAPPTR(pScrn);
-
- TRACE_ENTER();
-@@ -866,12 +865,12 @@
- drmmode_screen_fini(pScrn);
-
- if (pScrn->vtSema == TRUE) {
-- OMAPLeaveVT(scrnIndex, 0);
-+ OMAPLeaveVT(VT_FUNC_ARGS(0));
- }
-
- if (pOMAP->pOMAPEXA) {
- if (pOMAP->pOMAPEXA->CloseScreen) {
-- pOMAP->pOMAPEXA->CloseScreen(scrnIndex, pScreen);
-+ pOMAP->pOMAPEXA->CloseScreen(CLOSE_SCREEN_ARGS);
- }
- }
-
-@@ -893,7 +892,7 @@
-
- TRACE_EXIT();
-
-- return (*pScreen->CloseScreen)(scrnIndex, pScreen);
-+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
- }
-
-
-@@ -920,14 +919,14 @@
-
-
- static void
--OMAPBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
-+OMAPBlockHandler(BLOCKHANDLER_ARGS_DECL)
- {
-- ScreenPtr pScreen = screenInfo.screens[i];
-- ScrnInfoPtr pScrn = xf86Screens[i];
-+ SCREEN_PTR(arg);
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- OMAPPtr pOMAP = OMAPPTR(pScrn);
-
- swap(pOMAP, pScreen, BlockHandler);
-- (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
-+ (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
- swap(pOMAP, pScreen, BlockHandler);
-
- /* TODO OMAPVideoBlockHandler(), etc.. */
-@@ -940,9 +939,9 @@
- * Screen.
- */
- static Bool
--OMAPSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
-+OMAPSwitchMode(SWITCH_MODE_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+ SCRN_INFO_PTR(arg);
- return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
- }
-
-@@ -954,10 +953,10 @@
- * buffer within the "viewport" of the monitor.
- */
- static void
--OMAPAdjustFrame(int scrnIndex, int x, int y, int flags)
-+OMAPAdjustFrame(ADJUST_FRAME_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-- drmmode_adjust_frame(pScrn, x, y, flags);
-+ SCRN_INFO_PTR(arg);
-+ drmmode_adjust_frame(pScrn, x, y);
- }
-
-
-@@ -969,9 +968,9 @@
- * HW state as needed by the X server.
- */
- static Bool
--OMAPEnterVT(int scrnIndex, int flags)
-+OMAPEnterVT(VT_FUNC_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+ SCRN_INFO_PTR(arg);
- OMAPPtr pOMAP = OMAPPTR(pScrn);
- int i, ret;
-
-@@ -1005,9 +1004,9 @@
- * need to restore the console's HW state.
- */
- static void
--OMAPLeaveVT(int scrnIndex, int flags)
-+OMAPLeaveVT(VT_FUNC_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+ SCRN_INFO_PTR(arg);
- OMAPPtr pOMAP = OMAPPTR(pScrn);
- int i, ret;
-
-@@ -1034,9 +1033,9 @@
- * up-to-and-including an unsuccessful ScreenInit() call.
- */
- static void
--OMAPFreeScreen(int scrnIndex, int flags)
-+OMAPFreeScreen(FREE_SCREEN_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+ SCRN_INFO_PTR(arg);
- OMAPPtr pOMAP = OMAPPTR(pScrn);
-
- TRACE_ENTER();
-@@ -1048,7 +1047,7 @@
-
- if (pOMAP->pOMAPEXA) {
- if (pOMAP->pOMAPEXA->FreeScreen) {
-- pOMAP->pOMAPEXA->FreeScreen(scrnIndex, flags);
-+ pOMAP->pOMAPEXA->FreeScreen(FREE_SCREEN_ARGS(pScrn));
- }
- free(pOMAP->pOMAPEXA);
- }
-diff -Nru xf86-video-armsoc-9999.orig/src/omap_driver.h xf86-video-armsoc-9999/src/omap_driver.h
---- xf86-video-armsoc-9999.orig/src/omap_driver.h 2013-03-13 20:17:55.875045541 +0100
-+++ xf86-video-armsoc-9999/src/omap_driver.h 2013-03-13 21:03:22.575046705 +0100
+diff -ru xf86-video-armsoc-9999.orig/src/omap_driver.h xf86-video-armsoc-9999/src/omap_driver.h
+--- xf86-video-armsoc-9999.orig/src/omap_driver.h 2013-08-18 17:14:53.969483312 +0200
++++ xf86-video-armsoc-9999/src/omap_driver.h 2013-08-18 17:16:03.169483346 +0200
@@ -40,7 +40,6 @@
* XXX - figure out what can be removed..
*/
@@ -334,61 +39,3 @@ diff -Nru xf86-video-armsoc-9999.orig/src/omap_driver.h xf86-video-armsoc-9999/s
#include "micmap.h"
#include "colormapst.h"
#include "xf86cmap.h"
-@@ -240,7 +239,7 @@
- Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
- void drmmode_screen_init(ScrnInfoPtr pScrn);
- void drmmode_screen_fini(ScrnInfoPtr pScrn);
--void drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y, int flags);
-+void drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y);
- int drmmode_page_flip(DrawablePtr draw, uint32_t fb_id, void *priv,
- int* num_flipped);
- void drmmode_wait_for_event(ScrnInfoPtr pScrn);
-diff -Nru xf86-video-armsoc-9999.orig/src/omap_exa.h xf86-video-armsoc-9999/src/omap_exa.h
---- xf86-video-armsoc-9999.orig/src/omap_exa.h 2013-03-13 20:17:55.875045541 +0100
-+++ xf86-video-armsoc-9999/src/omap_exa.h 2013-03-13 20:41:08.060045938 +0100
-@@ -36,6 +36,7 @@
- #include "omap_drmif_fb.h"
- #include "omap_util.h"
- #include "exa.h"
-+#include "compat-api.h"
-
- /**
- * A per-Screen structure used to communicate and coordinate between the OMAP X
-@@ -50,14 +51,14 @@
- * generation to free per-Screen data structures (except those held by
- * pScrn).
- */
-- Bool (*CloseScreen)(int scrnIndex, ScreenPtr pScreen);
-+ Bool (*CloseScreen)(CLOSE_SCREEN_ARGS_DECL);
-
- /**
- * Called by X driver's FreeScreen() function at the end of each server
- * lifetime to free per-ScrnInfoRec data structures, to close any external
- * connections (e.g. with PVR2D, DRM), etc.
- */
-- void (*FreeScreen)(int scrnIndex, int flags);
-+ void (*FreeScreen)(FREE_SCREEN_ARGS_DECL);
-
- /** get formats supported by PutTextureImage() (for dri2 video..) */
- #define MAX_FORMATS 16
-diff -Nru xf86-video-armsoc-9999.orig/src/omap_exa_null.c xf86-video-armsoc-9999/src/omap_exa_null.c
---- xf86-video-armsoc-9999.orig/src/omap_exa_null.c 2013-03-13 20:17:55.875045541 +0100
-+++ xf86-video-armsoc-9999/src/omap_exa_null.c 2013-03-13 20:41:57.880046345 +0100
-@@ -77,7 +77,7 @@
- }
-
- static Bool
--CloseScreen(int scrnIndex, ScreenPtr pScreen)
-+CloseScreen(CLOSE_SCREEN_ARGS_DECL)
- {
- #if 0 // TODO need to change CloseScreen/FreeScreen ..
- exaDriverFini(pScreen);
-@@ -87,7 +87,7 @@
- }
-
- static void
--FreeScreen(int scrnIndex, int flags)
-+FreeScreen(FREE_SCREEN_ARGS_DECL)
- {
- }
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/maekke:master commit in: x11-drivers/xf86-video-armsoc/files/, x11-drivers/xf86-video-armsoc/
@ 2015-10-11 10:15 Markus Meier
0 siblings, 0 replies; 4+ messages in thread
From: Markus Meier @ 2015-10-11 10:15 UTC (permalink / raw
To: gentoo-commits
commit: 13977a7eef23a0169dec7da588260ff8d058afa1
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 10:15:19 2015 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 10:15:19 2015 +0000
URL: https://gitweb.gentoo.org/dev/maekke.git/commit/?id=13977a7e
x11-drivers/xf86-video-armsoc: fix build issue with xorg includes
Signed-off-by: Markus Meier <maekke <AT> gentoo.org>
x11-drivers/xf86-video-armsoc/Manifest | 3 ++-
.../xf86-video-armsoc_xorg-server-includes.patch | 22 ++++++++++++++++++++++
.../xf86-video-armsoc-9999.ebuild | 1 +
3 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/x11-drivers/xf86-video-armsoc/Manifest b/x11-drivers/xf86-video-armsoc/Manifest
index 88f12c7..96e3013 100644
--- a/x11-drivers/xf86-video-armsoc/Manifest
+++ b/x11-drivers/xf86-video-armsoc/Manifest
@@ -1,3 +1,4 @@
AUX xf86-video-armsoc_compat.patch 1503 SHA256 e4bb1a6389fd886118954854365c239074485fb12c384ac6fd0d91fc5e57a607 SHA512 d5b1148ce69391130a45615e213f3be0db39c5dd8acde90e4374832ce2ed6be927d8dd10d0d70b6ffd30df62d7c56ab484689a91298ef17bf8057b6ff3709330 WHIRLPOOL 50a883674b29e1ef40c5cfeb09f1777014903434918a5cf3d1515e751cb1938dbdef05320248fea2a97233aa3ae990e2472e4d71e574a2d227e276f9481b441a
-EBUILD xf86-video-armsoc-9999.ebuild 716 SHA256 80b6b34180371d8bc72aa7dc08800b30369e9e2f969dfe26093b6a7677791873 SHA512 a521f747d7594c6273b82c23a2fceb5d87f5131b60c3ed4f8cebc48c5fc622e20d04ccc827b60a30a5b93f5f30659ed1ad2c1e6c500f197c0e17ff0c7e90de97 WHIRLPOOL 350b38b73dbb57fd836fb362b438dde442c5c3b49cf78d35b5d6035283a69dc9fb086979e2f53bae395b626b73934467440612d870e4591a632cc700bf20a0ce
+AUX xf86-video-armsoc_xorg-server-includes.patch 839 SHA256 1fa268c3e8dcf22b456f1926712609422a46df9a3982f51926ef40b7dad1f299 SHA512 cc051a1a020cf3d345ea4efed827343d842a40b478902e24fa39f1b68db86c3ce31b6ffa5b3f94d6eb4e6233b553615b94fdbda46d87cddbd3fa08cb94d0bdd5 WHIRLPOOL 1ac50185d2e95ccff876dc1c79931b2ad01616b6c70ef039667cd027cac0640eb15034533d5661141e07556d4437266c701588d58a824f0e4419fd470112487a
+EBUILD xf86-video-armsoc-9999.ebuild 764 SHA256 69f149e08389e2410898e75f8e85da9640c0294adebba057c45f22da2695c53c SHA512 3c7ab4b8e44c57a6795346bf7904d801ffd3ac8ede2c3323e00a372fb156c9ec109a17f32b797aca0c7733ed897144b99b88001dd4f538ad6eaf420b02000c9e WHIRLPOOL 077ce3097af2984d77e4376c0818f9ddcad6a91f955ed001eb76afc42a7fd12df86ec5c820c63607193b9a45c0d8c836e6023e2876e3c4619ef82ffa1cff69e0
MISC metadata.xml 272 SHA256 4d007409f67a06f02a0148ea00ef1f0ce92b9025bcce073ec492c6c370476826 SHA512 01e4d83e346f72d1416eacddae22d86446707c2abdc5bd76fd3eca6028891dc43f448844cc4ebfef87bd6a962b8a5e4af7207a0af7927b086dd83021766a4721 WHIRLPOOL f366b39fbe28c1f4c85a4600d6f8d0ddf305a7f58d65c0fddf8be113c1bb9367fdf0f184922b99cd195aab973d42935e38501f907e8daa1b214620022208c874
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
new file mode 100644
index 0000000..82ef615
--- /dev/null
+++ b/x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc_xorg-server-includes.patch
@@ -0,0 +1,22 @@
+diff -ru xf86-video-armsoc-9999.orig/src/bo_exynos.c xf86-video-armsoc-9999/src/bo_exynos.c
+--- xf86-video-armsoc-9999.orig/src/bo_exynos.c 2015-10-11 11:40:12.343087923 +0200
++++ xf86-video-armsoc-9999/src/bo_exynos.c 2015-10-11 11:51:24.233088004 +0200
+@@ -24,6 +24,7 @@
+ #include <sys/mman.h>
+ #include <assert.h>
+ #include <errno.h>
++#include <xorg-server.h>
+ #include <xf86.h>
+ #include <xf86drm.h>
+ #include <xf86drmMode.h>
+diff -ru xf86-video-armsoc-9999.orig/src/omap_dumb.c xf86-video-armsoc-9999/src/omap_dumb.c
+--- xf86-video-armsoc-9999.orig/src/omap_dumb.c 2015-10-11 11:40:12.343087923 +0200
++++ xf86-video-armsoc-9999/src/omap_dumb.c 2015-10-11 11:45:36.983087962 +0200
+@@ -26,6 +26,7 @@
+ #include <assert.h>
+ #include <errno.h>
+
++#include <xorg-server.h>
+ #include <xf86.h>
+ #include <xf86drm.h>
+ #include <xf86drmMode.h>
diff --git a/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild b/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild
index 13a3bbb..f33b71d 100644
--- a/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild
+++ b/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999.ebuild
@@ -23,6 +23,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}_compat.patch
+ "${FILESDIR}"/${PN}_xorg-server-includes.patch
)
XORG_CONFIGURE_OPTIONS=(
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-10-11 10:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-02 17:19 [gentoo-commits] dev/maekke:master commit in: x11-drivers/xf86-video-armsoc/files/, x11-drivers/xf86-video-armsoc/ Markus Meier
-- strict thread matches above, loose matches on Subject: below --
2015-10-11 10:15 Markus Meier
2013-08-18 15:27 Markus Meier
2012-12-16 16:04 Markus Meier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox