|
|
Author: ajackson
Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10648/devel
Modified Files:
.cvsignore sources xorg-x11-drv-i810.spec
Added Files:
intel-945gm-lfp-blacklist.patch intel-driver-rename.patch
Log Message:
auto-import xorg-x11-drv-i810-1.6.4-1.fc6 on branch devel from
xorg-x11-drv-i810-1.6.4-1.fc6.src.rpm
intel-945gm-lfp-blacklist.patch:
i830_driver.c | 12 ++++++++++++
1 files changed, 12 insertions(+)
--- NEW FILE intel-945gm-lfp-blacklist.patch ---
--- xf86-video-intel/src/i830_driver.c.lfp-blacklist 2006-08-08
11:14:35.000000000 -0400
+++ xf86-video-intel/src/i830_driver.c 2006-08-09 18:40:14.000000000 -0400
@@ -1684,6 +1684,18 @@
has_lvds = FALSE;
}
+ /* Blacklist machines with known broken BIOSes */
+ if ((pI830->PciInfo->chipType == PCI_CHIP_I945_GM) &&
+ /* aopen mini-pc */
+ (((pI830->PciInfo->subsysVendor == 0xa0a0) &&
+ (pI830->PciInfo->subsysCard == 0x0589)) ||
+ /* mac mini */
+ ((pI830->PciInfo->subsysVendor == 0x8086) &&
+ (pI830->PciInfo->subsysCard == 0x7270))))
+ {
+ has_lvds = FALSE;
+ }
+
if ((s = xf86GetOptValString(pI830->Options, OPTION_MONITOR_LAYOUT)) &&
I830IsPrimary(pScrn)) {
char *Mon1;
intel-driver-rename.patch:
Makefile.am | 10 +++++-----
i810_driver.c | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE intel-driver-rename.patch ---
--- xf86-video-intel/src/i810_driver.c.driver-rename 2006-08-08
11:14:35.000000000 -0400
+++ xf86-video-intel/src/i810_driver.c 2006-08-09 10:04:49.000000000 -0400
@@ -112,7 +112,7 @@
#endif /* I830_ONLY */
-_X_EXPORT DriverRec I810 = {
+_X_EXPORT DriverRec INTEL = {
I810_VERSION,
I810_DRIVER_NAME,
I810Identify,
@@ -385,7 +385,7 @@
{0, 0, 0, 0}
};
-_X_EXPORT XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, 0 };
+_X_EXPORT XF86ModuleData intelModuleData = { &i810VersRec, i810Setup, 0 };
static pointer
i810Setup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -396,7 +396,7 @@
*/
if (!setupDone) {
setupDone = 1;
- xf86AddDriver(&I810, module, 0);
+ xf86AddDriver(&INTEL, module, 0);
/*
* Tell the loader about symbols from other modules that this module
--- xf86-video-intel/src/Makefile.am.driver-rename 2006-08-08
11:14:35.000000000 -0400
+++ xf86-video-intel/src/Makefile.am 2006-08-09 10:03:40.000000000 -0400
@@ -26,11 +26,11 @@
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DI830_XV
-i810_drv_la_LTLIBRARIES = i810_drv.la
-i810_drv_la_LDFLAGS = -module -avoid-version
-i810_drv_ladir = @moduledir@/drivers
+intel_drv_la_LTLIBRARIES = intel_drv.la
+intel_drv_la_LDFLAGS = -module -avoid-version
+intel_drv_ladir = @moduledir@/drivers
-i810_drv_la_SOURCES = \
+intel_drv_la_SOURCES = \
common.h \
i810_accel.c \
i810_common.h \
@@ -68,7 +68,7 @@
i830_xf86Modes.h \
i830_xf86Modes.c
if DRI
-i810_drv_la_SOURCES += \
+intel_drv_la_SOURCES += \
i810_dri.c \
i810_dri.h \
i830_dri.c \
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 8 Aug 2006 15:31:21 -0000 1.14
+++ .cvsignore 9 Aug 2006 22:49:11 -0000 1.15
@@ -1 +1,2 @@
xf86-video-intel-1.6.0-git-modesetting-20060808.tar.bz2
+xf86-video-i810-1.6.4.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 8 Aug 2006 15:31:21 -0000 1.14
+++ sources 9 Aug 2006 22:49:11 -0000 1.15
@@ -1 +1,2 @@
666c06eedbe560fce410ab2f198bae5d
xf86-video-intel-1.6.0-git-modesetting-20060808.tar.bz2
+56e24a79cccb1d3828de48cb9a7a61b6 xf86-video-i810-1.6.4.tar.bz2
Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xorg-x11-drv-i810.spec 8 Aug 2006 15:31:21 -0000 1.30
+++ xorg-x11-drv-i810.spec 9 Aug 2006 22:49:11 -0000 1.31
@@ -10,21 +10,22 @@
%define gitdate 20060808
-# GIT SNAPSHOT. EATS BABIES.
-Summary: Xorg X11 i810 video driver
+Summary: Xorg X11 i810 video driver(s)
Name: xorg-x11-drv-i810
-Version: 1.6.0
-Release: 14.%{gitdate}modeset%{?dist}
+Version: 1.6.4
+Release: 1%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X Hardware Support
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source0: xf86-video-intel-1.6.0-git-modesetting-%{gitdate}.tar.bz2
-Source1: i810.xinf
+Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1: xf86-video-intel-1.6.0-git-modesetting-%{gitdate}.tar.bz2
+Source2: i810.xinf
Patch0: intel-prune-by-edid-pixclock.patch
+Patch1: intel-driver-rename.patch
+Patch2: intel-945gm-lfp-blacklist.patch
ExclusiveArch: %{ix86} x86_64 ia64
@@ -51,31 +52,33 @@
X.Org X11 i810 video driver XvMC development package.
%prep
-#%setup -q -n %{tarball}-%{version}
-%setup -q -n xf86-video-intel
-%if 0
-%patch0 -p1 -b .edid-pixclock
-%endif
+%setup -q -c %{tarball}-%{version} -a0 -a1
+%patch0 -p0 -b .edid-pixclock
+%patch1 -p0 -b .driver-rename
+%patch2 -p0 -b .lfp-blacklist
%build
-./autogen.sh --disable-static \
- --libdir=%{_libdir} \
- --mandir=%{_mandir} \
%if %{with_dri}
- --enable-dri
+DRI_OPT='--enable-dri'
%else
- --disable-dri
+DRI_OPT='--disable-dri'
%endif
-
-make
+OPTS="--disable-static --libdir=%{_libdir} --mandir=%{_mandir} ${DRI_OPT}"
+cd xf86-video-i810-%{version} && ./configure ${OPTS} && make && cd .. || exit 1
+cd xf86-video-intel && ./autogen.sh ${OPTS} && make && cd .. || exit
1
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+cd xf86-video-intel && make install DESTDIR=$RPM_BUILD_ROOT && cd ..
\
+ || exit 1
+# cheesy manpage fixup
+mv ${RPM_BUILD_ROOT}/usr/share/man/man4/{i810,intel}.4
+cd xf86-video-i810-%{version} && make install DESTDIR=$RPM_BUILD_ROOT && cd ..
\
+ || exit 1
mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
# FIXME: Remove all libtool archives (*.la) from modules directory. This
# should be fixed in upstream Makefile.am or whatever.
@@ -89,6 +92,7 @@
%dir %{moduledir}
%dir %{driverdir}
%{driverdir}/i810_drv.so
+%{driverdir}/intel_drv.so
%{driverdir}/ch7xxx.so
%{driverdir}/sil164.so
%{_datadir}/hwdata/videoaliases/i810.xinf
@@ -96,7 +100,7 @@
%{_libdir}/libI810XvMC.so.1
%{_libdir}/libI810XvMC.so.1.0.0
#%dir %{_mandir}/man4x
-%{_mandir}/man4/i810.4*
+%{_mandir}/man4/i*
%files devel
%defattr(-,root,root,-)
@@ -104,6 +108,13 @@
%{_libdir}/libI810XvMC.so
%changelog
+* Wed Aug 9 2006 Adam Jackson <ajackson@xxxxxxxxxx> 1.6.4-1.fc6
+- Admit defeat, kinda. Package both i810 stable and modesetting drivers.
+ The modesetting driver is installed as intel_drv.so instead of i810_drv.so,
+ and is selected with Driver "intel" in xorg.conf. Individual devices will
+ whitelist over to "intel" until that branch gets merged into head.
+- Update the stable branch driver to 1.6.4 from upstream, adds i965 support.
+
* Tue Aug 8 2006 Adam Jackson <ajackson@xxxxxxxxxx>
1.6.0-14.20060808modeset.fc6
- Today's snapshot: I2C bus creation fix.
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|