rpms/xorg-x11-drv-i810/devel .cvsignore, 1.23, 1.24 sources, 1.24, 1.25 xorg-x11-drv-i810.spec, 1.67, 1.68 i810-1.6.5-to-git-20060911.patch, 1.1, NONE i810-match-server-sync-ranges.patch, 1.1, NONE i965-xv-hang-fix.patch, 1.1, NONE intel-2.1.1-fix-texoffset-start.patch, 1.1, NONE intel-2.1.1-quirk-update.patch, 1.1, NONE
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Wed Nov 14 00:41:34 UTC 2007
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30544/devel
Modified Files:
.cvsignore sources xorg-x11-drv-i810.spec
Removed Files:
i810-1.6.5-to-git-20060911.patch
i810-match-server-sync-ranges.patch i965-xv-hang-fix.patch
intel-2.1.1-fix-texoffset-start.patch
intel-2.1.1-quirk-update.patch
Log Message:
2.1.99, drop i810, require xserver 1.4.99.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 14 Aug 2007 12:23:19 -0000 1.23
+++ .cvsignore 14 Nov 2007 00:41:00 -0000 1.24
@@ -1,3 +1 @@
-xf86-video-i810-1.6.5.tar.bz2
-xf86-video-intel-2.0.0.tar.bz2
-xf86-video-intel-2.1.1.tar.bz2
+xf86-video-intel-2.1.99.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 14 Aug 2007 12:23:19 -0000 1.24
+++ sources 14 Nov 2007 00:41:00 -0000 1.25
@@ -1,2 +1 @@
-fc1e0da3430551bf25a7babf7ccfd3bf xf86-video-i810-1.6.5.tar.bz2
-a645aa1a8e1e6031e1f817d2cda9db1d xf86-video-intel-2.1.1.tar.bz2
+5c5b1c48eaaca973a6ad1a9773ce0688 xf86-video-intel-2.1.99.tar.bz2
Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- xorg-x11-drv-i810.spec 17 Oct 2007 00:42:22 -0000 1.67
+++ xorg-x11-drv-i810.spec 14 Nov 2007 00:41:00 -0000 1.68
@@ -1,87 +1,63 @@
-%define tarball xf86-video-i810
%define moduledir %(pkg-config xorg-server --variable=moduledir )
%define driverdir %{moduledir}/drivers
-%define legacy_version 1.6.5
-
-Summary: Xorg X11 i810 video driver(s)
+Summary: Xorg X11 Intel video driver(s)
Name: xorg-x11-drv-i810
-Version: 2.1.1
-Release: 7%{?dist}
+Version: 2.1.99
+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: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{legacy_version}.tar.bz2
-Source1: xf86-video-intel-%{version}.tar.bz2
+Source0: xf86-video-intel-%{version}.tar.bz2
Source2: i810.xinf
# new school intel driver patches
-Patch0: intel-2.1.1-fix-texoffset-start.patch
-Patch1: intel-2.1.1-quirk-update.patch
Patch2: intel-2.1.1-fix-vt-switch.patch
Patch3: intel-2.1.1-fix-xv-reset.patch
Patch4: intel-2.1.1-fix-xv-compiz.patch
-# legacy i810 driver patches
-Patch100: i810-1.6.5-to-git-20060911.patch
-Patch101: i810-match-server-sync-ranges.patch
-Patch1000: i965-xv-hang-fix.patch
-
ExclusiveArch: %{ix86} x86_64 ia64
BuildRequires: autoconf automake libtool
-BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
+BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
BuildRequires: libXvMC-devel
BuildRequires: mesa-libGL-devel >= 6.5-9
BuildRequires: libdrm-devel >= 2.0-1
Requires: hwdata
-Requires: xorg-x11-server-Xorg >= 1.3.0.0-6
+Requires: xorg-x11-server-Xorg >= 1.4.99.1
Conflicts: kudzu < 1.2.42-1
%description
-X.Org X11 i810 video driver.
+X.Org X11 Intel video driver.
%package devel
-Summary: Xorg X11 i810 video driver XvMC development package
+Summary: Xorg X11 Intel video driver XvMC development package
Group: Development/System
Requires: %{name} = %{version}-%{release}
-Provides: xorg-x11-drv-intel = %{version}-%{release}
+Provides: xorg-x11-drv-intel-devel = %{version}-%{release}
%description devel
-X.Org X11 i810 video driver XvMC development package.
+X.Org X11 Intel video driver XvMC development package.
%prep
-%setup -q -n %{tarball}-%{legacy_version}
-
-%patch100 -p2 -b .i810-git-20060911
-%patch101 -p2 -b .server-ranges
-%patch1000 -p2 -b .965-xv
-
-cd ..
-rm -rf xf86-video-intel-%{version}
-tar jxf %{SOURCE1}
-cd xf86-video-intel-%{version}
-
-%patch0 -p1 -b .texoffsetstart
-%patch1 -p1 -b .quirk-update
-%patch2 -p1 -b .vtswitch
+%setup -q -n xf86-video-intel-%{version}
+# XXX rebase me plz
+#patch2 -p1 -b .vtswitch
%patch3 -p1 -b .xvfix
-%patch4 -p1 -b .xv-compiz
+#patch4 -p1 -b .xv-compiz
%build
-OPTS="--disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri"
-./configure ${OPTS} && make || exit 1
-cd ../xf86-video-intel-%{version} && ./configure ${OPTS} && make && cd - || exit 1
+%configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri
+make
%install
rm -rf $RPM_BUILD_ROOT
-cd ../xf86-video-intel-%{version} && make install DESTDIR=$RPM_BUILD_ROOT && cd - || exit 1
-make install DESTDIR=$RPM_BUILD_ROOT || exit 1
+make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
@@ -113,6 +89,11 @@
%{_libdir}/libI810XvMC.so
%changelog
+* Tue Nov 13 2007 Adam Jackson <ajax at redhat.com> 2.1.99-1
+- xf86-video-intel 2.1.99.
+- Drop the i810 driver. Time to move on.
+- Require xserver 1.4.99.1
+
* Wed Oct 17 2007 Dave Airlie <airlied at redhat.com> 2.1.1-7
- intel-2.1.1-fix-xv-compiz.patch - update to not crash is we can't get RAM
--- i810-1.6.5-to-git-20060911.patch DELETED ---
--- i810-match-server-sync-ranges.patch DELETED ---
--- i965-xv-hang-fix.patch DELETED ---
--- intel-2.1.1-fix-texoffset-start.patch DELETED ---
--- intel-2.1.1-quirk-update.patch DELETED ---
More information about the fedora-extras-commits
mailing list