rpms/xorg-x11-drv-intel/devel intel-2.8.0-build-fix.patch, NONE, 1.1 intel-chip-names.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 xorg-x11-drv-intel.spec, 1.16, 1.17
Adam Jackson
ajax at fedoraproject.org
Tue Jul 21 17:33:44 UTC 2009
- Previous message (by thread): rpms/xorg-x11-server/devel .cvsignore, 1.63, 1.64 commitid, 1.26, 1.27 sources, 1.58, 1.59 xorg-x11-server.spec, 1.448, 1.449
- Next message (by thread): rpms/redhat-rpm-config/devel redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch, NONE, 1.1 redhat-rpm-config.spec, 1.65, 1.66
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22656
Modified Files:
.cvsignore sources xorg-x11-drv-intel.spec
Added Files:
intel-2.8.0-build-fix.patch intel-chip-names.patch
Log Message:
* Tue Jul 21 2009 Adam Jackson <ajax at redhat.com> 2.8.0-1
- intel 2.8.0
- Fix chip names to match pci.ids where no official product name is known.
intel-2.8.0-build-fix.patch:
src/ch7017/ch7017.c | 2 +-
src/ch7xxx/ch7xxx.c | 2 +-
src/ivch/ivch.c | 2 +-
src/sil164/sil164.c | 2 +-
src/tfp410/tfp410.c | 2 +-
uxa/uxa-priv.h | 4 +---
6 files changed, 6 insertions(+), 8 deletions(-)
--- NEW FILE intel-2.8.0-build-fix.patch ---
diff -up xf86-video-intel-2.8.0/uxa/uxa-priv.h.jx xf86-video-intel-2.8.0/uxa/uxa-priv.h
--- xf86-video-intel-2.8.0/uxa/uxa-priv.h.jx 2009-07-21 02:00:14.000000000 -0400
+++ xf86-video-intel-2.8.0/uxa/uxa-priv.h 2009-07-21 11:39:10.000000000 -0400
@@ -1,5 +1,4 @@
/*
- *
* Copyright © 2000,2008 Keith Packard
* 2005 Zack Rusin, Trolltech
*
@@ -42,8 +41,7 @@
#define NEED_EVENTS
#include <X11/Xproto.h>
#ifdef MITSHM
-#define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
+#include "shmint.h"
#endif
#include "scrnintstr.h"
#include "pixmapstr.h"
diff -up xf86-video-intel-2.8.0/src/ch7017/ch7017.c.jx xf86-video-intel-2.8.0/src/ch7017/ch7017.c
--- xf86-video-intel-2.8.0/src/ch7017/ch7017.c.jx 2009-07-21 02:00:14.000000000 -0400
+++ xf86-video-intel-2.8.0/src/ch7017/ch7017.c 2009-07-21 12:34:56.000000000 -0400
@@ -40,7 +40,7 @@
#include "xf86i2c.h"
#include "xf86Crtc.h"
#define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
#include "../i2c_vid.h"
#include "ch7017_reg.h"
diff -up xf86-video-intel-2.8.0/src/ch7xxx/ch7xxx.c.jx xf86-video-intel-2.8.0/src/ch7xxx/ch7xxx.c
--- xf86-video-intel-2.8.0/src/ch7xxx/ch7xxx.c.jx 2009-07-21 02:00:14.000000000 -0400
+++ xf86-video-intel-2.8.0/src/ch7xxx/ch7xxx.c 2009-07-21 12:35:38.000000000 -0400
@@ -40,7 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
#include "xf86i2c.h"
#include "xf86Crtc.h"
#define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
#include "../i2c_vid.h"
#include "ch7xxx.h"
diff -up xf86-video-intel-2.8.0/src/ivch/ivch.c.jx xf86-video-intel-2.8.0/src/ivch/ivch.c
--- xf86-video-intel-2.8.0/src/ivch/ivch.c.jx 2009-07-21 02:00:14.000000000 -0400
+++ xf86-video-intel-2.8.0/src/ivch/ivch.c 2009-07-21 12:36:00.000000000 -0400
@@ -37,7 +37,7 @@
#include "xf86i2c.h"
#include "xf86Crtc.h"
#define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
#include <unistd.h>
#include "../i2c_vid.h"
diff -up xf86-video-intel-2.8.0/src/sil164/sil164.c.jx xf86-video-intel-2.8.0/src/sil164/sil164.c
--- xf86-video-intel-2.8.0/src/sil164/sil164.c.jx 2009-07-21 02:00:14.000000000 -0400
+++ xf86-video-intel-2.8.0/src/sil164/sil164.c 2009-07-21 12:36:00.000000000 -0400
@@ -41,7 +41,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
#include "xf86i2c.h"
#include "xf86Crtc.h"
#define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
#include "../i2c_vid.h"
#include "sil164.h"
diff -up xf86-video-intel-2.8.0/src/tfp410/tfp410.c.jx xf86-video-intel-2.8.0/src/tfp410/tfp410.c
--- xf86-video-intel-2.8.0/src/tfp410/tfp410.c.jx 2009-07-21 02:00:14.000000000 -0400
+++ xf86-video-intel-2.8.0/src/tfp410/tfp410.c 2009-07-21 12:36:00.000000000 -0400
@@ -40,7 +40,7 @@
#include "xf86i2c.h"
#include "xf86Crtc.h"
#define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
#include "../i2c_vid.h"
#include "tfp410.h"
intel-chip-names.patch:
i810_driver.c | 12 ++++++------
i830_driver.c | 24 ++++++++++++------------
2 files changed, 18 insertions(+), 18 deletions(-)
--- NEW FILE intel-chip-names.patch ---
diff -up xf86-video-intel-2.8.0/src/i810_driver.c.names xf86-video-intel-2.8.0/src/i810_driver.c
--- xf86-video-intel-2.8.0/src/i810_driver.c.names 2009-06-12 20:05:25.000000000 -0400
+++ xf86-video-intel-2.8.0/src/i810_driver.c 2009-07-21 13:12:59.000000000 -0400
@@ -175,8 +175,8 @@ static SymTabRec I810Chipsets[] = {
{PCI_CHIP_I945_G, "945G"},
{PCI_CHIP_I945_GM, "945GM"},
{PCI_CHIP_I945_GME, "945GME"},
- {PCI_CHIP_IGD_GM, "IGD_GM"},
- {PCI_CHIP_IGD_G, "IGD_G"},
+ {PCI_CHIP_IGD_GM, "Pineview GM"},
+ {PCI_CHIP_IGD_G, "Pineview G"},
{PCI_CHIP_I965_G, "965G"},
{PCI_CHIP_G35_G, "G35"},
{PCI_CHIP_I965_Q, "965Q"},
@@ -186,13 +186,13 @@ static SymTabRec I810Chipsets[] = {
{PCI_CHIP_G33_G, "G33"},
{PCI_CHIP_Q35_G, "Q35"},
{PCI_CHIP_Q33_G, "Q33"},
- {PCI_CHIP_GM45_GM, "Mobile Intel® GM45 Express Chipset"},
- {PCI_CHIP_IGD_E_G, "Intel Integrated Graphics Device"},
+ {PCI_CHIP_GM45_GM, "GM45"},
+ {PCI_CHIP_IGD_E_G, "4 Series"},
{PCI_CHIP_G45_G, "G45/G43"},
{PCI_CHIP_Q45_G, "Q45/Q43"},
{PCI_CHIP_G41_G, "G41"},
- {PCI_CHIP_IGDNG_D_G, "IGDNG_D"},
- {PCI_CHIP_IGDNG_M_G, "IGDNG_M"},
+ {PCI_CHIP_IGDNG_D_G, "Clarkdale"},
+ {PCI_CHIP_IGDNG_M_G, "Arrandale"},
{-1, NULL}
};
diff -up xf86-video-intel-2.8.0/src/i830_driver.c.names xf86-video-intel-2.8.0/src/i830_driver.c
--- xf86-video-intel-2.8.0/src/i830_driver.c.names 2009-07-21 12:37:18.000000000 -0400
+++ xf86-video-intel-2.8.0/src/i830_driver.c 2009-07-21 13:12:57.000000000 -0400
@@ -102,8 +102,8 @@ static SymTabRec I830Chipsets[] = {
{PCI_CHIP_I945_G, "945G"},
{PCI_CHIP_I945_GM, "945GM"},
{PCI_CHIP_I945_GME, "945GME"},
- {PCI_CHIP_IGD_GM, "IGD"},
- {PCI_CHIP_IGD_G, "IGD"},
+ {PCI_CHIP_IGD_GM, "Pineview GM"},
+ {PCI_CHIP_IGD_G, "Pineview G"},
{PCI_CHIP_I965_G, "965G"},
{PCI_CHIP_G35_G, "G35"},
{PCI_CHIP_I965_Q, "965Q"},
@@ -113,13 +113,13 @@ static SymTabRec I830Chipsets[] = {
{PCI_CHIP_G33_G, "G33"},
{PCI_CHIP_Q35_G, "Q35"},
{PCI_CHIP_Q33_G, "Q33"},
- {PCI_CHIP_GM45_GM, "Mobile Intel® GM45 Express Chipset"},
- {PCI_CHIP_IGD_E_G, "Intel Integrated Graphics Device"},
+ {PCI_CHIP_GM45_GM, "GM45"},
+ {PCI_CHIP_IGD_E_G, "4 Series"},
{PCI_CHIP_G45_G, "G45/G43"},
{PCI_CHIP_Q45_G, "Q45/Q43"},
{PCI_CHIP_G41_G, "G41"},
- {PCI_CHIP_IGDNG_D_G, "IGDNG_D"},
- {PCI_CHIP_IGDNG_M_G, "IGDNG_M"},
+ {PCI_CHIP_IGDNG_D_G, "Clarkdale"},
+ {PCI_CHIP_IGDNG_M_G, "Arrandale"},
{-1, NULL}
};
@@ -1051,10 +1051,10 @@ i830_detect_chipset(ScrnInfoPtr pScrn)
chipname = "945GME";
break;
case PCI_CHIP_IGD_GM:
- chipname = "IGD";
+ chipname = "Pineview GM";
break;
case PCI_CHIP_IGD_G:
- chipname = "IGD";
+ chipname = "Pineview G";
break;
case PCI_CHIP_I965_G:
chipname = "965G";
@@ -1084,10 +1084,10 @@ i830_detect_chipset(ScrnInfoPtr pScrn)
chipname = "Q33";
break;
case PCI_CHIP_GM45_GM:
- chipname = "Mobile Intel® GM45 Express Chipset";
+ chipname = "GM45";
break;
case PCI_CHIP_IGD_E_G:
- chipname = "Intel Integrated Graphics Device";
+ chipname = "4 Series";
break;
case PCI_CHIP_G45_G:
chipname = "G45/G43";
@@ -1099,10 +1099,10 @@ i830_detect_chipset(ScrnInfoPtr pScrn)
chipname = "G41";
break;
case PCI_CHIP_IGDNG_D_G:
- chipname = "IGDNG_D";
+ chipname = "Clarkdale";
break;
case PCI_CHIP_IGDNG_M_G:
- chipname = "IGDNG_M";
+ chipname = "Arrandale";
break;
default:
chipname = "unknown chipset";
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 14 Jul 2009 14:15:12 -0000 1.5
+++ .cvsignore 21 Jul 2009 17:33:43 -0000 1.6
@@ -3,3 +3,4 @@ intel-gpu-tools-20090624.tar.bz2
xf86-video-intel-20090624.tar.bz2
intel-gpu-tools-20090714.tar.bz2
xf86-video-intel-20090714.tar.bz2
+xf86-video-intel-2.8.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 14 Jul 2009 14:15:12 -0000 1.6
+++ sources 21 Jul 2009 17:33:44 -0000 1.7
@@ -1,2 +1,2 @@
9a71381224168221894ec723bf6a98e0 intel-gpu-tools-20090714.tar.bz2
-113887c4aed49f05647e351055051d8b xf86-video-intel-20090714.tar.bz2
+15a390fe3e126e954ed95aeb8bc02196 xf86-video-intel-2.8.0.tar.bz2
Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xorg-x11-drv-intel.spec 15 Jul 2009 13:18:34 -0000 1.16
+++ xorg-x11-drv-intel.spec 21 Jul 2009 17:33:44 -0000 1.17
@@ -3,19 +3,19 @@
%define moduledir %(pkg-config xorg-server --variable=moduledir )
%define driverdir %{moduledir}/drivers
%define gputoolsdate 20090714
-%define gitdate 20090714
+#define gitdate 20090714
Summary: Xorg X11 Intel video driver
Name: xorg-x11-drv-intel
Version: 2.8.0
-Release: 0.3%{?dist}
+Release: 1%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2
-Source0: xf86-video-intel-%{gitdate}.tar.bz2
+Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2
+#Source0: xf86-video-intel-%{gitdate}.tar.bz2
Source1: make-intel-gpu-tools-snapshot.sh
Source2: intel.xinf
Source3: intel-gpu-tools-%{gputoolsdate}.tar.bz2
@@ -23,10 +23,13 @@ Source4: make-git-snapshot.sh
Patch1: kill-svideo.patch
Patch2: copy-fb.patch
+Patch3: intel-2.8.0-build-fix.patch
# needs to be upstreamed
Patch20: intel-2.8.0-kms-get-crtc.patch
+Patch30: intel-chip-names.patch
+
ExclusiveArch: %{ix86} x86_64 ia64
BuildRequires: autoconf automake libtool
@@ -64,11 +67,19 @@ Group: Development/Tools
%description -n intel-gpu-tools
Debugging tools for Intel graphics chips
+%if 0%{?gitdate}
+%define dirsuffix %{gitdate}
+%else
+%define dirsuffix %{version}
+%endif
+
%prep
-%setup -q -n xf86-video-intel-%{gitdate} -b3
+%setup -q -n xf86-video-intel-%{dirsuffix} -b3
%patch1 -p1 -b .svideo
%patch2 -p1 -b .copy-fb
+%patch3 -p1 -b .xext
%patch20 -p1 -b .get-crtc
+%patch30 -p1 -b .names
%build
@@ -124,6 +135,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/intel_*.1*
%changelog
+* Tue Jul 21 2009 Adam Jackson <ajax at redhat.com> 2.8.0-1
+- intel 2.8.0
+- Fix chip names to match pci.ids where no official product name is known.
+
* Wed Jul 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.8.0-0.3
- Rebuild for new API
- Previous message (by thread): rpms/xorg-x11-server/devel .cvsignore, 1.63, 1.64 commitid, 1.26, 1.27 sources, 1.58, 1.59 xorg-x11-server.spec, 1.448, 1.449
- Next message (by thread): rpms/redhat-rpm-config/devel redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch, NONE, 1.1 redhat-rpm-config.spec, 1.65, 1.66
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list