rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.901-rev533_snapshot.patch, NONE, 1.1 xorg-x11-drv-openchrome.spec, 1.17, 1.18

Xavier Bachelot (xavierb) fedora-extras-commits at redhat.com
Sun Mar 16 23:04:08 UTC 2008


Author: xavierb

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

Modified Files:
	xorg-x11-drv-openchrome.spec 
Added Files:
	openchrome-0.2.901-rev533_snapshot.patch 
Log Message:
revision 533 snapshot

openchrome-0.2.901-rev533_snapshot.patch:

--- NEW FILE openchrome-0.2.901-rev533_snapshot.patch ---
Index: configure.ac
===================================================================
--- configure.ac	(revision 487)
+++ configure.ac	(revision 553)
@@ -77,7 +77,15 @@
 
 # Checks for header files.
 AC_HEADER_STDC
+AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"])
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+             [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+             [#include "xorg/xorg-server.h"])
 
+if test x$XSERVER_LIBPCIACCESS = xyes; then
+       PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+fi
+
 if test "$DRI" != no; then
         AC_CHECK_FILE([${sdkdir}/dri.h],
                       [have_dri_h="yes"], [have_dri_h="no"])
@@ -129,16 +137,12 @@
               [have_xf86Module_h="yes"], [have_xf86Module_h="no"])
 
 # Check the ABI_VIDEODRV_VERSION
-SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+SAVE_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $XORG_CFLAGS"
 		
 if test "x$have_xf86Module_h" = xyes; then
 AC_MSG_CHECKING([whether to use old Xv ABI])
         AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
-#include "xf86Module.h"
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 1
-#error Old Xv ABI
-#endif
                            ]])],
                            [OLD_XVABI=no],
 			   [OLD_XVABI=yes])
@@ -147,7 +151,7 @@
         echo -n "xf86Module.h not found, "
 fi
 
-CPPFLAGS="$SAVE_CPPFLAGS"
+CFLAGS="$SAVE_CFLAGS"
 
 if test "x$OLD_XVABI" = xyes; then
                 echo "yes."
@@ -156,6 +160,11 @@
                 AC_DEFINE(USE_NEW_XVABI, 1, [Use new Xv ABI (7.1RC1+)])
 fi
 
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test x$XSERVER_LIBPCIACCESS = xyes)
+if test "$XSERVER_LIBPCIACCESS" = yes; then
+        AC_DEFINE(XSERVER_LIBPCIACCESS,1,[Enable libpciaccess])
+fi
+
 AM_CONDITIONAL(DEBUG, test x$DEBUG = xyes)
 if test "$DEBUG" = yes; then
         AC_DEFINE(HAVE_DEBUG,1,[Enable debug support])
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 487)
+++ ChangeLog	(revision 553)
@@ -1,3 +1,52 @@
+2008-03-11  Xavier Bachelot  <xavier-at-bachelot-dot-org>
+
+	* configure.ac:
+	* src/via.h:
+	* src/via_dri.c: (VIADRIIrqInit), (VIADRIScreenInit):
+	* src/via_driver.c: (via_pci_device), (via_host_bridge),
+	(viaPciDeviceVga), (if), (switch):
+	* src/via_driver.h:
+	* src/via_id.c: (ViaCheckCardId):
+
+	Merge changes from pciaccess branch.
+
+2008-02-19  Benno Schulenberg  <bensberg-at-justemail-dot-net>
+
+	* src/via_driver.c: (VIAPreInit):
+
+	Dealing with the NoAccel option before the Rotate option, since
+	the latter overrides the first.
+
+2008-01-28  Benno Schulenberg  <bensberg-at-justemail-dot-net>
+
+	* src/Makefile.am:
+
+	Recreating svnversion.h only when a source file has changed.
+
+2008-01-18  Benno Schulenberg  <bensberg-at-justemail-dot-net>
+
+	* src/via_dri.c: (VIAInitVisualConfigs):
+
+	Condensing an unneeded code duplication.
+
+2008-01-11  Benno Schulenberg  <bensberg-at-justemail-dot-net>
+
+	* src/openchrome.man:
+	* src/via_driver.c: (VIASetupDefaultOptions), (VIAPreInit):
+
+	Removing the redundant HWCursor option.
+
+2008-01-10  Benno Schulenberg  <bensberg-at-justemail-dot-net>
+
+	* src/openchrome.man: Tweaking the text, clarifying the effect
+	of an option, giving the default value.
+
+2008-01-08  Benno Schulenberg  <bensberg-at-justemail-dot-net>
+
+	* src/via_accel.c: (viaBitExpandHelper), (viaPixelARGB8888):
+
+	Moving a little more computation into the helper function.
+
 2007-10-29  Benno Schulenberg  <bensberg-at-justemail-dot-net>
 
 	* src/via_driver.c: (VIAPreInit):
Index: src/via_3d.c
===================================================================
--- src/via_3d.c	(revision 487)
+++ src/via_3d.c	(revision 553)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Thomas Hellstrom. All Rights Reserved.
+ * Copyright 2006 Thomas Hellström. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -108,7 +108,7 @@
     Via3DFormat *fm = via3DFormats + VIA_FMT_HASH(format);
 
     if (fm->pictFormat != format)
-	return FALSE;
+        return FALSE;
     return fm->dstSupported;
 }
 
@@ -118,14 +118,14 @@
     Via3DFormat *fm = via3DFormats + VIA_FMT_HASH(format);
 
     if (fm->pictFormat != format)
-	return FALSE;
+        return FALSE;
     return fm->texSupported;
 }
 
 static void
 viaSet3DDestination(Via3DState * v3d, CARD32 offset, CARD32 pitch, int format)
 {
-    v3d->drawingDirty = TRUE;	       /* Affects planemask format. */
+    v3d->drawingDirty = TRUE;  /* Affects planemask format. */
     v3d->destDirty = TRUE;
     v3d->destOffset = offset;
     v3d->destPitch = pitch;
@@ -135,7 +135,7 @@
 
 static void
 viaSet3DDrawing(Via3DState * v3d, int rop,
-    CARD32 planeMask, CARD32 solidColor, CARD32 solidAlpha)
+                CARD32 planeMask, CARD32 solidColor, CARD32 solidAlpha)
 {
     v3d->drawingDirty = TRUE;
     v3d->rop = rop;
@@ -146,7 +146,7 @@
 
 static void
 viaSet3DFlags(Via3DState * v3d, int numTextures,
-    Bool writeAlpha, Bool writeColor, Bool blend)
+              Bool writeAlpha, Bool writeColor, Bool blend)
 {
     v3d->enableDirty = TRUE;
     v3d->blendDirty = TRUE;
@@ -162,66 +162,66 @@
     *shift = 0;
 
     while (val > (1 << *shift))
-	(*shift)++;
+        (*shift)++;
     return (val == (1 << *shift));
 }
 
 static Bool
 viaSet3DTexture(Via3DState * v3d, int tex, CARD32 offset,
-    CARD32 pitch, Bool npot, CARD32 width, CARD32 height, int format,
-    ViaTextureModes sMode, ViaTextureModes tMode,
-    ViaTexBlendingModes blendingMode, Bool agpTexture)
+                CARD32 pitch, Bool npot, CARD32 width, CARD32 height,
+                int format, ViaTextureModes sMode, ViaTextureModes tMode,
+                ViaTexBlendingModes blendingMode, Bool agpTexture)
 {
     ViaTextureUnit *vTex = v3d->tex + tex;
 
     vTex->textureLevel0Offset = offset;
     vTex->npot = npot;
     if (!viaOrder(pitch, &vTex->textureLevel0Exp) && !vTex->npot)
-	return FALSE;
+        return FALSE;
     vTex->textureLevel0Pitch = pitch;
     if (!viaOrder(width, &vTex->textureLevel0WExp))
[...16409 lines suppressed...]
+                break;
+        }
     }
-    
+
     ShadowFBInit(pScreen, refreshArea);
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ShadowFB initialised.\n");
 }
-
Index: src/via.h
===================================================================
--- src/via.h	(revision 487)
+++ src/via.h	(revision 553)
@@ -25,8 +25,6 @@
 #ifndef _VIA_H_
 #define _VIA_H_ 1
 
-#include "xorgVersion.h"
-
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
@@ -664,4 +662,20 @@
 
 #define VBE_DEFAULT_REFRESH                     6000
 
+#ifdef XSERVER_LIBPCIACCESS
+#define VIA_MEMBASE(p,n)  (p)->regions[(n)].base_addr
+#define VENDOR_ID(p)      (p)->vendor_id
+#define DEVICE_ID(p)      (p)->device_id
+#define SUBVENDOR_ID(p)   (p)->subvendor_id
+#define SUBSYS_ID(p)      (p)->subdevice_id
+#define CHIP_REVISION(p)  (p)->revision
+#else
+#define VIA_MEMBASE(p,n)  (p)->memBase[n]
+#define VENDOR_ID(p)      (p)->vendor
+#define DEVICE_ID(p)      (p)->chipType
+#define SUBVENDOR_ID(p)   (p)->subsysVendor
+#define SUBSYS_ID(p)      (p)->subsysCard
+#define CHIP_REVISION(p)  (p)->chipRev
+#endif
+
 #endif /* _VIA_H_ */
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 487)
+++ src/Makefile.am	(revision 553)
@@ -31,20 +32,20 @@
 openchrome_drv_ladir = @moduledir@/drivers
 
 openchrome_drv_la_SOURCES = \
-	 via_3d_reg.h \
-	 via_3d.c \
-	 via_3d.h \
+         via.h \
+         via_3d.c \
+         via_3d.h \
+         via_3d_reg.h \
          via_accel.c \
          via_bandwidth.c \
          via_bios.h \
-	 via_ch7xxx.c \
-	 via_ch7xxx.h \
+         via_ch7xxx.c \
+         via_ch7xxx.h \
          via_cursor.c \
          via_dga.c \
-	 via_dmabuffer.h \
+         via_dmabuffer.h \
          via_driver.c \
          via_driver.h \
-         via.h \
          via_i2c.c \
          via_id.c \
          via_id.h \
@@ -58,7 +59,7 @@
          via_shadow.c \
          via_swov.c \
          via_swov.h \
-	 via_vbe.c \
+         via_vbe.c \
          via_vgahw.c \
          via_vgahw.h \
          via_video.c \
@@ -74,7 +75,6 @@
          via_drmclient.h \
          via_xvmc.c \
          via_xvmc.h 
-
 else
 EXTRA_DIST += \
          via_dri.c \
@@ -84,16 +84,20 @@
          via_xvmc.h 
 endif
 
+
 via_driver.lo: svnversion.h
-svnversion.h:
+svnversion.h: $(openchrome_drv_la_SOURCES)
 	@if [ -f svnrelease.h ]; then \
 	echo '#include "svnrelease.h"' > $@.tmp; \
 	elif [ -d .svn ]; then \
 	echo '#define BUILDCOMMENT "(development build, at svn revision '\
-	"`svnversion -nc .. | sed -e s/^[^:]*://`"')\n"' > $@.tmp; \
-	else date +'#define BUILDCOMMENT "(development build, compiled on %c)\n"' > $@.tmp; fi
+	"`svnversion -nc .. | sed -e s/^[^:]*://`"')"' > $@.tmp; \
+	else \
+	date +'#define BUILDCOMMENT "(development build, compiled on %c)"' \
+	> $@.tmp; \
+	fi
 
-	@(chmod 666 $@.tmp 2> /dev/null || /bin/true)
-	@cmp -s $@ $@.tmp || (mv $@.tmp $@ ; echo created $@)
+	@chmod 666 $@.tmp
+	@mv $@.tmp $@
+	@echo "created $@"
 
-.PHONY: svnversion.h
Index: src/via_id.c
===================================================================
--- src/via_id.c	(revision 487)
+++ src/via_id.c	(revision 553)
@@ -30,6 +30,7 @@
 #endif
 
 #include "via_driver.h"
+#include "via.h"
 #include "via_id.h"
 
 /*
@@ -144,6 +145,7 @@
     {"Clevo/RoverBook Voyager V511L",         VIA_VM800,   0x1558, 0x0662, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"Clevo M5xxS",                           VIA_VM800,   0x1558, 0x5406, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"Biostar P4M80-M4 / P4VMA-M",            VIA_VM800,   0x1565, 0x1202, VIA_DEVICE_CRT},
+    {"Biostar P4M800 Pro-M7",                 VIA_VM800,   0x1565, 0x1206, VIA_DEVICE_CRT},
     {"Fujitsu/Siemens Amilo Pro V2030",       VIA_VM800,   0x1734, 0x109B, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"Fujitsu/Siemens Amilo Pro V2035",       VIA_VM800,   0x1734, 0x10AE, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"Fujitsu/Siemens Amilo Pro V2055",       VIA_VM800,   0x1734, 0x10CA, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
@@ -160,21 +162,31 @@
     {"Fujitsu/Siemens Amilo La 1703",         VIA_K8M890,  0x1734, 0x10D9, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
 
     /*** P4M900, VN896, CN896 ***/
+    {"VIA Epia SN",                           VIA_P4M900,  0x0908, 0x1975, VIA_DEVICE_CRT},
     {"Asustek P5VD2-VM",                      VIA_P4M900,  0x1043, 0x81CE, VIA_DEVICE_CRT},
+    {"Asustek P5VD2-VM SE",                   VIA_P4M900,  0x1043, 0x8252, VIA_DEVICE_CRT},
+    {"Mitac 8515",                            VIA_P4M900,  0x1071, 0x8515, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+    {"Medion Notebook MD96483",               VIA_P4M900,  0x1071, 0x8615, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+    {"Mitac 8624",                            VIA_P4M900,  0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"VIA VT3364 (P4M900)",                   VIA_P4M900,  0x1106, 0x3371, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"Gigabyte GA-VM900M",                    VIA_P4M900,  0x1458, 0xD000, VIA_DEVICE_CRT},
     {"MSI P4M900M / P4M900M2-F/L",            VIA_P4M900,  0x1462, 0x7255, VIA_DEVICE_CRT},
     {"Everex NC1501/NC1503",                  VIA_P4M900,  0x1509, 0x1E30, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"Clevo M660SE",                          VIA_P4M900,  0x1558, 0x0664, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+    {"Clevo M660SR",                          VIA_P4M900,  0x1558, 0x0669, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"Neo Endura 540SLe",                     VIA_P4M900,  0x1558, 0x5408, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+    {"Clevo M54xSR",                          VIA_P4M900,  0x1558, 0x5409, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"Biostar P4M900M-M7 SE",                 VIA_P4M900,  0x1565, 0x1207, VIA_DEVICE_CRT},
     {"Fujitsu/Siemens Amilo Pro V3515",       VIA_P4M900,  0x1734, 0x10CB, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"Fujitsu/Siemens Amilo Li1705",          VIA_P4M900,  0x1734, 0x10F7, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+    {"ASRock P4VM900-SATA2",                  VIA_P4M900,  0x1849, 0x3371, VIA_DEVICE_CRT},
 
     /*** CX700 ***/
     {"VIA VT8454B",                           VIA_CX700,   0x0908, 0x1975, VIA_DEVICE_CRT}, /* Evaluation board, reference possibly wrong */
     {"VIA VT3324 (CX700)",                    VIA_CX700,   0x1106, 0x3157, VIA_DEVICE_CRT},
+    {"MSI Fuzzy CX700/CX700D",                VIA_CX700,   0x1462, 0x8020, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
     {"FIC CE260",                             VIA_CX700,   0x1509, 0x2D30, VIA_DEVICE_LCD},
+    {"Packard Bell EasyNote XS",              VIA_CX700,   0x1631, 0xC201, VIA_DEVICE_LCD}, /* aka Everex Cloudbook CE1200V */
 
     /*** P4M890, VN890 ***/
     {"PCChips P29G",                          VIA_P4M890,  0x1019, 0x1629, VIA_DEVICE_CRT},
@@ -218,15 +230,15 @@
     struct ViaCardIdStruct *Id;
     VIAPtr pVia = VIAPTR(pScrn);
     
-    if ((pVia->PciInfo->subsysVendor == pVia->PciInfo->vendor) &&
-	(pVia->PciInfo->subsysCard == pVia->PciInfo->chipType))
+    if ((SUBVENDOR_ID(pVia->PciInfo) == VENDOR_ID(pVia->PciInfo)) &&
+       (SUBSYS_ID(pVia->PciInfo) == DEVICE_ID(pVia->PciInfo)))
         xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
                    "Manufacturer plainly copied main PCI IDs to subsystem/card IDs.\n");
 
     for (Id = ViaCardId; Id->String; Id++) {
 	if ((Id->Chip == pVia->Chipset) && 
-	    (Id->Vendor == pVia->PciInfo->subsysVendor) &&
-	    (Id->Device == pVia->PciInfo->subsysCard)) {
+           (Id->Vendor == SUBVENDOR_ID(pVia->PciInfo)) &&
+           (Id->Device == SUBSYS_ID(pVia->PciInfo))) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected %s.\n", Id->String);
 	    pVia->Id = Id;
 	    return;
@@ -235,7 +247,7 @@
     
     xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
 	       "Unknown Card-Ids (%4X|%4X|%4X); please report to openchrome-users at openchrome.org\n",
-	       pVia->PciInfo->chipType, pVia->PciInfo->subsysVendor, pVia->PciInfo->subsysCard);
+               DEVICE_ID(pVia->PciInfo), SUBVENDOR_ID(pVia->PciInfo), SUBSYS_ID(pVia->PciInfo));
     pVia->Id = NULL;
 }
 


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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-drv-openchrome.spec	10 Mar 2008 00:32:56 -0000	1.17
+++ xorg-x11-drv-openchrome.spec	16 Mar 2008 23:03:33 -0000	1.18
@@ -9,7 +9,7 @@
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.901
-Release:	14%{?dist}
+Release:	15%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -18,10 +18,11 @@
 Source0:	http://www.openchrome.org/releases/%{tarball}-%{version}.tar.bz2
 Source1:	openchrome.xinf
 
-Patch1:         openchrome-0.2.901-libpciaccess.patch
-Patch2:         openchrome-0.2.901-replace_xf86memcpy.patch
-Patch3:         openchrome-0.2.901-P4M900_fifo_settings.patch
-Patch4:         openchrome-0.2.901-VM800_xv_LCD.patch
+#Patch1:         openchrome-0.2.901-libpciaccess.patch
+#Patch2:         openchrome-0.2.901-replace_xf86memcpy.patch
+#Patch3:         openchrome-0.2.901-P4M900_fifo_settings.patch
+#Patch4:         openchrome-0.2.901-VM800_xv_LCD.patch
+Patch99:        openchrome-0.2.901-rev533_snapshot.patch
 ExclusiveArch:	%{ix86} x86_64
 
 BuildRequires:	pkgconfig
@@ -57,10 +58,11 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch1 -p0 -b .libpciaccess
-%patch2 -p0 -b .xf86memcpy
-%patch3 -p0 -b .P4M900_fifo
-%patch4 -p0 -b .VM800_xv_LCD
+#%patch1 -p0 -b .libpciaccess
+#%patch2 -p0 -b .xf86memcpy
+#%patch3 -p0 -b .P4M900_fifo
+#%patch4 -p0 -b .VM800_xv_LCD
+%patch99 -p0 -b .rev533
 
 %build
 autoreconf
@@ -109,6 +111,9 @@
 
 
 %changelog
+* Sun Mar 16 2008 Xavier Bachelot <xavier AT bachelot DOT 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
 - Revert to last good version of the libpciaccess patch.
 




More information about the fedora-extras-commits mailing list