Dear XFree86 maintainers,
with the release of XFree86-4.5.0 its time to propose a few
new patches, none of them critical.
patch-10-HALlib:
Use newer version of HALlib/binding.h from Matrox
(mgadriver-4.0-src.tgz from 15 Oct 2004), add
declaration for HALSetDisplayStart to binding.h, and
adjust mga_driver.c accordingly.
(MGA has once again changed the HALlib interface.)
patch-11-whitespace:
According to what I was told by the gcc and glibc people
leading whitespace in preprocessor directives is allowed
by more recent C/C++ specs.
Consequently makedepend should cease to give this warning.
patch-29-backslash-space:
Cpp from gcc >=3.3 treats "<backslash><space><newline>"
in the same way as "<backslash><newline>" (possibly with
a warning). Moreover gcc-3.3 and gcc-3.4 behave slightly
different.
It is therefore extremely difficult, if not impossible to
define application defaults ending with "<backslash><space>"
in a portable way.
regards
Peter Breitenlohner <peb@xxxxxxxxxxxx>
Use newer version of HALlib/binding.h from Matrox
(mgadriver-4.0-src.tgz from 15 Oct 2004), add
declaration for HALSetDisplayStart to binding.h, and
adjust mga_driver.c accordingly.
diff -ur -N XF86-4.5.0.orig/xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h XF86-4.5.0/xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h
--- XF86-4.5.0.orig/xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h 2004-03-31 18:37:09.000000000 +0200
+++ XF86-4.5.0/xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h 2005-03-21 13:11:31.000000000 +0100
@@ -13,7 +13,7 @@
@end
***************************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h,v 1.6 2004/03/31 16:37:09 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h,v 1.5 2000/12/06 20:39:52 dawes Exp $ */
#ifndef _BINDING
#define _BINDING
@@ -210,6 +210,8 @@
#define MGAMODEINFO_FORCE_PITCH (1L << 5)
#define MGAMODEINFO_FORCE_DISPLAYORG (1L << 6)
#define MGAMODEINFO_TV (1L << 7)
+#define MGAMODEINFO_FLATPANEL1 (1L << 8)
+#define MGAMODEINFO_FLATPANEL2 (1L << 9)
#define MGAMODEINFO_TESTONLY 0x80000000
/* Cable Type */
@@ -243,7 +245,8 @@
ULONG MGAGetBOARDHANDLESize(void);
ULONG MGASetTVStandard(LPBOARDHANDLE pBoard, ULONG ulTVStandard);
ULONG MGASetTVCableType(LPBOARDHANDLE pBoard, ULONG ulCableType);
-ULONG MGASetDisplayStart(LPBOARDHANDLE pBoard, ULONG ulX, ULONG ulY, ULONG ulCrtc);
+ULONG MGAForceFlatPanel(LPBOARDHANDLE pBoard);
+ULONG HALSetDisplayStart(LPBOARDHANDLE pBoard, ULONG ulX, ULONG ulY, ULONG ulCrtc);
#if defined(__cplusplus)
}
diff -ur -N XF86-4.5.0.orig/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c XF86-4.5.0/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c
--- XF86-4.5.0.orig/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c 2005-02-18 03:55:08.000000000 +0100
+++ XF86-4.5.0/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c 2005-03-21 13:11:30.000000000 +0100
@@ -401,7 +401,7 @@
"MGASetVgaMode",
"MGAValidateMode",
"MGAValidateVideoParameters",
- "MGASetDisplayStart",
+ "HALSetDisplayStart",
NULL
};
#endif
@@ -3644,7 +3644,7 @@
MGAAdjustGranularity(pScrn,&x,&y);
pMga->HALGranularityOffX = pMga->HALGranularityOffX - x;
pMga->HALGranularityOffY = pMga->HALGranularityOffY - y;
- MGASetDisplayStart(pMga->pBoard,x,y,0);
+ HALSetDisplayStart(pMga->pBoard,x,y,0);
);
#endif
MGA_NOT_HAL(
@@ -3692,7 +3692,7 @@
#ifdef USEMGAHAL
MGA_HAL(
MGAAdjustGranularity(pScrn,&x,&y);
- MGASetDisplayStart(pMga->pBoard,x,y,1);
+ HALSetDisplayStart(pMga->pBoard,x,y,1);
);
#endif
MGA_NOT_HAL(
According to what I was told by the gcc and glibc people
leading whitespace in preprocessor directives is allowed
by more recent C/C++ specs.
Consequently makedepend should cease to give this warning.
diff -ur -N XF86-4.5.0.orig/xc/config/makedepend/main.c XF86-4.5.0/xc/config/makedepend/main.c
--- XF86-4.5.0.orig/xc/config/makedepend/main.c 2004-03-14 00:52:23.000000000 +0100
+++ XF86-4.5.0/xc/config/makedepend/main.c 2005-03-22 09:31:32.000000000 +0100
@@ -715,10 +715,6 @@
if (*bol != '#')
bol = NULL;
done:
- if (bol && whitespace) {
- warning("%s: non-portable whitespace encountered at line %d\n",
- filep->f_name, lineno);
- }
filep->f_p = p;
filep->f_line = lineno;
#ifdef DEBUG_DUMP
Cpp from gcc >=3.3 treats "<backslash><space><newline>"
in the same way as "<backslash><newline>" (possibly with
a warning). Moreover gcc-3.3 and gcc-3.4 behave slightly
different.
It is therefore extremely difficult, if not impossible to
define application defaults ending with "<backslash><space>"
in a portable way.
diff -ur XF86-4.5.0.orig/xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad XF86-4.5.0/xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad
--- XF86-4.5.0.orig/xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad 2001-06-23 03:45:56.000000000 +0200
+++ XF86-4.5.0/xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad 2005-03-27 15:26:29.000000000 +0200
@@ -527,7 +527,7 @@
*options*viewport.right: chainRight
*options*list.longest: 376
-*options*driverOpts.label: Options for module\
+*options*driverOpts.label: Options for module
*options*driverOpts.justify: left
*options*driverOpts.width: 278
*options*popdown.label: Popdown dialog
@@ -1179,22 +1179,22 @@
*accessx*enter.height: 74
*accessx*0.width: 104
*accessx*lock.label: Num\nLock
-*accessx*div.label: /\n\
-*accessx*mul.label: *\n\
-*accessx*minus.label: -\n\
-*accessx*7.label: 7\n\
-*accessx*8.label: 8\n\
-*accessx*9.label: 9\n\
-*accessx*plus.label: +\n\ \n\ \n\ \n\
-*accessx*4.label: 4\n\
-*accessx*5.label: 5\n\
-*accessx*6.label: 6\n\
-*accessx*1.label: 1\n\
-*accessx*2.label: 2\n\
-*accessx*3.label: 3\n\
-*accessx*enter.label: Enter\n\ \n\ \n\ \n\
-*accessx*0.label: 0\n\
-*accessx*del.label: .\n\ \n\
+*accessx*div.label: /\n
+*accessx*mul.label: *\n
+*accessx*minus.label: -\n
+*accessx*7.label: 7\n
+*accessx*8.label: 8\n
+*accessx*9.label: 9\n
+*accessx*plus.label: +\n\ \n\ \n\ \n
+*accessx*4.label: 4\n
+*accessx*5.label: 5\n
+*accessx*6.label: 6\n
+*accessx*1.label: 1\n
+*accessx*2.label: 2\n
+*accessx*3.label: 3\n
+*accessx*enter.label: Enter\n\ \n\ \n\ \n
+*accessx*0.label: 0\n
+*accessx*del.label: .\n\ \n
*accessx*label.displayList:\
foreground white;\
lines +1,-1,-1,-1,-1,+1;\
