[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/xorg-x11-drv-via/devel via.xinf, 1.1, 1.2 xorg-x11-drv-via.spec, 1.14, 1.15



Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-via/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30024

Modified Files:
	via.xinf xorg-x11-drv-via.spec 
Log Message:
* Mon Jun 19 2006 Mike A. Harris <mharris redhat com> 0.2.1-4
- Updated via.xinf to fix numerous errors an inaccuracies (#195806)
- Conditionalized DRI support by adding with_dri macro.



Index: via.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-via/devel/via.xinf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- via.xinf	3 Feb 2006 13:40:52 -0000	1.1
+++ via.xinf	19 Jun 2006 19:23:28 -0000	1.2
@@ -1,6 +1,27 @@
-alias pcivideo:v00001106d00003022sv*sd*bc*sc*i* via
+# NOTE: This file was last updated June 19, 2006.  It has been synchronized
+# to match the support present and enabled in the upstream X.Org X11R7.1
+# via driver release "xf86-video-via-0.2.1.tar.bz2", and to resolve
+# the following issue:  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195806
+
+# NOTE: Comments in via 0.2.1 driver source indicate this device does not
+# exist in the wild, so it has been disabled for now.
+#alias pcivideo:v00001106d00003022sv*sd*bc*sc*i* via
+
+# 1106:3108 - K8M800 (PCI_CHIP_VT3204)
+alias pcivideo:v00001106d00003108sv*sd*bc*sc*i* via
+
+# 1106:3118 - PM800/PM880/CN400 (PCI_CHIP_VT3259)
+alias pcivideo:v00001106d00003118sv*sd*bc*sc*i* via
+
+# 1106:3122 - CLE266 (PCI_CHIP_CLE3122)
 alias pcivideo:v00001106d00003122sv*sd*bc*sc*i* via
-alias pcivideo:v00001106d00003204sv*sd*bc*sc*i* via
-alias pcivideo:v00001106d00003205sv*sd*bc*sc*i* via
-alias pcivideo:v00001106d00007204sv*sd*bc*sc*i* via
+
+# 1106:7205 - KM400/KN400 (PCI_CHIP_VT3205)
 alias pcivideo:v00001106d00007205sv*sd*bc*sc*i* via
+
+# NOTE: This PCI ID is present in the 0.2.1 driver, but not part of the
+# ViaChipset array, so we disable it.  Further investigation yields a commit
+# message:  "Xv VM800 support (Ivor Hewitt). Not enabled yet pending more testing."
+# http://webcvs.freedesktop.org/xorg/driver/xf86-video-via/src/via_id.h?view=markup
+# 1106:3344 - VM800 (PCI_CHIP_VT3314)
+#alias pcivideo:v00001106d00003344sv*sd*bc*sc*i* via


Index: xorg-x11-drv-via.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-via/devel/xorg-x11-drv-via.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-via.spec	26 May 2006 15:45:46 -0000	1.14
+++ xorg-x11-drv-via.spec	19 Jun 2006 19:23:28 -0000	1.15
@@ -6,10 +6,16 @@
 
 %define with_xvmc 1
 
+%ifarch %{ix86} x86_64
+%define with_dri 1
+%else
+%define with_dri 0
+%endif
+
 Summary:   Xorg X11 via video driver
 Name:      xorg-x11-drv-via
 Version:   0.2.1
-Release:   3
+Release:   4
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -25,9 +31,10 @@
 %if %{with_xvmc}
 BuildRequires: libXvMC-devel
 %endif
+%if %{with_dri}
 BuildRequires: libdrm-devel >= 2.0-1
-
-Requires:  xorg-x11-server-Xorg >= 1.0.99.901
+%endif
+Requires:  xorg-x11-server-Xorg >= 1.1.0-2
 
 %description 
 X.Org X11 via video driver.
@@ -46,7 +53,13 @@
 %setup -q -n %{tarball}-%{version}
 
 %build
-%configure --disable-static
+%configure --disable-static \
+%if %{with_dri}
+           --enable-dri
+%else
+           --disable-dri
+%endif
+
 make
 
 %install
@@ -87,6 +100,10 @@
 %endif
 
 %changelog
+* Mon Jun 19 2006 Mike A. Harris <mharris redhat com> 0.2.1-4
+- Updated via.xinf to fix numerous errors an inaccuracies (#195806)
+- Conditionalized DRI support by adding with_dri macro.
+
 * Fri May 26 2006 Mike A. Harris <mharris redhat com> 0.2.1-3
 - Updated sdk dependency to pick up proto-devel automatically. (#192167)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]