From: "Markus Meier" <maekke@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/maekke:master commit in: x11-drivers/xf86-video-armsoc/files/, x11-drivers/xf86-video-armsoc/
Date: Thu, 2 May 2013 17:19:28 +0000 (UTC) [thread overview]
Message-ID: <1367515483.ece81a3c8af1202998d93b87a050486e5b8692ab.maekke@gentoo> (raw)
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" )
next reply other threads:[~2013-05-02 17:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-02 17:19 Markus Meier [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-10-11 10:15 [gentoo-commits] dev/maekke:master commit in: x11-drivers/xf86-video-armsoc/files/, x11-drivers/xf86-video-armsoc/ Markus Meier
2013-08-18 15:27 Markus Meier
2012-12-16 16:04 Markus Meier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1367515483.ece81a3c8af1202998d93b87a050486e5b8692ab.maekke@gentoo \
--to=maekke@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox