[pkg-fso-commits] [xf86-video-glamo] 07/11: Fix FTBFS with X.org 1.14
Gilles Filippini
pini at alioth.debian.org
Mon Sep 23 13:23:30 UTC 2013
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch debian
in repository xf86-video-glamo.
commit 216ff641b08860b775cb4315be3317459ee43354
Author: Gilles Filippini <pini at debian.org>
Date: Mon Sep 23 14:55:01 2013 +0200
Fix FTBFS with X.org 1.14
---
debian/control | 2 +-
debian/patches/series | 1 +
debian/patches/xorg-1.14.patch | 166 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 168 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index cc1a2e8..1a64398 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian freesmartphone.org Team <pkg-fso-maint at lists.alioth.debian.org>
Uploaders: Luca Capello <luca at pca.it>, Timo Jyrinki <timo at debian.org>, Gilles Filippini <pini at debian.org>
-Build-Depends: debhelper (>= 8), pkg-config, xserver-xorg-dev (>= 2:1.9.4), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev, dpkg-dev (>= 1.14.17), autoconf, automake, libtool, xutils-dev, dh-autoreconf, libdrm-dev
+Build-Depends: debhelper (>= 8), pkg-config, xserver-xorg-dev (>= 2:1.14), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev, dpkg-dev (>= 1.14.17), autoconf, automake, libtool, xutils-dev, dh-autoreconf, libdrm-dev
Standards-Version: 3.9.2
Homepage: http://wiki.openmoko.org/wiki/Smedia_Glamo_3362
Vcs-Git: http://git.debian.org/git/pkg-fso/xf86-video-glamo.git
diff --git a/debian/patches/series b/debian/patches/series
index 503570f..600d372 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
03-force-kms-off-v2.patch
ftbfs-gcc-4.7.diff
+xorg-1.14.patch
diff --git a/debian/patches/xorg-1.14.patch b/debian/patches/xorg-1.14.patch
new file mode 100644
index 0000000..d7c5307
--- /dev/null
+++ b/debian/patches/xorg-1.14.patch
@@ -0,0 +1,166 @@
+Description: Fix FTBFS with X.org 1.14
+Index: xf86-video-glamo-0.0.0+20110719.gitcb9ed170/src/glamo-driver.c
+===================================================================
+--- xf86-video-glamo-0.0.0+20110719.gitcb9ed170.orig/src/glamo-driver.c 2011-07-19 22:01:18.000000000 +0000
++++ xf86-video-glamo-0.0.0+20110719.gitcb9ed170/src/glamo-driver.c 2013-09-23 12:09:39.000000000 +0000
+@@ -14,7 +14,6 @@
+ #include "xf86_OSproc.h"
+
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "micmap.h"
+ #include "colormapst.h"
+ #include "xf86cmap.h"
+@@ -68,10 +67,10 @@
+ GlamoPreInit(ScrnInfoPtr pScrn, int flags);
+
+ static Bool
+-GlamoScreenInit(int Index, ScreenPtr pScreen, int argc, char **argv);
++GlamoScreenInit(ScreenPtr pScreen, int argc, char **argv);
+
+ static Bool
+-GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen);
++GlamoCloseScreen(ScreenPtr pScreen);
+
+ static Bool
+ GlamoCrtcResize(ScrnInfoPtr scrn, int width, int height);
+@@ -86,10 +85,10 @@
+ GlamoRestoreHW(ScrnInfoPtr pScren);
+
+ static Bool
+-GlamoEnterVT(int scrnIndex, int flags);
++GlamoEnterVT(ScrnInfoPtr pScrn);
+
+ static void
+-GlamoLeaveVT(int scrnIndex, int flags);
++GlamoLeaveVT(ScrnInfoPtr pScrn);
+
+ static void
+ GlamoLoadColormap(ScrnInfoPtr pScrn, int numColors, int *indices,
+@@ -248,8 +247,7 @@
+ }
+
+ static Bool
+-GlamoSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++GlamoSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode) {
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (pScrn);
+ xf86OutputPtr output = config->output[config->compat_output];
+ Rotation rotation;
+@@ -523,7 +521,7 @@
+
+
+ static Bool
+-GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
++GlamoScreenInit(ScreenPtr pScreen, int argc, char **argv)
+ {
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ GlamoPtr pGlamo = GlamoPTR(pScrn);
+@@ -545,7 +543,7 @@
+ #endif
+
+ if (NULL == (pGlamo->fbmem = fbdevHWMapVidmem(pScrn))) {
+- xf86DrvMsg(scrnIndex, X_ERROR, "mapping of video memory failed\n");
++ xf86DrvMsg(pScreen->myNum, X_ERROR, "mapping of video memory failed\n");
+ return FALSE;
+ }
+
+@@ -556,13 +554,13 @@
+ /* mi layer */
+ miClearVisualTypes();
+ if (!miSetVisualTypes(pScrn->depth, TrueColorMask, pScrn->rgbBits, TrueColor)) {
+- xf86DrvMsg(scrnIndex, X_ERROR,
++ xf86DrvMsg(pScreen->myNum, X_ERROR,
+ "visual type setup failed for %d bits per pixel [1]\n",
+ pScrn->bitsPerPixel);
+ return FALSE;
+ }
+ if (!miSetPixmapDepths()) {
+- xf86DrvMsg(scrnIndex, X_ERROR, "pixmap depth setup failed\n");
++ xf86DrvMsg(pScreen->myNum, X_ERROR, "pixmap depth setup failed\n");
+ return FALSE;
+ }
+
+@@ -592,7 +590,7 @@
+
+ /* must be after RGB ordering fixed */
+ if (!fbPictureInit(pScreen, NULL, 0))
+- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
++ xf86DrvMsg(pScrn->pScreen->myNum, X_WARNING,
+ "Render extension initialisation failed\n");
+
+ pGlamo->pScreen = pScreen;
+@@ -603,7 +601,7 @@
+ xf86LoadSubModule(pScrn, "exa");
+
+ if (!GLAMODrawInit(pScrn, mem_start, mem_size)) {
+- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++ xf86DrvMsg(pScrn->pScreen->myNum, X_ERROR,
+ "EXA hardware acceleration initialization failed\n");
+ } else {
+ pGlamo->accel = TRUE;
+@@ -611,13 +609,12 @@
+ }
+
+ xf86SetBlackWhitePixels(pScreen);
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+
+ /* software cursor */
+ miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
+
+- GlamoEnterVT(scrnIndex, 0);
++ GlamoEnterVT(pScrn);
+
+ xf86CrtcScreenInit(pScreen);
+ #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,5,0,0,0)
+@@ -627,7 +624,7 @@
+ /* colormap */
+ pGlamo->colormap = NULL;
+ if (!miCreateDefColormap(pScreen)) {
+- xf86DrvMsg(scrnIndex, X_ERROR,
++ xf86DrvMsg(pScreen->myNum, X_ERROR,
+ "internal error: miCreateDefColormap failed "
+ "in GlamoScreenInit()\n");
+ return FALSE;
+@@ -652,9 +649,9 @@
+ }
+
+ static Bool
+-GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen)
++GlamoCloseScreen(ScreenPtr pScreen)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ GlamoPtr pGlamo = GlamoPTR(pScrn);
+
+ if (pGlamo->accel)
+@@ -675,7 +672,7 @@
+
+ pScreen->CreateScreenResources = pGlamo->CreateScreenResources;
+ pScreen->CloseScreen = pGlamo->CloseScreen;
+- return (*pScreen->CloseScreen)(scrnIndex, pScreen);
++ return (*pScreen->CloseScreen)(pScreen);
+ }
+
+ static Bool
+@@ -826,8 +823,7 @@
+ }
+
+ static Bool
+-GlamoEnterVT(int scrnIndex, int flags) {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++GlamoEnterVT(ScrnInfoPtr pScrn) {
+ GlamoPtr pGlamo = GlamoPTR(pScrn);
+
+ GlamoSaveHW(pScrn);
+@@ -842,8 +838,7 @@
+ }
+
+ static void
+-GlamoLeaveVT(int scrnIndex, int flags) {
+- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++GlamoLeaveVT(ScrnInfoPtr pScrn) {
+ GlamoPtr pGlamo = GlamoPTR(pScrn);
+
+ if (pGlamo->accel)
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-fso/xf86-video-glamo.git
More information about the pkg-fso-commits
mailing list