Hello community,
here is the log from the commit of package xorg-x11-driver-video-intel-legacy for openSUSE:Factory
checked in at Tue Feb 15 17:10:58 CET 2011.
--------
--- xorg-x11-driver-video-intel-legacy/xorg-x11-driver-video-intel-legacy.changes 2010-11-12 14:20:50.000000000 +0100
+++ xorg-x11-driver-video-intel-legacy/xorg-x11-driver-video-intel-legacy.changes 2011-02-14 18:28:35.000000000 +0100
@@ -1,0 +2,13 @@
+Mon Feb 14 17:25:32 UTC 2011 - mhopf@novell.com
+
+- xorg-server-1.9.diff:
+ Fix intel-legacy for Xserver 1.9 (bnc#671140)
+- xf86-video-intel-2.9.1-legacy.patch:
+ Update to be applied w/o fuzz due to above changes.
+
+-------------------------------------------------------------------
+Fri Nov 12 19:38:51 UTC 2010 - sndirsch@novell.com
+
+- fixed build on SLE11-SP1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video-intel-legacy.spec ++++++
--- /var/tmp/diff_new_pack.Sy3qw2/_old 2011-02-15 17:10:11.000000000 +0100
+++ /var/tmp/diff_new_pack.Sy3qw2/_new 2011-02-15 17:10:11.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package xorg-x11-driver-video-intel-legacy (Version 2.9.1)
+# spec file for package xorg-x11-driver-video-intel-legacy
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Guido Berhoerster.
#
# All modifications and additions to the file contributed by third parties
@@ -25,7 +25,7 @@
Group: System/X11/Servers/XF86_4
AutoReqProv: on
Version: 2.9.1
-Release: 4
+Release: 5
Summary: Legacy Version of the Intel X.Org Driver
Requires: xorg-x11-server
Supplements: xorg-x11-server
@@ -66,7 +66,11 @@
make %{?jobs:-j%jobs}
%install
+%if 0%{suse_version} > 1110
%make_install
+%else
+make install DESTDIR=%{buildroot}
+%endif
rm -f %{buildroot}%{_bindir}/*
%post -p /sbin/ldconfig
++++++ xf86-video-intel-2.9.1-legacy.patch ++++++
--- /var/tmp/diff_new_pack.Sy3qw2/_old 2011-02-15 17:10:11.000000000 +0100
+++ /var/tmp/diff_new_pack.Sy3qw2/_new 2011-02-15 17:10:11.000000000 +0100
@@ -1,6 +1,7 @@
-diff -urN xf86-video-intel-2.9.1.orig/configure.ac xf86-video-intel-2.9.1/configure.ac
---- xf86-video-intel-2.9.1.orig/configure.ac 2009-10-26 12:53:04.000000000 +0100
-+++ xf86-video-intel-2.9.1/configure.ac 2010-05-08 19:33:54.000000000 +0200
+Index: xf86-video-intel-2.9.1/configure.ac
+===================================================================
+--- xf86-video-intel-2.9.1.orig/configure.ac
++++ xf86-video-intel-2.9.1/configure.ac
@@ -21,7 +21,7 @@
# Process this file with autoconf to produce a configure script
@@ -10,7 +11,7 @@
2.9.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-intel)
-@@ -181,7 +181,7 @@
+@@ -181,7 +181,7 @@ AC_SUBST([XORG_CFLAGS])
AC_SUBST([WARN_CFLAGS])
AC_SUBST([moduledir])
@@ -19,9 +20,10 @@
AC_SUBST([DRIVER_NAME])
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1.3 or later before running autoconf/autogen])])
-diff -urN xf86-video-intel-2.9.1.orig/man/Makefile.am xf86-video-intel-2.9.1/man/Makefile.am
---- xf86-video-intel-2.9.1.orig/man/Makefile.am 2009-09-21 23:32:42.000000000 +0200
-+++ xf86-video-intel-2.9.1/man/Makefile.am 2010-05-08 21:52:49.000000000 +0200
+Index: xf86-video-intel-2.9.1/man/Makefile.am
+===================================================================
+--- xf86-video-intel-2.9.1.orig/man/Makefile.am
++++ xf86-video-intel-2.9.1/man/Makefile.am
@@ -27,7 +27,7 @@
drivermandir = $(DRIVER_MAN_DIR)
driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX)
@@ -31,7 +33,7 @@
CLEANFILES = $(driverman_DATA)
-@@ -47,7 +47,5 @@
+@@ -47,7 +47,5 @@ MAN_SUBSTS = \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
@@ -40,10 +42,11 @@
-.man.$(DRIVER_MAN_SUFFIX):
+$(DRIVER_NAME).$(DRIVER_MAN_SUFFIX): intel.man
sed $(MAN_SUBSTS) < $< > $@
-diff -urN xf86-video-intel-2.9.1.orig/src/ch7017/ch7017_module.c xf86-video-intel-2.9.1/src/ch7017/ch7017_module.c
---- xf86-video-intel-2.9.1.orig/src/ch7017/ch7017_module.c 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/ch7017/ch7017_module.c 2010-05-08 20:52:02.000000000 +0200
-@@ -12,7 +12,7 @@
+Index: xf86-video-intel-2.9.1/src/ch7017/ch7017_module.c
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/ch7017/ch7017_module.c
++++ xf86-video-intel-2.9.1/src/ch7017/ch7017_module.c
+@@ -12,7 +12,7 @@ static MODULESETUPPROTO(ch7017Setup);
static XF86ModuleVersionInfo ch7017VersRec =
{
@@ -52,7 +55,7 @@
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
-@@ -24,7 +24,7 @@
+@@ -24,7 +24,7 @@ static XF86ModuleVersionInfo ch7017VersR
{ 0,0,0,0 }
};
@@ -61,9 +64,10 @@
&ch7017VersRec,
ch7017Setup,
NULL
-diff -urN xf86-video-intel-2.9.1.orig/src/ch7017/Makefile.am xf86-video-intel-2.9.1/src/ch7017/Makefile.am
---- xf86-video-intel-2.9.1.orig/src/ch7017/Makefile.am 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/ch7017/Makefile.am 2010-05-08 19:30:56.000000000 +0200
+Index: xf86-video-intel-2.9.1/src/ch7017/Makefile.am
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/ch7017/Makefile.am
++++ xf86-video-intel-2.9.1/src/ch7017/Makefile.am
@@ -6,11 +6,11 @@
AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
@PCIACCESS_CFLAGS@
@@ -80,10 +84,11 @@
ch7017.c \
ch7017_module.c \
ch7017_reg.h
-diff -urN xf86-video-intel-2.9.1.orig/src/ch7xxx/ch7xxx.c xf86-video-intel-2.9.1/src/ch7xxx/ch7xxx.c
---- xf86-video-intel-2.9.1.orig/src/ch7xxx/ch7xxx.c 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/ch7xxx/ch7xxx.c 2010-05-08 20:56:13.000000000 +0200
-@@ -311,7 +311,7 @@
+Index: xf86-video-intel-2.9.1/src/ch7xxx/ch7xxx.c
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/ch7xxx/ch7xxx.c
++++ xf86-video-intel-2.9.1/src/ch7xxx/ch7xxx.c
+@@ -311,7 +311,7 @@ ch7xxx_restore(I2CDevPtr d)
ch7xxx_write(dev_priv, CH7xxx_PM, dev_priv->save_PM);
}
@@ -92,9 +97,10 @@
.init = ch7xxx_init,
.detect = ch7xxx_detect,
.mode_valid = ch7xxx_mode_valid,
-diff -urN xf86-video-intel-2.9.1.orig/src/ch7xxx/ch7xxx_module.c xf86-video-intel-2.9.1/src/ch7xxx/ch7xxx_module.c
---- xf86-video-intel-2.9.1.orig/src/ch7xxx/ch7xxx_module.c 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/ch7xxx/ch7xxx_module.c 2010-05-08 20:51:47.000000000 +0200
+Index: xf86-video-intel-2.9.1/src/ch7xxx/ch7xxx_module.c
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/ch7xxx/ch7xxx_module.c
++++ xf86-video-intel-2.9.1/src/ch7xxx/ch7xxx_module.c
@@ -11,7 +11,7 @@
static MODULESETUPPROTO(ch7xxxSetup);
@@ -104,7 +110,7 @@
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
-@@ -23,7 +23,7 @@
+@@ -23,7 +23,7 @@ static XF86ModuleVersionInfo ch7xxxVersR
{ 0,0,0,0 }
};
@@ -113,9 +119,10 @@
&ch7xxxVersRec,
ch7xxxSetup,
NULL
-diff -urN xf86-video-intel-2.9.1.orig/src/ch7xxx/Makefile.am xf86-video-intel-2.9.1/src/ch7xxx/Makefile.am
---- xf86-video-intel-2.9.1.orig/src/ch7xxx/Makefile.am 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/ch7xxx/Makefile.am 2010-05-08 19:29:28.000000000 +0200
+Index: xf86-video-intel-2.9.1/src/ch7xxx/Makefile.am
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/ch7xxx/Makefile.am
++++ xf86-video-intel-2.9.1/src/ch7xxx/Makefile.am
@@ -6,11 +6,11 @@
AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
@PCIACCESS_CFLAGS@
@@ -132,10 +139,11 @@
ch7xxx.c \
ch7xxx_module.c \
ch7xxx.h \
-diff -urN xf86-video-intel-2.9.1.orig/src/i810_driver.c xf86-video-intel-2.9.1/src/i810_driver.c
---- xf86-video-intel-2.9.1.orig/src/i810_driver.c 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/i810_driver.c 2010-05-08 20:52:34.000000000 +0200
-@@ -298,7 +298,7 @@
+Index: xf86-video-intel-2.9.1/src/i810_driver.c
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/i810_driver.c
++++ xf86-video-intel-2.9.1/src/i810_driver.c
+@@ -298,7 +298,7 @@ int I830EntityIndex = -1;
static MODULESETUPPROTO(i810Setup);
static XF86ModuleVersionInfo intelVersRec = {
@@ -144,7 +152,7 @@
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
-@@ -310,7 +310,7 @@
+@@ -310,7 +310,7 @@ static XF86ModuleVersionInfo intelVersRe
{0, 0, 0, 0}
};
@@ -153,11 +161,12 @@
static pointer
i810Setup(pointer module, pointer opts, int *errmaj, int *errmin)
-diff -urN xf86-video-intel-2.9.1.orig/src/i810.h xf86-video-intel-2.9.1/src/i810.h
---- xf86-video-intel-2.9.1.orig/src/i810.h 2009-09-21 23:32:42.000000000 +0200
-+++ xf86-video-intel-2.9.1/src/i810.h 2010-05-08 21:00:50.000000000 +0200
-@@ -65,8 +65,8 @@
- #include "i810_ring.h"
+Index: xf86-video-intel-2.9.1/src/i810.h
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/i810.h
++++ xf86-video-intel-2.9.1/src/i810.h
+@@ -70,8 +70,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #define Xrealloc realloc
#define I810_VERSION 4000
-#define I810_NAME "intel"
@@ -167,10 +176,11 @@
#define INTEL_VERSION_MAJOR PACKAGE_VERSION_MAJOR
#define INTEL_VERSION_MINOR PACKAGE_VERSION_MINOR
-diff -urN xf86-video-intel-2.9.1.orig/src/i830_dvo.c xf86-video-intel-2.9.1/src/i830_dvo.c
---- xf86-video-intel-2.9.1.orig/src/i830_dvo.c 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/i830_dvo.c 2010-05-08 21:03:17.000000000 +0200
-@@ -43,35 +43,35 @@
+Index: xf86-video-intel-2.9.1/src/i830_dvo.c
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/i830_dvo.c
++++ xf86-video-intel-2.9.1/src/i830_dvo.c
+@@ -43,35 +43,35 @@ static struct _I830DVODriver i830_dvo_dr
{
{
.type = I830_OUTPUT_DVO_TMDS,
@@ -214,7 +224,7 @@
.fntablename = "ch7017_methods",
.dvo_reg = DVOC,
.address = 0xea,
-@@ -423,7 +423,7 @@
+@@ -423,7 +423,7 @@ i830_dvo_init(ScrnInfoPtr pScrn)
ret_ptr = NULL;
drv->vid_rec = LoaderSymbol(drv->fntablename);
@@ -223,9 +233,10 @@
pI830->quirk_flag & QUIRK_IVCH_NEED_DVOB) {
drv->dvo_reg = DVOB;
}
-diff -urN xf86-video-intel-2.9.1.orig/src/ivch/ivch_module.c xf86-video-intel-2.9.1/src/ivch/ivch_module.c
---- xf86-video-intel-2.9.1.orig/src/ivch/ivch_module.c 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/ivch/ivch_module.c 2010-05-08 20:52:20.000000000 +0200
+Index: xf86-video-intel-2.9.1/src/ivch/ivch_module.c
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/ivch/ivch_module.c
++++ xf86-video-intel-2.9.1/src/ivch/ivch_module.c
@@ -39,7 +39,7 @@
static MODULESETUPPROTO(ivch_setup);
@@ -235,7 +246,7 @@
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
-@@ -51,7 +51,7 @@
+@@ -51,7 +51,7 @@ static XF86ModuleVersionInfo ivch_versio
{ 0,0,0,0 }
};
@@ -244,9 +255,10 @@
&ivch_version,
ivch_setup,
NULL
-diff -urN xf86-video-intel-2.9.1.orig/src/ivch/Makefile.am xf86-video-intel-2.9.1/src/ivch/Makefile.am
---- xf86-video-intel-2.9.1.orig/src/ivch/Makefile.am 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/ivch/Makefile.am 2010-05-08 19:30:32.000000000 +0200
+Index: xf86-video-intel-2.9.1/src/ivch/Makefile.am
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/ivch/Makefile.am
++++ xf86-video-intel-2.9.1/src/ivch/Makefile.am
@@ -6,11 +6,11 @@
AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
@PCIACCESS_CFLAGS@
@@ -263,10 +275,11 @@
ivch.c \
ivch_module.c \
ivch_reg.h
-diff -urN xf86-video-intel-2.9.1.orig/src/Makefile.am xf86-video-intel-2.9.1/src/Makefile.am
---- xf86-video-intel-2.9.1.orig/src/Makefile.am 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/Makefile.am 2010-05-08 21:28:35.000000000 +0200
-@@ -29,11 +29,11 @@
+Index: xf86-video-intel-2.9.1/src/Makefile.am
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/Makefile.am
++++ xf86-video-intel-2.9.1/src/Makefile.am
+@@ -29,11 +29,11 @@ SUBDIRS = xvmc bios_reader ch7017 ch7xxx
AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
@PCIACCESS_CFLAGS@ -I$(top_srcdir)/uxa -I$(top_srcdir)/src/render_program
@@ -283,7 +296,7 @@
INTEL_DRI_SRCS = \
i810_dri.c \
-@@ -51,7 +51,7 @@
+@@ -51,7 +51,7 @@ INTEL_XVMC_SRCS = \
i965_hwmc.h
@@ -292,7 +305,7 @@
brw_defines.h \
brw_structs.h \
common.h \
-@@ -116,13 +116,13 @@
+@@ -116,13 +116,13 @@ EXTRA_DIST = \
$(INTEL_XVMC_SRCS)
if DRI
@@ -309,9 +322,10 @@
+intellegacy_drv_la_SOURCES += \
$(INTEL_XVMC_SRCS)
endif
-diff -urN xf86-video-intel-2.9.1.orig/src/sil164/Makefile.am xf86-video-intel-2.9.1/src/sil164/Makefile.am
---- xf86-video-intel-2.9.1.orig/src/sil164/Makefile.am 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/sil164/Makefile.am 2010-05-08 19:29:59.000000000 +0200
+Index: xf86-video-intel-2.9.1/src/sil164/Makefile.am
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/sil164/Makefile.am
++++ xf86-video-intel-2.9.1/src/sil164/Makefile.am
@@ -6,11 +6,11 @@
AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
@PCIACCESS_CFLAGS@
@@ -328,10 +342,11 @@
sil164.c \
sil164_module.c \
sil164.h \
-diff -urN xf86-video-intel-2.9.1.orig/src/sil164/sil164.c xf86-video-intel-2.9.1/src/sil164/sil164.c
---- xf86-video-intel-2.9.1.orig/src/sil164/sil164.c 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/sil164/sil164.c 2010-05-08 20:56:37.000000000 +0200
-@@ -258,7 +258,7 @@
+Index: xf86-video-intel-2.9.1/src/sil164/sil164.c
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/sil164/sil164.c
++++ xf86-video-intel-2.9.1/src/sil164/sil164.c
+@@ -258,7 +258,7 @@ sil164_restore(I2CDevPtr d)
}
@@ -340,9 +355,10 @@
.init = sil164_init,
.detect = sil164_detect,
.mode_valid = sil164_mode_valid,
-diff -urN xf86-video-intel-2.9.1.orig/src/sil164/sil164_module.c xf86-video-intel-2.9.1/src/sil164/sil164_module.c
---- xf86-video-intel-2.9.1.orig/src/sil164/sil164_module.c 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/sil164/sil164_module.c 2010-05-08 20:52:49.000000000 +0200
+Index: xf86-video-intel-2.9.1/src/sil164/sil164_module.c
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/sil164/sil164_module.c
++++ xf86-video-intel-2.9.1/src/sil164/sil164_module.c
@@ -13,7 +13,7 @@
static MODULESETUPPROTO(sil164Setup);
@@ -352,7 +368,7 @@
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,7 @@ static XF86ModuleVersionInfo sil164VersR
{ 0,0,0,0 }
};
@@ -361,9 +377,10 @@
&sil164VersRec,
sil164Setup,
NULL
-diff -urN xf86-video-intel-2.9.1.orig/src/tfp410/Makefile.am xf86-video-intel-2.9.1/src/tfp410/Makefile.am
---- xf86-video-intel-2.9.1.orig/src/tfp410/Makefile.am 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/tfp410/Makefile.am 2010-05-08 19:30:15.000000000 +0200
+Index: xf86-video-intel-2.9.1/src/tfp410/Makefile.am
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/tfp410/Makefile.am
++++ xf86-video-intel-2.9.1/src/tfp410/Makefile.am
@@ -6,11 +6,11 @@
AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
@PCIACCESS_CFLAGS@
@@ -380,10 +397,11 @@
tfp410.c \
tfp410_module.c \
tfp410.h \
-diff -urN xf86-video-intel-2.9.1.orig/src/tfp410/tfp410.c xf86-video-intel-2.9.1/src/tfp410/tfp410.c
---- xf86-video-intel-2.9.1.orig/src/tfp410/tfp410.c 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/tfp410/tfp410.c 2010-05-08 20:57:11.000000000 +0200
-@@ -280,7 +280,7 @@
+Index: xf86-video-intel-2.9.1/src/tfp410/tfp410.c
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/tfp410/tfp410.c
++++ xf86-video-intel-2.9.1/src/tfp410/tfp410.c
+@@ -280,7 +280,7 @@ tfp410_restore(I2CDevPtr d)
tfp410WriteByte(tfp, TFP410_CTL_1, tfp->SavedReg.ctl1);
}
@@ -392,9 +410,10 @@
.init = tfp410_init,
.detect = tfp410_detect,
.mode_valid = tfp410_mode_valid,
-diff -urN xf86-video-intel-2.9.1.orig/src/tfp410/tfp410_module.c xf86-video-intel-2.9.1/src/tfp410/tfp410_module.c
---- xf86-video-intel-2.9.1.orig/src/tfp410/tfp410_module.c 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/tfp410/tfp410_module.c 2010-05-08 20:52:42.000000000 +0200
+Index: xf86-video-intel-2.9.1/src/tfp410/tfp410_module.c
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/tfp410/tfp410_module.c
++++ xf86-video-intel-2.9.1/src/tfp410/tfp410_module.c
@@ -13,7 +13,7 @@
static MODULESETUPPROTO(tfp410Setup);
@@ -404,7 +423,7 @@
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,7 @@ static XF86ModuleVersionInfo tfp410VersR
{ 0,0,0,0 }
};
@@ -413,9 +432,10 @@
&tfp410VersRec,
tfp410Setup,
NULL
-diff -urN xf86-video-intel-2.9.1.orig/src/xvmc/Makefile.am xf86-video-intel-2.9.1/src/xvmc/Makefile.am
---- xf86-video-intel-2.9.1.orig/src/xvmc/Makefile.am 2009-10-26 12:48:05.000000000 +0100
-+++ xf86-video-intel-2.9.1/src/xvmc/Makefile.am 2010-05-08 21:28:57.000000000 +0200
+Index: xf86-video-intel-2.9.1/src/xvmc/Makefile.am
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/xvmc/Makefile.am
++++ xf86-video-intel-2.9.1/src/xvmc/Makefile.am
@@ -1,18 +1,18 @@
if XVMC
-lib_LTLIBRARIES=libI810XvMC.la libIntelXvMC.la
@@ -442,7 +462,7 @@
intel_xvmc.h \
intel_xvmc_dump.c \
i915_structs.h \
-@@ -28,7 +28,8 @@
+@@ -28,7 +28,8 @@ libIntelXvMC_la_SOURCES = intel_xvmc.c \
dri2.c \
dri2.h
++++++ xorg-server-1.9.diff ++++++
--- /var/tmp/diff_new_pack.Sy3qw2/_old 2011-02-15 17:10:11.000000000 +0100
+++ /var/tmp/diff_new_pack.Sy3qw2/_new 2011-02-15 17:10:11.000000000 +0100
@@ -1,5 +1,7 @@
---- xf86-video-intel-2.9.1.orig//src/i830_video.c 2010-11-12 13:06:50.000000000 +0000
-+++ xf86-video-intel-2.9.1/src/i830_video.c 2010-11-12 13:13:47.000000000 +0000
+Index: xf86-video-intel-2.9.1/src/i830_video.c
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/i830_video.c
++++ xf86-video-intel-2.9.1/src/i830_video.c
@@ -2207,7 +2207,7 @@ i830_clip_video_helper (ScrnInfoPtr pScr
static void
i830_fill_colorkey (ScreenPtr pScreen, uint32_t key, RegionPtr clipboxes)
@@ -14,7 +16,119 @@
pval[0] = key;
pval[1] = IncludeInferiors;
- (void) ChangeGC(gc, GCForeground|GCSubwindowMode, pval);
-+ (void) ChangeGC(NullClient, gc, GCForeground|GCSubwindowMode, pval);
++ (void) ChangeGCXIDs(NullClient, gc, GCForeground|GCSubwindowMode, pval);
ValidateGC(root, gc);
rects = xalloc (nbox * sizeof(xRectangle));
+Index: xf86-video-intel-2.9.1/src/i2c_vid.h
+===================================================================
+--- xf86-video-intel-2.9.1.orig/src/i2c_vid.h
++++ xf86-video-intel-2.9.1/src/i2c_vid.h
+@@ -24,6 +24,10 @@
+ #define I2C_VID_H
+ #include