rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.903-latest_snapshot.patch, 1.1, 1.2 xorg-x11-drv-openchrome.spec, 1.32, 1.33

Xavier Bachelot xavierb at fedoraproject.org
Tue Dec 30 01:54:41 UTC 2008


Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23372

Modified Files:
	openchrome-0.2.903-latest_snapshot.patch 
	xorg-x11-drv-openchrome.spec 
Log Message:
update to trunk rev. 696

openchrome-0.2.903-latest_snapshot.patch:

Index: openchrome-0.2.903-latest_snapshot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/openchrome-0.2.903-latest_snapshot.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openchrome-0.2.903-latest_snapshot.patch	8 Nov 2008 00:23:46 -0000	1.1
+++ openchrome-0.2.903-latest_snapshot.patch	30 Dec 2008 01:54:40 -0000	1.2
@@ -1,8 +1,25 @@
 Index: configure.ac
 ===================================================================
---- configure.ac	(.../tags/release_0_2_903)	(revision 685)
-+++ configure.ac	(.../trunk)	(revision 685)
-@@ -133,33 +133,10 @@
+--- configure.ac	(.../tags/release_0_2_903)	(revision 696)
++++ configure.ac	(.../trunk)	(revision 696)
+@@ -70,7 +70,7 @@
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ 
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto libdrm $REQUIRED_MODULES])
++PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto libdrm $REQUIRED_MODULES])
+ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+ 
+ # Checks for libraries.
+@@ -126,6 +126,7 @@
+ 
+ if test "x$XVMC" = xyes; then
+ 	AC_CHECK_HEADERS(pthread.h sys/ioctl.h sys/time.h time.h,,[XVMC="no"; break],)
++	PKG_CHECK_MODULES(XVMC, [x11 xext xvmc])
+ fi
+ 
+ AC_MSG_CHECKING([whether to build XvMC driver support])
+@@ -133,33 +134,10 @@
  
  AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
  
@@ -36,11 +53,357 @@
  AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test x$XSERVER_LIBPCIACCESS = xyes)
  if test "$XSERVER_LIBPCIACCESS" = yes; then
          AC_DEFINE(XSERVER_LIBPCIACCESS,1,[Enable libpciaccess])
+Index: libxvmc/Makefile.am
+===================================================================
+--- libxvmc/Makefile.am	(.../tags/release_0_2_903)	(revision 696)
++++ libxvmc/Makefile.am	(.../trunk)	(revision 696)
+@@ -24,13 +24,13 @@
+ 	xf86dristr.h \
+ 	vldXvMC.h
+ 
+-libchromeXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/libxvmc -DTRUE=1 -DFALSE=0
++libchromeXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XVMC_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/libxvmc -DTRUE=1 -DFALSE=0
+ libchromeXvMC_la_LDFLAGS = -version-number 1:0:0
+-libchromeXvMC_la_LIBADD = @DRI_LIBS@
++libchromeXvMC_la_LIBADD = @DRI_LIBS@ @XVMC_LIBS@
+ 
+-libchromeXvMCPro_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/libxvmc -DTRUE=1 -DFALSE=0
++libchromeXvMCPro_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XVMC_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/libxvmc -DTRUE=1 -DFALSE=0
+ libchromeXvMCPro_la_LDFLAGS = -version-number 1:0:0
+-libchromeXvMCPro_la_LIBADD = @DRI_LIBS@
++libchromeXvMCPro_la_LIBADD = @DRI_LIBS@ @XVMC_LIBS@
+ else
+ EXTRA_DIST = \
+ 	driDrawable.c \
+Index: libxvmc/viaLowLevelPro.c
+===================================================================
+--- libxvmc/viaLowLevelPro.c	(.../tags/release_0_2_903)	(revision 696)
++++ libxvmc/viaLowLevelPro.c	(.../trunk)	(revision 696)
+@@ -1460,13 +1460,13 @@
+ 
+     if (size != mem->size) {
+ 	if (mem->size)
+-	    drmCommandWrite(xl->fd, DRM_VIA_FREEMEM, mem, sizeof(mem));
++	    drmCommandWrite(xl->fd, DRM_VIA_FREEMEM, mem, sizeof(*mem));
+ 	mem->context = *(xl->drmcontext);
+ 	mem->size = size;
+ 	mem->type = VIA_MEM_VIDEO;
+ 
+ 	if (((ret = drmCommandWriteRead(xl->fd, DRM_VIA_ALLOCMEM, mem,
+-			sizeof(mem))) < 0) || mem->size != size) {
++			sizeof(*mem))) < 0) || mem->size != size) {
+ 	    mem->size = 0;
+ 	    return -1;
+ 	}
+@@ -1484,7 +1484,7 @@
+     drm_via_mem_t *mem = &buf->mem;
+ 
+     if (mem->size)
+-	drmCommandWrite(xl->fd, DRM_VIA_FREEMEM, mem, sizeof(mem));
++	drmCommandWrite(xl->fd, DRM_VIA_FREEMEM, mem, sizeof(*mem));
+     mem->size = 0;
+ }
+ 
+Index: libxvmc/viaXvMC.c
+===================================================================
+--- libxvmc/viaXvMC.c	(.../tags/release_0_2_903)	(revision 696)
++++ libxvmc/viaXvMC.c	(.../trunk)	(revision 696)
+@@ -248,7 +248,7 @@
+     return errType;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCCreateContext(Display * display, XvPortID port,
+     int surface_type_id, int width, int height, int flags,
+     XvMCContext * context)
+@@ -572,7 +572,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCDestroyContext(Display * display, XvMCContext * context)
+ {
+     ViaXvMCContext *pViaXvMC;
+@@ -594,7 +594,7 @@
+     return releaseContextResources(display, context, 1, Success);
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCCreateSurface(Display * display, XvMCContext * context,
+     XvMCSurface * surface)
+ {
+@@ -661,7 +661,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCDestroySurface(Display * display, XvMCSurface * surface)
+ {
+     ViaXvMCSurface *pViaSurface;
+@@ -684,7 +684,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCPutSlice2(Display * display, XvMCContext * context, char *slice,
+     int nBytes, int sliceCode)
+ {
+@@ -711,7 +711,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCPutSlice(Display * display, XvMCContext * context, char *slice,
+     int nBytes)
+ {
+@@ -781,7 +781,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCPutSurface(Display * display, XvMCSurface * surface, Drawable draw,
+     short srcx, short srcy, unsigned short srcw,
+     unsigned short srch, short destx, short desty,
+@@ -964,7 +964,7 @@
+     printf("flags: 0x%x\n", control->flags);
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCBeginSurface(Display * display,
+     XvMCContext * context,
+     XvMCSurface * target_surface,
+@@ -1062,7 +1062,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCSyncSurface(Display * display, XvMCSurface * surface)
+ {
+     ViaXvMCSurface *pViaSurface;
+@@ -1124,7 +1124,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCLoadQMatrix(Display * display, XvMCContext * context,
+     const XvMCQMatrix * qmx)
+ {
+@@ -1174,7 +1174,7 @@
+  * standard completeness.
+  */
+ 
+-Status XvMCRenderSurface
++_X_EXPORT Status XvMCRenderSurface
+     (Display * display,
+     XvMCContext * context,
+     unsigned int picture_structure,
+@@ -1189,20 +1189,20 @@
+     return (error_base + XvMCBadContext);
+ }
+ 
+-Status XvMCCreateBlocks
++_X_EXPORT Status XvMCCreateBlocks
+     (Display * display,
+     XvMCContext * context, unsigned int num_blocks, XvMCBlockArray * block)
+ {
+     return (error_base + XvMCBadContext);
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCDestroyBlocks(Display * display, XvMCBlockArray * block)
+ {
+     return Success;
+ }
+ 
+-Status XvMCCreateMacroBlocks
++_X_EXPORT Status XvMCCreateMacroBlocks
+     (Display * display,
+     XvMCContext * context,
+     unsigned int num_blocks, XvMCMacroBlockArray * blocks)
+@@ -1210,13 +1210,13 @@
+     return (error_base + XvMCBadContext);
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCDestroyMacroBlocks(Display * display, XvMCMacroBlockArray * block)
+ {
+     return (error_base + XvMCBadContext);
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCCreateSubpicture(Display * display,
+     XvMCContext * context,
+     XvMCSubpicture * subpicture,
+@@ -1277,7 +1277,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCSetSubpicturePalette(Display * display, XvMCSubpicture * subpicture,
+     unsigned char *palette)
+ {
+@@ -1356,7 +1356,7 @@
+     return 0;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCClearSubpicture(Display * display,
+     XvMCSubpicture * subpicture,
+     short x,
+@@ -1399,7 +1399,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCCompositeSubpicture(Display * display,
+     XvMCSubpicture * subpicture,
+     XvImage * image,
+@@ -1463,7 +1463,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCBlendSubpicture(Display * display,
+     XvMCSurface * target_surface,
+     XvMCSubpicture * subpicture,
+@@ -1503,7 +1503,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCBlendSubpicture2(Display * display,
+     XvMCSurface * source_surface,
+     XvMCSurface * target_surface,
+@@ -1600,7 +1600,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCSyncSubpicture(Display * display, XvMCSubpicture * subpicture)
+ {
+     ViaXvMCSubPicture *pViaSubPic;
+@@ -1627,7 +1627,7 @@
+     return retVal;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCFlushSubpicture(Display * display, XvMCSubpicture * subpicture)
+ {
+     ViaXvMCSubPicture *pViaSubPic;
+@@ -1642,7 +1642,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCDestroySubpicture(Display * display, XvMCSubpicture * subpicture)
+ {
+     ViaXvMCSubPicture *pViaSubPic;
+@@ -1681,7 +1681,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCGetSubpictureStatus(Display * display, XvMCSubpicture * subpic, int *stat)
+ {
+     ViaXvMCSubPicture *pViaSubPic;
+@@ -1705,7 +1705,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCFlushSurface(Display * display, XvMCSurface * surface)
+ {
+     ViaXvMCSurface *pViaSurface;
+@@ -1735,7 +1735,7 @@
+     return ret;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCGetSurfaceStatus(Display * display, XvMCSurface * surface, int *stat)
+ {
+     ViaXvMCSurface *pViaSurface;
+@@ -1770,7 +1770,7 @@
+     return ret;
+ }
+ 
+-XvAttribute *
++_X_EXPORT XvAttribute *
+ XvMCQueryAttributes(Display * display, XvMCContext * context, int *number)
+ {
+     ViaXvMCContext *pViaXvMC;
+@@ -1797,7 +1797,7 @@
+     return ret;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCSetAttribute(Display * display,
+     XvMCContext * context, Atom attribute, int value)
+ {
+@@ -1850,7 +1850,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCGetAttribute(Display * display,
+     XvMCContext * context, Atom attribute, int *value)
+ {
+@@ -1884,7 +1884,7 @@
+     return Success;
+ }
+ 
+-Status
++_X_EXPORT Status
+ XvMCHideSurface(Display * display, XvMCSurface * surface)
+ {
+ 
 Index: ChangeLog
 ===================================================================
---- ChangeLog	(.../tags/release_0_2_903)	(revision 685)
-+++ ChangeLog	(.../trunk)	(revision 685)
-@@ -1,3 +1,132 @@
+--- ChangeLog	(.../tags/release_0_2_903)	(revision 696)
++++ ChangeLog	(.../trunk)	(revision 696)
+@@ -1,3 +1,149 @@
++2008-12-29  Jon Nettleton  <jon.nettleton at gmail.com>
++
++	* src/via_accel.c: (viaInitXAA):
++	* src/via_driver.c: (VIAMapMMIO), (VIAMapFB):
++
++	Finally tracked down the XAA libpciaccess bug.  Also
++	Realized I had not enabled write-combining on the main
++	framebuffer.  This should give a small speed boost.
++
++2008-12-26  Jon Nettleton <jon.nettleton at gmail.com>
++
++	* src/via_mode.h:
++
++	Added support for all Modes in ViaPanelNativeModes to
++	ViaPanelModes.  Modes used are from Via's released driver
++	in ViaSupportModes.
++
 +2008-11-04  Jon Nettleton  <jon.nettleton at gmail.com>
 +
 +	* src/via_crtc.c: (ViaFirstCRTCSetMode), (ViaSecondCRTCSetMode):
@@ -176,7 +539,7 @@
 Index: src/via_panel.c
 ===================================================================
 --- src/via_panel.c	(.../tags/release_0_2_903)	(revision 0)
-+++ src/via_panel.c	(.../trunk)	(revision 685)
++++ src/via_panel.c	(.../trunk)	(revision 696)
 @@ -0,0 +1,461 @@
 +/*
 + * Copyright 2007 The Openchrome Project [openchrome.org]
@@ -498,7 +861,7 @@
 +    centerMode->CrtcHBlankEnd += HDiff;
 +
 +    centerMode->CrtcVSyncStart += VDiff;
-+    centerMode->CrtcVSyncEnd += VDiff;;
++    centerMode->CrtcVSyncEnd += VDiff;
 +    centerMode->CrtcVBlankStart += VDiff;
 +    centerMode->CrtcVBlankEnd += VDiff;
 +}
@@ -641,8 +1004,8 @@
 +}
 Index: src/via_id.h
 ===================================================================
---- src/via_id.h	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_id.h	(.../trunk)	(revision 685)
+--- src/via_id.h	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_id.h	(.../trunk)	(revision 696)
 @@ -37,6 +37,7 @@
      VIA_P4M900,
      VIA_CX700,
@@ -661,8 +1024,8 @@
   * the CLE266, often labelled Ax and Cx.  The dividing line seems to be
 Index: src/via_video.c
 ===================================================================
---- src/via_video.c	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_video.c	(.../trunk)	(revision 685)
+--- src/via_video.c	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_video.c	(.../trunk)	(revision 696)
 @@ -112,11 +112,7 @@
  static int viaSetPortAttribute(ScrnInfoPtr, Atom, INT32, pointer);
  static int viaPutImage(ScrnInfoPtr, short, short, short, short, short, short,
@@ -783,6 +1146,16 @@
          }
      }
  
+@@ -924,8 +918,8 @@
+     DBG_DD(ErrorF(" via_video.c : viaStopVideo: exit=%d\n", exit));
+ 
+     REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
++    ViaOverlayHide(pScrn);
+     if (exit) {
+-        ViaOverlayHide(pScrn);
+         ViaSwovSurfaceDestroy(pScrn, pPriv);
+         if (pPriv->dmaBounceBuffer)
+             xfree(pPriv->dmaBounceBuffer);
 @@ -1271,11 +1265,8 @@
          short src_w, short src_h,
          short drw_w, short drw_h,
@@ -818,7 +1191,7 @@
 Index: src/via_lvds.c
 ===================================================================
 --- src/via_lvds.c	(.../tags/release_0_2_903)	(revision 0)
-+++ src/via_lvds.c	(.../trunk)	(revision 685)
++++ src/via_lvds.c	(.../trunk)	(revision 696)
 @@ -0,0 +1,121 @@
 +/* 
 + * Copyright 2007 The Openchrome Project [openchrome.org]
@@ -943,8 +1316,8 @@
 +}
 Index: src/via_mode.c
 ===================================================================
---- src/via_mode.c	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_mode.c	(.../trunk)	(revision 685)
+--- src/via_mode.c	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_mode.c	(.../trunk)	(revision 696)
 @@ -1,4 +1,5 @@
  /*
 + * Copyright 2005-2007 The Openchrome Project [openchrome.org]
@@ -2123,8 +2496,13 @@
          && (pBIOSInfo->PanelIndex != VIA_BIOS_NUM_PANEL)) {
          pBIOSInfo->SetDVI = TRUE;
          VIASetLCDMode(pScrn, mode);
-@@ -2019,7 +1417,7 @@
+@@ -2017,9 +1415,12 @@
+     else
+         ViaCrtcMask(hwp, 0x6A, 0x00, 0x08);
  
++    if (pBIOSInfo->LCDPower) 
++        pBIOSInfo->LCDPower(pScrn, On);
++
      /* Find Panel Size Index for PowerSeq Table */
      if (pVia->Chipset == VIA_CLE266) {
 -        if (pBIOSInfo->PanelSize != VIA_PANEL_INVALID) {
@@ -2132,7 +2510,7 @@
              for (i = 0; i < NumPowerOn; i++) {
                  if (lcdTable[pBIOSInfo->PanelIndex].powerSeq
                      == powerOn[i].powerSeq)
-@@ -2038,3 +1436,106 @@
+@@ -2038,3 +1439,106 @@
          ViaLCDPowerSequence(hwp, powerOff[i]);
      usleep(1);
  }
@@ -2241,8 +2619,8 @@
 +}
 Index: src/via_mode.h
 ===================================================================
---- src/via_mode.h	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_mode.h	(.../trunk)	(revision 685)
+--- src/via_mode.h	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_mode.h	(.../trunk)	(revision 696)
 @@ -32,7 +32,7 @@
   */
  #define VIA_BW_MIN       74000000 /* > 640x480 at 60Hz@32bpp */
@@ -2252,15 +2630,43 @@
  #define VIA_BW_DDR667   922000000
  
      
-@@ -127,6 +127,7 @@
-     { MODEPREFIX("1024x512"),   41164, 1024, 1056, 1160, 1296, 0,  512,  512,  515,  531, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
-     { MODEPREFIX("856x480"),    31704,  856,  872,  960, 1064, 0,  480,  480,  483,  497, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
-     { MODEPREFIX("1024x576"),   46981, 1024, 1064, 1168, 1312, 0,  576,  576,  579,  597, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
+@@ -113,20 +113,27 @@
+ 
+ static DisplayModeRec ViaPanelModes[] = {
+     { MODEPREFIX("640x480"),    25312,  640,  656,  752,  800, 0,  480,  489,  491,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX },
++    { MODEPREFIX("720x480"),    26591,  720,  736,  808,  896, 0,  480,  480,  483,  497, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
++    { MODEPREFIX("720x576"),    32663,  720,  744,  816,  912, 0,  576,  576,  579,  597, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
 +    { MODEPREFIX("800x480"),    40000,   800,  832,  960, 1056, 0,   480,  541,  545,  628, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
+     { MODEPREFIX("800x600"),    39822,  800,  840,  968, 1056, 0,  600,  600,  604,  628, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX },
++    { MODEPREFIX("848x480"),    33750,  848,  864,  976, 1088, 0,  480,  485,  493,  517, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX },
++    { MODEPREFIX("856x480"),    31704,  856,  872,  960, 1064, 0,  480,  480,  483,  497, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
++    { MODEPREFIX("1024x512"),   41164, 1024, 1056, 1160, 1296, 0,  512,  512,  515,  531, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
++    { MODEPREFIX("1024x576"),   46981, 1024, 1064, 1168, 1312, 0,  576,  576,  579,  597, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
++    { MODEPREFIX("1024x600"),   48960, 1024, 1064, 1168, 1312, 0,  600,  601,  604,  622, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
+     { MODEPREFIX("1024x768"),   65028, 1024, 1048, 1184, 1344, 0,  768,  770,  776,  806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX },
+     { MODEPREFIX("1152x864"),   81613, 1152, 1216, 1336, 1520, 0,  864,  864,  867,  895, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX },
+-    { MODEPREFIX("1280x1024"), 108280, 1280, 1328, 1440, 1688, 0, 1024, 1024, 1027, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX },
+-    { MODEPREFIX("1600x1200"), 161793, 1600, 1664, 1856, 2160, 0, 1200, 1200, 1203, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX },
+     { MODEPREFIX("1280x768"),   81135, 1280, 1328, 1440, 1688, 0,  768,  770,  776,  802, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX },
++    { MODEPREFIX("1280x720"),   74600, 1280, 1341, 1474, 1688, 0,  720,  721,  724,  746, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
+     { MODEPREFIX("1280x960"),  108280, 1280, 1376, 1488, 1800, 0,  960,  960,  963, 1000, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX },
+-    { MODEPREFIX("848x480"),    33750,  848,  864,  976, 1088, 0,  480,  485,  493,  517, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX },
++    { MODEPREFIX("1280x1024"), 108280, 1280, 1328, 1440, 1688, 0, 1024, 1024, 1027, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX },
++    { MODEPREFIX("1360x768"),   85500, 1360, 1392, 1712, 1744, 0,  768,  783,  791,  807, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX },
++    { MODEPREFIX("1366x768"),  85860,  1366, 1440, 1584, 1800, 0, 768,  769,  772,   795, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
+     { MODEPREFIX("1400x1050"), 122726, 1400, 1488, 1640, 1880, 0, 1050, 1050, 1053, 1087, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
+-    { MODEPREFIX("720x480"),    26591,  720,  736,  808,  896, 0,  480,  480,  483,  497, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
+-    { MODEPREFIX("720x576"),    32663,  720,  744,  816,  912, 0,  576,  576,  579,  597, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
+-    { MODEPREFIX("1024x512"),   41164, 1024, 1056, 1160, 1296, 0,  512,  512,  515,  531, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
+-    { MODEPREFIX("856x480"),    31704,  856,  872,  960, 1064, 0,  480,  480,  483,  497, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
+-    { MODEPREFIX("1024x576"),   46981, 1024, 1064, 1168, 1312, 0,  576,  576,  579,  597, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
++    { MODEPREFIX("1440x900"),  106470, 1440, 1520, 1672, 1904, 0,  900,  901,  904,  932, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
++    { MODEPREFIX("1600x1200"), 161793, 1600, 1664, 1856, 2160, 0, 1200, 1200, 1203, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX },
++    { MODEPREFIX("1920x1080"), 172900, 1920, 2043, 2249, 2578, 0, 1080, 1081, 1084, 1118, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX },
      { MODEPREFIX(NULL), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, MODESUFFIX },
  };
  
-@@ -182,6 +183,7 @@
+@@ -182,6 +189,7 @@
      {VIA_RES_1024X512,  VIA_PANEL_INVALID, 1024,  512},
      {VIA_RES_856X480,   VIA_PANEL_INVALID,  856,  480},
      {VIA_RES_1024X576,  VIA_PANEL_INVALID, 1024,  576},
@@ -2270,8 +2676,8 @@
  
 Index: src/via_driver.c
 ===================================================================
---- src/via_driver.c	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_driver.c	(.../trunk)	(revision 685)
+--- src/via_driver.c	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_driver.c	(.../trunk)	(revision 696)
 @@ -126,6 +126,7 @@
     VIA_DEVICE_MATCH (PCI_CHIP_VT3364, 0 ),
     VIA_DEVICE_MATCH (PCI_CHIP_VT3324, 0 ),
@@ -2807,7 +3213,17 @@
  static Bool
  VIAMapMMIO(ScrnInfoPtr pScrn)
  {
-@@ -2215,7 +2362,7 @@
+@@ -2196,8 +2343,7 @@
+     err = pci_device_map_range(pVia->PciInfo,
+                                pVia->MmioBase + VIA_MMIO_BLTBASE,
+                                VIA_MMIO_BLTSIZE,
+-                               (PCI_DEV_MAP_FLAG_WRITABLE
+-                                | PCI_DEV_MAP_FLAG_WRITE_COMBINE),
++                               PCI_DEV_MAP_FLAG_WRITABLE,
+                                (void **)&pVia->BltBase);
+ 
+     if (err) {
+@@ -2215,7 +2361,7 @@
  
      if (!pVia->MapBase || !pVia->BltBase) {
          xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -2816,7 +3232,7 @@
          return FALSE;
      }
  
-@@ -2238,14 +2385,15 @@
+@@ -2238,14 +2384,15 @@
          hwp->writeMiscOut(hwp, val | 0x01);
  
          /* Unlock extended IO space. */
@@ -2838,6 +3254,16 @@
          vgaHWGetIOBase(hwp);
      }
  
+@@ -2298,7 +2445,8 @@
+ #ifdef XSERVER_LIBPCIACCESS
+         err = pci_device_map_range(pVia->PciInfo, pVia->FrameBufferBase,
+                                    pVia->videoRambytes,
+-                                   PCI_DEV_MAP_FLAG_WRITABLE,
++                                   (PCI_DEV_MAP_FLAG_WRITABLE |
++                                    PCI_DEV_MAP_FLAG_WRITE_COMBINE),
+                                    (void **)&pVia->FBBase);
+         if (err) {
+             xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 @@ -2346,8 +2494,7 @@
  
      DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIAUnmapMem\n"));
@@ -3214,7 +3640,7 @@
 Index: src/via_crtc.c
 ===================================================================
 --- src/via_crtc.c	(.../tags/release_0_2_903)	(revision 0)
-+++ src/via_crtc.c	(.../trunk)	(revision 685)
++++ src/via_crtc.c	(.../trunk)	(revision 696)
 @@ -0,0 +1,636 @@
 +/*
 + * Copyright 2005-2007 The Openchrome Project [openchrome.org]
@@ -3854,8 +4280,8 @@
 +}
 Index: src/via_swov.c
 ===================================================================
---- src/via_swov.c	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_swov.c	(.../trunk)	(revision 685)
+--- src/via_swov.c	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_swov.c	(.../trunk)	(revision 696)
 @@ -95,7 +95,8 @@
      pdwState = (CARD32 volatile *)(pVia->VidMapBase + (HQV_CONTROL + proReg));
  
@@ -3967,8 +4393,8 @@
          /* SECOND_DISPLAY_COLOR_KEY_ENABLE */
 Index: src/via_driver.h
 ===================================================================
---- src/via_driver.h	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_driver.h	(.../trunk)	(revision 685)
+--- src/via_driver.h	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_driver.h	(.../trunk)	(revision 696)
 @@ -65,6 +65,7 @@
  #include "via_swov.h"
  #include "via_dmabuffer.h"
@@ -4099,8 +4525,8 @@
  Bool viaInitAccel(ScreenPtr);
 Index: src/via_bios.h
 ===================================================================
---- src/via_bios.h	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_bios.h	(.../trunk)	(revision 685)
+--- src/via_bios.h	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_bios.h	(.../trunk)	(revision 696)
 @@ -34,6 +34,14 @@
  #define     VIA_PANEL14X10                  5
  #define     VIA_PANEL16X12                  6
@@ -4261,8 +4687,8 @@
  #endif /* _VIA_BIOS_H_ */
 Index: src/via_bandwidth.c
 ===================================================================
---- src/via_bandwidth.c	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_bandwidth.c	(.../trunk)	(revision 685)
+--- src/via_bandwidth.c	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_bandwidth.c	(.../trunk)	(revision 696)
 @@ -234,6 +234,12 @@
              hwp->writeSeq(hwp, 0x18, 0x66);
              hwp->writeSeq(hwp, 0x22, 0x1F);
@@ -4303,7 +4729,7 @@
 Index: src/via_display.c
 ===================================================================
 --- src/via_display.c	(.../tags/release_0_2_903)	(revision 0)
-+++ src/via_display.c	(.../trunk)	(revision 685)
++++ src/via_display.c	(.../trunk)	(revision 696)
 @@ -0,0 +1,128 @@
 +#ifdef HAVE_CONFIG_H
 +#include "config.h"
@@ -4435,8 +4861,8 @@
 +}
 Index: src/via_regs.h
 ===================================================================
---- src/via_regs.h	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_regs.h	(.../trunk)	(revision 685)
+--- src/via_regs.h	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_regs.h	(.../trunk)	(revision 696)
 @@ -42,7 +42,7 @@
  #define VIA_MMIO_REGBASE        0x0
  #define VIA_MMIO_VGABASE        0x8000
@@ -4521,8 +4947,8 @@
  #define VIA_GEC_NOOP            0x00000000
 Index: src/via_accel.c
 ===================================================================
---- src/via_accel.c	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_accel.c	(.../trunk)	(revision 685)
+--- src/via_accel.c	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_accel.c	(.../trunk)	(revision 696)
 @@ -1,5 +1,5 @@
  /*
 - * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
@@ -5109,7 +5535,21 @@
  
      /*
       * Most Unichromes are much faster using processor-to-framebuffer writes
-@@ -1173,8 +1311,8 @@
+@@ -1146,8 +1284,12 @@
+     xaaptr->SetupForImageWrite = viaSetupForImageWrite;
+     xaaptr->SubsequentImageWriteRect = viaSubsequentImageWriteRect;
+     xaaptr->ImageWriteBase = pVia->BltBase;
+-    xaaptr->ImageWriteRange = VIA_MMIO_BLTSIZE;
+ 
++    if (pVia->Chipset == VIA_VX800)
++        xaaptr->ImageWriteRange = VIA_MMIO_BLTSIZE;
++    else
++        xaaptr->ImageWriteRange = (64 * 1024);
++
+     return XAAInit(pScreen, xaaptr);
+ 
+ }
+@@ -1173,8 +1315,8 @@
  
      if (pVia->agpDMA) {
          BEGIN_RING(2);
@@ -5120,7 +5560,7 @@
                              VIA_GEM_32bpp, 4, pVia->curMarker,
                              (0xF0 << 24) | VIA_GEC_BLT | VIA_GEC_FIXCOLOR_PAT);
          ADVANCE_RING;
-@@ -1259,7 +1397,7 @@
+@@ -1259,7 +1401,7 @@
  
      if (!viaAccelPlaneMaskHelper(tdc, planeMask))
          return FALSE;
@@ -5129,7 +5569,7 @@
  
      tdc->cmd = VIA_GEC_BLT | VIA_GEC_FIXCOLOR_PAT | VIAACCELPATTERNROP(alu);
  
-@@ -1283,7 +1421,7 @@
+@@ -1283,7 +1425,7 @@
      dstPitch = exaGetPixmapPitch(pPixmap);
      dstOffset = exaGetPixmapOffset(pPixmap);
  
@@ -5138,7 +5578,7 @@
                          tdc->mode, dstPitch, tdc->fgColor, tdc->cmd);
      ADVANCE_RING;
  }
-@@ -1325,7 +1463,7 @@
+@@ -1325,7 +1467,7 @@
  
      if (!viaAccelPlaneMaskHelper(tdc, planeMask))
          return FALSE;
@@ -5147,7 +5587,7 @@
  
      return TRUE;
  }
-@@ -1345,7 +1483,7 @@
+@@ -1345,7 +1487,7 @@
      if (!width || !height)
          return;
  
@@ -5156,7 +5596,7 @@
                         srcOffset, dstOffset, tdc->mode, tdc->srcPitch,
                         exaGetPixmapPitch(pDstPixmap), tdc->cmd);
      ADVANCE_RING;
-@@ -2273,16 +2411,14 @@
+@@ -2273,16 +2415,14 @@
  
      pVia->VQStart = 0;
      if (((pVia->FBFreeEnd - pVia->FBFreeStart) >= VIA_VQ_SIZE)
@@ -5179,7 +5619,7 @@
  
      viaInitialize2DEngine(pScrn);
  
-@@ -2554,8 +2690,8 @@
+@@ -2554,8 +2694,8 @@
              cmd |= VIA_GEC_DECY;
  
          viaAccelSetMode(pScrn->bitsPerPixel, tdc);
@@ -5190,7 +5630,7 @@
                             tdc->mode, pVia->Bpl, pVia->Bpl, cmd);
          pVia->accelMarker = viaAccelMarkSync(pScrn->pScreen);
          ADVANCE_RING;
-@@ -2578,8 +2714,8 @@
+@@ -2578,8 +2718,8 @@
  
      if (!pVia->NoAccel) {
          viaAccelSetMode(pScrn->bitsPerPixel, tdc);
@@ -5201,7 +5641,7 @@
                              pVia->Bpl, color, cmd);
          pVia->accelMarker = viaAccelMarkSync(pScrn->pScreen);
          ADVANCE_RING;
-@@ -2604,8 +2740,8 @@
+@@ -2604,8 +2744,8 @@
  
      if (!pVia->NoAccel) {
          viaAccelSetMode(depth, tdc);
@@ -5214,8 +5654,8 @@
          ADVANCE_RING;
 Index: src/via_vbe.c
 ===================================================================
---- src/via_vbe.c	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_vbe.c	(.../trunk)	(revision 685)
+--- src/via_vbe.c	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_vbe.c	(.../trunk)	(revision 696)
 @@ -95,7 +95,7 @@
      /* Set Active Device and translate BIOS byte definition. */
      if (pBIOSInfo->CrtActive)
@@ -5245,8 +5685,8 @@
      VBEDPMSSet(pVia->pVbe, mode);
 Index: src/via_cursor.c
 ===================================================================
---- src/via_cursor.c	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_cursor.c	(.../trunk)	(revision 685)
+--- src/via_cursor.c	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_cursor.c	(.../trunk)	(revision 696)
 @@ -1,5 +1,6 @@
  /*
 - * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
@@ -5883,8 +6323,8 @@
 +}
 Index: src/via_xvmc.c
 ===================================================================
---- src/via_xvmc.c	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_xvmc.c	(.../trunk)	(revision 685)
+--- src/via_xvmc.c	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_xvmc.c	(.../trunk)	(revision 696)
 @@ -114,11 +114,7 @@
  static int viaXvMCInterceptPutImage(ScrnInfoPtr, short, short, short, short,
                                      short, short, short, short, int,
@@ -5926,8 +6366,8 @@
  unsigned long
 Index: src/via_vt162x.h
 ===================================================================
---- src/via_vt162x.h	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_vt162x.h	(.../trunk)	(revision 685)
+--- src/via_vt162x.h	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_vt162x.h	(.../trunk)	(revision 696)
 @@ -926,6 +926,23 @@
        0x0, 0x0,
      },
@@ -5955,7 +6395,7 @@
 Index: src/via_timing.c
 ===================================================================
 --- src/via_timing.c	(.../tags/release_0_2_903)	(revision 0)
-+++ src/via_timing.c	(.../trunk)	(revision 685)
++++ src/via_timing.c	(.../trunk)	(revision 696)
 @@ -0,0 +1,398 @@
 +/*
 + * Copyright 2007-2008 Gabriel Mansi.
@@ -6357,8 +6797,8 @@
 +}
 Index: src/Makefile.am
 ===================================================================
---- src/Makefile.am	(.../tags/release_0_2_903)	(revision 685)
-+++ src/Makefile.am	(.../trunk)	(revision 685)
+--- src/Makefile.am	(.../tags/release_0_2_903)	(revision 696)
++++ src/Makefile.am	(.../trunk)	(revision 696)
 @@ -43,23 +43,29 @@
           via_ch7xxx.c \
           via_ch7xxx.h \
@@ -6391,8 +6831,8 @@
           via_vgahw.h \
 Index: src/via_dga.c
 ===================================================================
---- src/via_dga.c	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_dga.c	(.../trunk)	(revision 685)
+--- src/via_dga.c	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_dga.c	(.../trunk)	(revision 696)
 @@ -247,8 +247,8 @@
          pScrn->depth = pVia->DGAOldDepth;
  
@@ -6417,8 +6857,8 @@
              pVia->DGAOldDisplayWidth = pScrn->displayWidth;
 Index: src/via_id.c
 ===================================================================
---- src/via_id.c	(.../tags/release_0_2_903)	(revision 685)
-+++ src/via_id.c	(.../trunk)	(revision 685)
+--- src/via_id.c	(.../tags/release_0_2_903)	(revision 696)
++++ src/via_id.c	(.../trunk)	(revision 696)
 @@ -87,6 +87,7 @@
      {"Asustek K8V-MX",                        VIA_K8M800,  0x1043, 0x8129, VIA_DEVICE_CRT},
      {"Mitac 8399",                            VIA_K8M800,  0x1071, 0x8399, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV}, /* aka "Pogolinux Konabook 3100" */
@@ -6427,7 +6867,15 @@
      {"VIA VT3108 (K8M800)",                   VIA_K8M800,  0x1106, 0x3108, VIA_DEVICE_CRT}, /* borrowed by Asustek A8V-MX */ 
      {"Shuttle FX21",                          VIA_K8M800,  0x1297, 0x3052, VIA_DEVICE_CRT},
      {"Shuttle FX83",                          VIA_K8M800,  0x1297, 0xF683, VIA_DEVICE_CRT | VIA_DEVICE_TV},
-@@ -158,6 +159,7 @@
+@@ -113,6 +114,7 @@
+     {"Packard Bell Imedia 2097",              VIA_K8M800,  0x1631, 0xD007, VIA_DEVICE_CRT},
+     {"Fujitsu-Siemens Amilo K7610",           VIA_K8M800,  0x1734, 0x10B3, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+     {"ASRock K8Upgrade-VM800",                VIA_K8M800,  0x1849, 0x3108, VIA_DEVICE_CRT},
++    {"Axper XP-M8VM800",                      VIA_K8M800,  0x1940, 0xD000, VIA_DEVICE_CRT},
+ 
+     /*** PM800, PM880, PN800, CN400 ***/
+     {"VIA VT3118 (PM800)",                    VIA_PM800,   0x1106, 0x3118, VIA_DEVICE_CRT}, /* borrowed by ECS PM800-M2 */
+@@ -158,6 +160,7 @@
      {"Asustek P5V800-MX",                     VIA_VM800,   0x3344, 0x1122, VIA_DEVICE_CRT},
  
      /*** K8M890 ***/
@@ -6435,7 +6883,7 @@
      {"Asustek A8V-VM",                        VIA_K8M890,  0x1043, 0x81B5, VIA_DEVICE_CRT},
      {"Asustek M2V-MX SE",                     VIA_K8M890,  0x1043, 0x8297, VIA_DEVICE_CRT},
      {"Foxconn K8M890M2MA-RS2H",               VIA_K8M890,  0x105B, 0x0C84, VIA_DEVICE_CRT},
-@@ -190,12 +192,13 @@
+@@ -190,12 +193,13 @@
      {"ASRock P4VM900-SATA2",                  VIA_P4M900,  0x1849, 0x3371, VIA_DEVICE_CRT},
  
      /*** CX700 ***/
@@ -6450,11 +6898,18 @@
      {"Packard Bell EasyNote XS",              VIA_CX700,   0x1631, 0xC201, VIA_DEVICE_LCD}, /* aka Everex Cloudbook CE1200V */
  
      /*** P4M890, VN890 ***/
-@@ -209,6 +212,9 @@
+@@ -204,11 +208,16 @@
+     {"Asustek P5V-VM ULTRA",                  VIA_P4M890,  0x1043, 0x81B5, VIA_DEVICE_CRT},
+     {"Asustek P5V-VM DH",                     VIA_P4M890,  0x1043, 0x81CE, VIA_DEVICE_CRT},
+     {"Mitac 8615",                            VIA_P4M890,  0x1071, 0x8615, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
++    {"Mitac 8624 (Joybook R41E)",             VIA_P4M890,  0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+     {"VIA VT3343 (P4M890)",                   VIA_P4M890,  0x1106, 0x3343, VIA_DEVICE_CRT},
+     {"MSI P4M890M-L/IL (MS-7255)",            VIA_P4M890,  0x1462, 0x7255, VIA_DEVICE_CRT},
      {"Biostar P4M890-M7 TE",                  VIA_P4M890,  0x1565, 0x1207, VIA_DEVICE_CRT},
      {"ASRock P4VM890",                        VIA_P4M890,  0x1849, 0x3343, VIA_DEVICE_CRT},
  
 +    /*** VX800 ***/
++    {"VIA Epia M700",                         VIA_VX800,   0x1106, 0x1122, VIA_DEVICE_CRT},
 +    {"Quanta DreamBook Light IL1",            VIA_VX800,   0x152d, 0x0771, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
 +
      /* keep this */
@@ -6463,7 +6918,7 @@
 Index: src/via_timing.h
 ===================================================================
 --- src/via_timing.h	(.../tags/release_0_2_903)	(revision 0)
-+++ src/via_timing.h	(.../trunk)	(revision 685)
++++ src/via_timing.h	(.../trunk)	(revision 696)
 @@ -0,0 +1,51 @@
 +/*
 + * Copyright 2007-2008 Gabriel Mansi.


Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xorg-x11-drv-openchrome.spec	8 Nov 2008 00:23:46 -0000	1.32
+++ xorg-x11-drv-openchrome.spec	30 Dec 2008 01:54:41 -0000	1.33
@@ -5,11 +5,12 @@
 %define cvsdate xxxxxxx
 
 %define with_xvmc 1
+%define with_debug 0
 
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.903
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -66,11 +67,17 @@
 #%patch100 -p0 -b .agpdma
 #%patch200 -p0 -b .panel
 
+
 %build
 autoreconf
-%configure --disable-static --enable-dri --enable-debug --enable-xv-debug
+%configure --disable-static --enable-dri \
+%if %{with_debug}
+           --enable-debug --enable-xv-debug
+%endif
+
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -83,14 +90,17 @@
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 if [ -e /etc/X11/xorg.conf ]; then
     sed -i "/Driver/s/via/openchrome/" /etc/X11/xorg.conf || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING NEWS README
@@ -113,43 +123,47 @@
 
 
 %changelog
-* Fri Nov 07 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.903-2
+* Mon Dec 29 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-3
+- Update to latest snapshot (svn 696), fix RHBZ#446489.
+- Make debug build optional and disable it.
+
+* Fri Nov 07 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-2
 - Update to latest snapshot (svn 685), most notably add basic VX800 support.
 - Turn on full debugging.
 
-* Wed Aug 20 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.903-1
+* Wed Aug 20 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-1
 - Update to 0.2.903.
 
-* Wed Aug 06 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-10
+* Wed Aug 06 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-10
 - Disable argb cursor for K8M800.
 
-* Sun Aug 03 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-9
+* Sun Aug 03 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-9
 - New version of the panel and hw cursor patch.
 - Rawhide is now using patch --fuzz=0, fixes for induced issues.
 
-* Mon Jun 23 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-8
+* Mon Jun 23 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-8
 - New version of the panel and hw cursor patch.
 
-* Sat May 31 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-7
+* Sat May 31 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-7
 - New panel and hardware cursor code from randr branch.
 
-* Sun May 31 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-6
+* Sun May 31 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-6
 - Disable XvDMA for K8M890 and P4M890 (RHBZ #391621).
 
-* Mon May 26 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-5
+* Mon May 26 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-5
 - Add patch to fix Xv on LCD for CX700.
 
-* Sun May 25 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-4
+* Sun May 25 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-4
 - Unbreak ActiveDevice option.
 
-* Thu Apr 17 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-3
+* Thu Apr 17 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-3
 - Strip leading /trunk/ from patch #2 and #3.
 
-* Sun Apr 13 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-2
+* Sun Apr 13 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-2
 - Add patch to properly report driver version in the libpciaccess code path.
 - Add patch to properly report chipset revision in the libpciaccess code path.
 
-* Wed Apr 09 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-1
+* Wed Apr 09 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-1
 - New upstream release.
 - Re-enable AGPDMA for K8M800 and VM800, as the drm bug is fixed in kernel
   >= 2.6.25rc7 (Patch #1).
@@ -157,56 +171,56 @@
 * Mon Mar 17 2008 Jesse Keating <jkeating at redhat.com> - 0.2.901-16
 - Remove dangerous unversioned obsoletes/provides.
 
-* Sun Mar 16 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-15
+* Sun Mar 16 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-15
 - Update to latest svn snapshot (Rev. 553).
 
-* Sun Mar 09 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-14
+* Sun Mar 09 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-14
 - Revert to last good version of the libpciaccess patch.
 
-* Sun Mar 09 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-13
+* Sun Mar 09 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-13
 - Temporarily revert to old memory detection method. We need something that
   works out of the box for F9 Beta.
 
-* Sat Mar 08 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-12
+* Sat Mar 08 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-12
 - Yet another revision of the libpciaccess patch.
 
-* Fri Mar 07 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-11
+* Fri Mar 07 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-11
 - Fix a typo in libpciaccess patch.
 
 * Fri Mar 07 2008 Adam Jackson <ajax at redhat.com> 0.2.901-10
 - Fix -devel subpackage to obsolete via-devel properly.
 
-* Thu Mar 06 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-9
+* Thu Mar 06 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-9
 - Fix libpciaccess patch.
 
-* Thu Mar 06 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-8
+* Thu Mar 06 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-8
 - Add patch to fix XV on LCD for VM800.
 - Improved libpciaccess patch.
 
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.901-7
 - Autorebuild for GCC 4.3
 
-* Wed Jan 23 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-6
+* Wed Jan 23 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-6
 - Add patch to properly set fifo on P4M900.
 
-* Fri Jan 19 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-5
+* Fri Jan 19 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-5
 - Add patch to replace xf86memcpy by plain memcpy.
 
-* Thu Jan 10 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-4
+* Thu Jan 10 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-4
 - Another try at fixing the libpciaccess patch.
 
-* Mon Jan 07 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-3
+* Mon Jan 07 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-3
 - And now fix patch filename...
 
-* Mon Jan 07 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-2
+* Mon Jan 07 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-2
 - Fix broken libpciaccess patch.
 
-* Wed Jan 02 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-1
+* Wed Jan 02 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-1
 - Update to 0.2.901.
 - Remove obsoleted patches.
 - Update libpciaccess patch.
 
-* Fri Dec 08 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-9
+* Fri Dec 08 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-9
 - Add patch for preliminary libpciaccess support.
 
 * Wed Nov 28 2007 Adam Jackson <ajax at redhat.com> 0.2.900-8
@@ -214,31 +228,31 @@
 - Munge xorg.conf in %%post to change from via to openchrome.
 - Drive-by spec cleanups.
 
-* Fri Nov 02 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-7
+* Fri Nov 02 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-7
 - Replace broken VT1625 NTSC patch.
 - Add patch to announce as release not as development build.
 - First official Fedora build.
 
-* Thu Oct 18 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-6
+* Thu Oct 18 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-6
 - Update to official 0.2.900
 
-* Wed Oct 10 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-5
+* Wed Oct 10 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-5
 - Update to release_0_3_0 branch rev. 410
 - Add VT1625 patch for 720x576 PAL
 
-* Mon Sep 10 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-4
+* Mon Sep 10 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-4
 - Update to release_0_3_0 branch rev. 384 plus all changes from experimental
   merged back
 - Remove upstream patch #2
 
-* Wed Aug 01 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-3
+* Wed Aug 01 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-3
 - Update to release_0_3_0 branch rev. 380 (fix a bug with XvMC acceleration)
 - Add a patch to allow proper detection of DDR667 (patch #2)
 
-* Mon Jul 16 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-2
+* Mon Jul 16 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-2
 - Update to release_0_3_0 branch rev. 373
 - Add release notes to %%doc
 
-* Thu Jul 05 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-1
+* Thu Jul 05 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-1
 - Initial build (release_0_3_0 branch rev. 365)
 - Add some NTSC modes for the VT1625 (patch #1)




More information about the fedora-extras-commits mailing list