ChangeLog | 326 ++++++++++++++
configure.ac | 57 +-
debian/README.source | 24 -
debian/changelog | 28 +
debian/compat | 2
debian/control | 20
debian/patches/02_debian_prune_nonfree.diff | 14
debian/rules | 100 ----
debian/watch | 1
debian/xsfbs/xsfbs.mk | 285 ------------
debian/xsfbs/xsfbs.sh | 622 ----------------------------
man/Makefile.am | 22
man/rendition.man | 1
src/Makefile.am | 5
src/accelX.c | 16
src/compat-api.h | 99 ++++
src/hwcursor.c | 4
src/hwcursor.h | 2
src/rendition.c | 127 ++---
src/rendition.h | 3
src/rendition_shadow.c | 6
src/rendition_shadow.h | 2
src/v1krisc.c | 62 +-
src/vboard.c | 4
src/vgafont-std.data | 1
src/vgafont-vrx.data | 1
src/vgapalette.data | 1
src/vloaduc.c | 12
src/vmodes.c | 11
src/vos.h | 12
src/vramdac.c | 36 -
src/vtypes.h | 9
32 files changed, 664 insertions(+), 1251 deletions(-)
New commits:
commit 5d4568d1c9b8ff8b374238f0177d0be4618c5b50
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Wed Jul 18 13:28:40 2012 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index e4f078e..ae9c00d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-rendition (1:4.2.5-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Maarten Lankhorst <maarten.lankho...@canonical.com> Wed, 18 Jul 2012
13:27:01 +0200
+
xserver-xorg-video-rendition (1:4.2.4-3) unstable; urgency=low
* Merge from upstream master branch up to 7b26793ba2 to cope with
commit a829c5a2c5583c36c86c3c7db1063ac5ea6f6e1d
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Wed Jul 18 13:27:37 2012 +0200
Bump changelog
diff --git a/ChangeLog b/ChangeLog
index ac6c38d..b80edc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+commit 07026400300a985ea19346a6745685bb8dfea56f
+Author: Dave Airlie <airl...@redhat.com>
+Date: Tue Jul 17 16:05:09 2012 +1000
+
+ xf86-video-rendition: bump to version 4.2.5
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit dcba90a3398321b2e24a5db54defa516efa4c817
+Author: Dave Airlie <airl...@redhat.com>
+Date: Tue Jul 17 15:32:56 2012 +1000
+
+ rendition: fix build against older X servers.
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit 23a14278543eaa1cd37709eb8ccad2ab2babc81b
+Author: Dave Airlie <airl...@redhat.com>
+Date: Mon Jul 16 03:44:40 2012 +0100
+
+ rendition: port to non-XAA server
+
+ even though rendition never actually had working XAA support, ah well.
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit effa2938ee2b576b8eb6cd7f774d8b1656c50e82
+Author: Dave Airlie <airl...@redhat.com>
+Date: Wed Jun 6 14:13:48 2012 +0100
+
+ rendition: port to new compat API.
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
commit 7b26793ba2572c412f03e9a4acf83237fbec71bd
Author: Adam Jackson <a...@redhat.com>
Date: Mon Dec 19 17:13:29 2011 -0500
commit 07026400300a985ea19346a6745685bb8dfea56f
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 17 16:05:09 2012 +1000
xf86-video-rendition: bump to version 4.2.5
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/configure.ac b/configure.ac
index eecfd16..4adf280 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-rendition],
- [4.2.4],
+ [4.2.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-rendition])
AC_CONFIG_SRCDIR([Makefile.am])
commit dcba90a3398321b2e24a5db54defa516efa4c817
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 17 15:32:56 2012 +1000
rendition: fix build against older X servers.
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/src/rendition.c b/src/rendition.c
index 5fa5eca..7c74f76 100644
--- a/src/rendition.c
+++ b/src/rendition.c
@@ -1075,6 +1075,7 @@ renditionScreenInit(SCREEN_INIT_ARGS_DECL)
VisualPtr visual;
vgaHWPtr pvgaHW;
int displayWidth,width,height;
+ int scrnIndex = pScreenInfo->scrnIndex;
#ifdef DEBUG
ErrorF("RENDITION: renditionScreenInit() called\n");
commit 23a14278543eaa1cd37709eb8ccad2ab2babc81b
Author: Dave Airlie <airl...@redhat.com>
Date: Mon Jul 16 03:44:40 2012 +0100
rendition: port to non-XAA server
even though rendition never actually had working XAA support, ah well.
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/configure.ac b/configure.ac
index f74b912..eecfd16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,24 @@ AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have
1bpp support])],[])
AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
CPPFLAGS="$SAVE_CPPFLAGS"
+AC_ARG_ENABLE(xaa,
+ AS_HELP_STRING([--enable-xaa],
+ [Enable legacy X Acceleration Architecture (XAA)
[default=auto]]),
+ [XAA="$enableval"],
+ [XAA=auto])
+if test "x$XAA" != xno; then
+ save_CFLAGS=$CFLAGS
+ save_CPPFLAGS=$CPPFLAGS
+ CFLAGS=$XORG_CFLAGS
+ CPPFLAGS="$XORG_CFLAGS"
+ AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no)
+ CFLAGS=$save_CFLAGS
+ CPPFLAGS=$save_CPPFLAGS
+fi
+AC_MSG_CHECKING([whether to include XAA support])
+AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
+AC_MSG_RESULT([$XAA])
+
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
diff --git a/src/rendition.h b/src/rendition.h
index 7d104a8..f7f13d4 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -53,8 +53,10 @@
#include "fb.h"
/* Drivers using the XAA interface ... */
+#ifdef HAVE_XAA_H
#include "xaa.h"
#include "xaalocal.h"
+#endif
#include "xf86fbman.h"
/* HW-cursor definitions */
diff --git a/src/vtypes.h b/src/vtypes.h
index 5e0abf1..b221aa3 100644
--- a/src/vtypes.h
+++ b/src/vtypes.h
@@ -185,7 +185,9 @@ typedef struct _renditionRec
EntityInfoPtr pEnt; /* entity information */
CloseScreenProcPtr CloseScreen; /* wrap CloseScreen */
xf86CursorInfoPtr CursorInfoRec; /* Cursor data */
+#ifdef HAVE_XAA_H
XAAInfoRecPtr AccelInfoRec; /* Needed for XAA */
+#endif
OptionInfoPtr Options;
RenditionRegRec saveRegs;
} renditionRec, *renditionPtr;
commit effa2938ee2b576b8eb6cd7f774d8b1656c50e82
Author: Dave Airlie <airl...@redhat.com>
Date: Wed Jun 6 14:13:48 2012 +0100
rendition: port to new compat API.
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index 6770629..0666377 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,6 +31,7 @@ rendition_drv_ladir = @moduledir@/drivers
rendition_drv_la_SOURCES = \
cmd2d.h \
commonregs.h \
+ compat-api.h \
cscode.h \
hwcursor.c \
hwcursor.h \
diff --git a/src/accelX.c b/src/accelX.c
index ed4964e..bd237b3 100644
--- a/src/accelX.c
+++ b/src/accelX.c
@@ -133,7 +133,7 @@ RENDITIONAccelPreInit(ScrnInfoPtr pScreenInfo)
void
RENDITIONAccelXAAInit(ScreenPtr pScreen)
{
- ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen);
renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
XAAInfoRecPtr pXAAinfo;
diff --git a/src/compat-api.h b/src/compat-api.h
new file mode 100644
index 0000000..e4f03d2
--- /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 <airl...@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 pScreenInfo = 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 VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS pScreenInfo->scrnIndex, 0
+
+#define XF86_SCRN_ARG(x) ((x)->scrnIndex)
+#else
+#define SCRN_ARG_TYPE ScrnInfoPtr
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScreenInfo = (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 VT_FUNC_ARGS_DECL ScrnInfoPtr arg
+#define VT_FUNC_ARGS pScreenInfo
+
+#define XF86_SCRN_ARG(x) (x)
+
+#endif
+
+#endif
diff --git a/src/hwcursor.c b/src/hwcursor.c
index c3b5ee8..609417a 100644
--- a/src/hwcursor.c
+++ b/src/hwcursor.c
@@ -75,9 +75,9 @@ RenditionHWCursorRelease (ScrnInfoPtr pScreenInfo)
Bool
-RenditionHWCursorInit(int scrnIndex, ScreenPtr pScreen)
+RenditionHWCursorInit(ScreenPtr pScreen)
{
- ScrnInfoPtr pScreenInfo = xf86Screens[scrnIndex];
+ ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen);
renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
xf86CursorInfoPtr infoPtr;
diff --git a/src/hwcursor.h b/src/hwcursor.h
index e0d742b..cfe24d3 100644
--- a/src/hwcursor.h
+++ b/src/hwcursor.h
@@ -10,7 +10,7 @@
*/
void RenditionHWCursorPreInit(ScrnInfoPtr pScreenInfo);
-Bool RenditionHWCursorInit(int scrnIndex, ScreenPtr pScreen);
+Bool RenditionHWCursorInit(ScreenPtr pScreen);
void RenditionHWCursorRelease (ScrnInfoPtr pScreenInfo);
#define HC_SIZE (64*64*2)/8 /* 1024 */
diff --git a/src/rendition.c b/src/rendition.c
index 8da5e13..5fa5eca 100644
--- a/src/rendition.c
+++ b/src/rendition.c
@@ -106,14 +106,14 @@ static Bool renditionPciProbe(DriverPtr drv, int
entity_num,
static Bool renditionProbe(DriverPtr, int);
#endif
static Bool renditionPreInit(ScrnInfoPtr, int);
-static Bool renditionScreenInit(int, ScreenPtr, int, char **);
-static Bool renditionSwitchMode(int, DisplayModePtr, int);
-static void renditionAdjustFrame(int, int, int, int);
-static Bool renditionEnterVT(int, int);
-static void renditionLeaveVT(int, int);
-static void renditionFreeScreen(int, int);
-
-static ModeStatus renditionValidMode(int, DisplayModePtr, Bool, int);
+static Bool renditionScreenInit(SCREEN_INIT_ARGS_DECL);
+static Bool renditionSwitchMode(SWITCH_MODE_ARGS_DECL);
+static void renditionAdjustFrame(ADJUST_FRAME_ARGS_DECL);
+static Bool renditionEnterVT(VT_FUNC_ARGS_DECL);
+static void renditionLeaveVT(VT_FUNC_ARGS_DECL);
+static void renditionFreeScreen(FREE_SCREEN_ARGS_DECL);
+
+static ModeStatus renditionValidMode(SCRN_ARG_TYPE, DisplayModePtr, Bool, int);
static Bool renditionMapMem(ScrnInfoPtr pScreenInfo);
static Bool renditionUnmapMem(ScrnInfoPtr pScreenInfo);
#if 0
@@ -1022,9 +1022,9 @@ renditionLeaveGraphics(ScrnInfoPtr pScreenInfo)
/* Unravel the screen */
static Bool
-renditionCloseScreen(int scrnIndex, ScreenPtr pScreen)
+renditionCloseScreen(CLOSE_SCREEN_ARGS_DECL)
{
- ScrnInfoPtr pScreenInfo = xf86Screens[scrnIndex];
+ ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen);
renditionPtr prenditionPriv=renditionGetRec(pScreenInfo);
Bool Closed = TRUE;
@@ -1044,7 +1044,7 @@ renditionCloseScreen(int scrnIndex, ScreenPtr pScreen)
if (prenditionPriv
&& (pScreen->CloseScreen = prenditionPriv->CloseScreen)) {
prenditionPriv->CloseScreen = NULL;
- Closed = (*pScreen->CloseScreen)(scrnIndex, pScreen);
+ Closed = (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
}
#ifdef DEBUG
@@ -1066,9 +1066,9 @@ renditionDPMSSet(ScrnInfoPtr pScreen, int mode, int flags)
}
static Bool
-renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+renditionScreenInit(SCREEN_INIT_ARGS_DECL)
{
- ScrnInfoPtr pScreenInfo = xf86Screens[scrnIndex];
+ ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen);
renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
Bool Inited = FALSE;
unsigned char *FBBase;
@@ -1109,8 +1109,8 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int
argc, char **argv)
/* blank the screen */
renditionSaveScreen(pScreen, SCREEN_SAVER_ON);
- (*pScreenInfo->AdjustFrame)(pScreenInfo->scrnIndex,
- pScreenInfo->frameX0, pScreenInfo->frameY0, 0);
+ (*pScreenInfo->AdjustFrame)(ADJUST_FRAME_ARGS(pScreenInfo,
+ pScreenInfo->frameX0,
pScreenInfo->frameY0));
miClearVisualTypes();
@@ -1186,7 +1186,7 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int
argc, char **argv)
if(!xf86ReturnOptValBool(pRendition->Options, OPTION_SW_CURSOR,0)&&
!pRendition->board.rotate){
/* Initialise HW cursor */
- if(!RenditionHWCursorInit(scrnIndex, pScreen)){
+ if(!RenditionHWCursorInit(pScreen)){
xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
"Hardware Cursor initalization failed!!\n");
}
@@ -1238,7 +1238,7 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int
argc, char **argv)
pScreen->SaveScreen = renditionSaveScreen;
if (!Inited)
- renditionCloseScreen(scrnIndex, pScreen);
+ renditionCloseScreen(CLOSE_SCREEN_ARGS);
if (serverGeneration == 1)
xf86ShowUnusedOptions(pScreenInfo->scrnIndex, pScreenInfo->options);
@@ -1251,19 +1251,20 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen,
int argc, char **argv)
}
static Bool
-renditionSwitchMode(int scrnIndex, DisplayModePtr pMode, int flags)
+renditionSwitchMode(SWITCH_MODE_ARGS_DECL)
{
+ SCRN_INFO_PTR(arg);
#ifdef DEBUG
ErrorF("RENDITION: renditionSwitchMode() called\n");
#endif
- return renditionSetMode(xf86Screens[scrnIndex], pMode);
+ return renditionSetMode(pScreenInfo, mode);
}
static void
-renditionAdjustFrame(int scrnIndex, int x, int y, int flags)
+renditionAdjustFrame(ADJUST_FRAME_ARGS_DECL)
{
- ScrnInfoPtr pScreenInfo=xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
int offset, virtualwidth, bitsPerPixel;
@@ -1285,9 +1286,9 @@ renditionAdjustFrame(int scrnIndex, int x, int y, int
flags)
static Bool
-renditionEnterVT(int scrnIndex, int flags)
+renditionEnterVT(VT_FUNC_ARGS_DECL)
{
- ScrnInfoPtr pScreenInfo = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
vgaHWPtr pvgaHW = VGAHWPTR(pScreenInfo);
#ifdef DEBUG
@@ -1304,32 +1305,34 @@ renditionEnterVT(int scrnIndex, int flags)
if (!renditionSetMode(pScreenInfo, pScreenInfo->currentMode))
return FALSE;
- (*pScreenInfo->AdjustFrame)(pScreenInfo->scrnIndex,
- pScreenInfo->frameX0, pScreenInfo->frameY0, 0);
+ (*pScreenInfo->AdjustFrame)(ADJUST_FRAME_ARGS(pScreenInfo,
+ pScreenInfo->frameX0,
pScreenInfo->frameY0));
return TRUE;
}
static void
-renditionLeaveVT(int scrnIndex, int flags)
+renditionLeaveVT(VT_FUNC_ARGS_DECL)
{
+ SCRN_INFO_PTR(arg);
#ifdef DEBUG
ErrorF("RENDITION: renditionLeaveVT() called\n");
#endif
- renditionLeaveGraphics(xf86Screens[scrnIndex]);
+ renditionLeaveGraphics(pScreenInfo);
}
static void
-renditionFreeScreen(int scrnIndex, int flags)
+renditionFreeScreen(FREE_SCREEN_ARGS_DECL)
{
- renditionFreeRec(xf86Screens[scrnIndex]);
+ SCRN_INFO_PTR(arg);
+ renditionFreeRec(pScreenInfo);
}
static ModeStatus
-renditionValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose,
+renditionValidMode(SCRN_ARG_TYPE arg, DisplayModePtr pMode, Bool Verbose,
int flags)
{
if (pMode->Flags & V_INTERLACE)
diff --git a/src/rendition.h b/src/rendition.h
index 0ea5cca..7d104a8 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -65,5 +65,6 @@
#include "commonregs.h"
+#include "compat-api.h"
/* end of __RENDITION_H__ */
#endif
diff --git a/src/rendition_shadow.c b/src/rendition_shadow.c
index 5f7a5f5..b5e4ef6 100644
--- a/src/rendition_shadow.c
+++ b/src/rendition_shadow.c
@@ -48,9 +48,9 @@ renditionRefreshArea(ScrnInfoPtr pScreenInfo, int num, BoxPtr
pbox)
}
void
-renditionPointerMoved(int index, int x, int y)
+renditionPointerMoved(SCRN_ARG_TYPE arg, int x, int y)
{
- ScrnInfoPtr pScreenInfo = xf86Screens[index];
+ SCRN_INFO_PTR(arg);
renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
int newX, newY;
@@ -62,7 +62,7 @@ renditionPointerMoved(int index, int x, int y)
newY = pScreenInfo->pScreen->width - x - 1;
}
- (*pRendition->board.PointerMoved)(index, newX, newY);
+ (*pRendition->board.PointerMoved)(arg, newX, newY);
}
void
diff --git a/src/rendition_shadow.h b/src/rendition_shadow.h
index 5d9634f..d4527a8 100644
--- a/src/rendition_shadow.h
+++ b/src/rendition_shadow.h
@@ -12,7 +12,7 @@ void renditionRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr
pbox);
void renditionRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
void renditionRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
void renditionRefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
-void renditionPointerMoved(int index, int x, int y);
+void renditionPointerMoved(SCRN_ARG_TYPE arg, int x, int y);
#endif
diff --git a/src/vmodes.c b/src/vmodes.c
index f2dae0b..ba91d1a 100644
--- a/src/vmodes.c
+++ b/src/vmodes.c
@@ -301,8 +301,8 @@ verite_setmode(ScrnInfoPtr pScreenInfo, struct
verite_modeinfo_t *mode)
pRendition->board.mode.virtualwidth=pRendition->board.mode.screenwidth;
pRendition->board.init=1;
- (*pScreenInfo->AdjustFrame)(pScreenInfo->scrnIndex,
- pScreenInfo->frameX0, pScreenInfo->frameY0, 0);
+ (*pScreenInfo->AdjustFrame)(ADJUST_FRAME_ARGS(pScreenInfo,
+ pScreenInfo->frameX0,
pScreenInfo->frameY0));
/* Need to fix up syncs */
diff --git a/src/vtypes.h b/src/vtypes.h
index 3a701f4..5e0abf1 100644
--- a/src/vtypes.h
+++ b/src/vtypes.h
@@ -161,7 +161,7 @@ struct verite_board_t {
Bool shadowfb; /* Use ShadowFB ? */
vu8 *shadowPtr;
vu32 shadowPitch;
- void (*PointerMoved)(int index, int x, int y);
+ void (*PointerMoved)(SCRN_ARG_TYPE arg, int x, int y);
int rotate; /* Rotate clockwise or counterclockwise */
commit b2ab500748762a6e1d2b71a488550aadfdd6312f
Author: Cyril Brulebois <k...@debian.org>
Date: Tue May 1 18:04:35 2012 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index d57f457..e4f078e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-rendition (1:4.2.4-3) UNRELEASED; urgency=low
+xserver-xorg-video-rendition (1:4.2.4-3) unstable; urgency=low
* Merge from upstream master branch up to 7b26793ba2 to cope with
the new vgaHW ABI, fixing the FTBFS against X server 1.12.
* Update patch accordingly: 02_debian_prune_nonfree.diff
- -- Cyril Brulebois <k...@debian.org> Tue, 01 May 2012 17:53:43 +0200
+ -- Cyril Brulebois <k...@debian.org> Tue, 01 May 2012 18:04:33 +0200
xserver-xorg-video-rendition (1:4.2.4-2) unstable; urgency=low
commit ec2d3323ae4b457d99bd49403900c877f070997f
Author: Cyril Brulebois <k...@debian.org>
Date: Tue May 1 18:02:00 2012 +0200
Update patch accordingly: 02_debian_prune_nonfree.diff
diff --git a/debian/changelog b/debian/changelog
index 88dffb1..d57f457 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-rendition (1:4.2.4-3) UNRELEASED; urgency=low
* Merge from upstream master branch up to 7b26793ba2 to cope with
the new vgaHW ABI, fixing the FTBFS against X server 1.12.
+ * Update patch accordingly: 02_debian_prune_nonfree.diff
-- Cyril Brulebois <k...@debian.org> Tue, 01 May 2012 17:53:43 +0200
diff --git a/debian/patches/02_debian_prune_nonfree.diff
b/debian/patches/02_debian_prune_nonfree.diff
index 577dd35..972279c 100644
--- a/debian/patches/02_debian_prune_nonfree.diff
+++ b/debian/patches/02_debian_prune_nonfree.diff
@@ -1,23 +1,21 @@
-$Id$
-
This patch handles the Makefile.am. Obviously an autoreconf is needed while
this is applied, but I'm shipping this as a patch so we can easily remember
it when changing upstream versions.
-Index: xf86-video-rendition-X11R7.0-4.0.1.3/src/Makefile.am
-===================================================================
---- xf86-video-rendition-X11R7.0-4.0.1.3.orig/src/Makefile.am 2006-01-12
22:55:08.000000000 -0500
-+++ xf86-video-rendition-X11R7.0-4.0.1.3/src/Makefile.am 2006-03-07
21:10:39.000000000 -0500
-@@ -59,12 +59,9 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -57,14 +57,11 @@
vtypes.h
driverdir = @moduledir@
-dist_driver_DATA = \
- v10002d.uc \
- v20002d.uc
-+dist_driver_DATA =
++dist_driver_DATA =
EXTRA_DIST = \
+ accel.h \
+ accelX.c \
- README.uc \
vgafont-std.data \
vgafont-vrx.data \
commit 71f653d40c47f2b7168ac17b7dff0064a7992372
Author: Cyril Brulebois <k...@debian.org>
Date: Tue May 1 17:54:27 2012 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 2c112c5..ac6c38d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,295 @@
+commit 7b26793ba2572c412f03e9a4acf83237fbec71bd
+Author: Adam Jackson <a...@redhat.com>
+Date: Mon Dec 19 17:13:29 2011 -0500
+
+ Fix for new vgahw ABI
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit b08572f7b60481eb3b7ab6058b74a56fd646d133
+Author: Adam Jackson <a...@redhat.com>
+Date: Mon Dec 19 17:11:45 2011 -0500
+
+ Unhook the pretense of XAA support
+
+ This has never shipped enabled in any Xorg release. I'm pretty sure the
+ same is true of XFree86 4.x releases.
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit 810c279e9106a96aa6c6d395610ade3cd1b61fba
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Wed Oct 19 00:31:41 2011 -0700
+
+ Include <unistd.h> for usleep
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 99d960880e3aedc35238e26841e13e12f317395d
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Wed Oct 19 00:31:05 2011 -0700
+
+ Build fix for ABI Version 12
+
+ ABI Version 12 removes support for multiple PCI domains. If you need to
+ use this driver on a system with more than one PCI domain, you should
+ either port this driver to using libpciaccess directly or stick with an
+ older server.
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit efcd0f31433ddbcf04ca040f8474f6cb8a080271
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Wed Oct 19 00:29:28 2011 -0700
+
+ Use unsigned long rather than deprecated IOADDRESS
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 11c189cd7b183561432736e4042f36c556de7a05
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Wed Oct 19 00:29:27 2011 -0700
+
+ Use malloc/calloc/realloc/free directly
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 541d11934b86873382e14ac3c42ad52044fb5412
+Author: Jesse Adkins <jesserayadk...@gmail.com>
+Date: Tue Sep 28 13:29:51 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadk...@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit e017b31636fa1dd952f6b7d32cacf9ddbd2884ba
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jul 21 16:49:04 2010 -0400
+
+ config: add comments for main statements
+
+commit 896ed2af07f113326e923b9b2c9a9069975444c0
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jul 21 16:07:00 2010 -0400
+
+ config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 30b6c93f9546c917ccc25c208efa46629e6a59b0
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jul 21 14:37:41 2010 -0400
+
+ config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 01701fbb98e8c9eb1a3212994993bf21d0ab08db
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jul 21 14:05:23 2010 -0400
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 7733285ce1fe060fd77cb3575acad895729930a0
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Jul 21 09:27:42 2010 -0400
+
+ config: complete AC_INIT m4 quoting
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit f4a705078774bdde74f0d4322c304e2d23883a1e
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Jul 20 21:44:58 2010 -0400
+
+ config: remove unrequired AC_SUBST([XORG_CFLAGS])
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 5da3af011abb82f8084b233f059bb9dc9e6eac14
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Jul 20 20:24:42 2010 -0400
+
+ config: remove unrequired AC_HEADER_STDC
+
+ Autoconf says:
+ "This macro is obsolescent, as current systems have conforming
+ header files. New programs need not use this macro".
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 658fee588cbbbb3cc204c8b4f05a7ae3be22f0a8
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Jul 20 19:41:31 2010 -0400
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 8065ec598bd0eb538aff41dd3912b0d0caf9c06e
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Jul 20 18:45:19 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit c76be66441dd76c7d130606774782132aff96f6c
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Jul 20 16:15:29 2010 -0400
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+commit 0bf606d19d9357ffc5ccffe90279453d39c259ac
+Author: Dave Airlie <airl...@redhat.com>
+Date: Mon Jul 5 14:56:30 2010 +1000
+
+ rendition 4.2.4
+
+commit 5cdbc08be474d592bdc8a6ed4eff1e64d55098e8
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Sun Jun 13 20:02:08 2010 -0400
+
+ README: keep the text version of README, discard the sgml version
+
+ The linuxdoc doc tool is deprecated.
+ README files are exclusively text files.
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit a5e5a286ca62f2d6e32c83aba02d58ae8e828a35
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Sun Jun 13 19:57:01 2010 -0400
+
+ README: fix linuxdoc content
+
+ defs.ent are located under X11 directory
+ ident tag is not a Linuxdoc tag
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 20f1bf342474973a4bb57551482f12b632fd948e
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Sun Jun 13 10:12:24 2010 -0400
+
+ COPYING: update file with Copyright notices from source code.
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 432cefce7e61b8445bbac284f0342c153bdfdcc4
+Author: Adam Jackson <a...@redhat.com>
+Date: Tue May 18 13:08:36 2010 -0400
+
+ Remove mibank.h reference
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit e1331ecf64d45de97abc026f0872948b1601570f
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Fri Jan 15 13:54:42 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
+
+commit 1d797c290be858b124e05cf1573db0cfc55db5b3
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Tue Dec 15 22:01:02 2009 -0500
+
+ configure.ac: remove unused sdkdir=$(pkg-config...) statement
+
+ The sdkdir variable isn't use, so remove the statement.
+
+ Acked-by: Dan Nicholson <dbn.li...@gmail.com>
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 957c7dd21e57184a576f301ecafd96819e3d71d2
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Mon Nov 23 09:25:05 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 674b9fa5f40fd99c9904a21cda8d89699d64863a
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Oct 28 14:41:41 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Automake 'foreign' option is specified in configure.ac.
+ Remove from Makefile.am
+
+commit c3769b5a338b006074dae5f2fdac2ede21db6fd9
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Wed Oct 28 14:09:09 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit db9f696aecc5153e6266e9afb2d2520493c81d7b
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Mon Oct 26 12:54:21 2009 -0400
+
+ Several driver modules do not have a ChangeLog target in Makefile.am #23814
+
+ The git generated ChangeLog replaces the hand written one.
+ Update configure.ac to xorg-macros level 1.3.
+ Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
+ Update Makefile.am to add ChangeLog target if missing
+ Remove ChangeLog from EXTRA_DIST or *CLEAN variables
+ This is a pre-req for the INSTALL_CMD
+
+commit 3a8fcd130e54099936a2641d4515adae3426a237
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Thu Oct 22 12:34:18 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit f480933cfcc683aba19b679a6d532828eeb2eaa9
+Author: Matt Turner <matts...@gmail.com>
+Date: Sat Nov 7 00:34:00 2009 -0500
+
+ Use usleep instead of xf86UDelay
+
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srsqv-000884...@vasks.debian.org
