Hello community, here is the log from the commit of package xorg-x11-driver-video-intel-legacy for openSUSE:Factory checked in at Fri May 14 00:02:59 CEST 2010. -------- New Changes file: --- /dev/null 2010-05-05 16:06:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-intel-legacy/xorg-x11-driver-video-intel-legacy.changes 2010-05-08 22:35:11.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Fri May 7 18:01:44 UTC 2010 - guido+opensuse.org@berhoerster.name + +- initial packaging of xorg-x11-driver-video-intel-legacy + calling whatdependson for head-i586 New: ---- moblin-2009Q2-rc2-incremental.patch moblin-dump-tools.patch moblin-uxa-Fix-segfault-on-source-only-picture-usage.patch xf86-video-intel-2.9.1-legacy.patch xf86-video-intel-2.9.1-xorg-server-1.7.3-fixes.patch xf86-video-intel-2.9.1.tar.bz2 xf86-video-intel-G33-1mb.diff xf86-video-intel-NoFBC-945GME.diff xf86-video-intel-bfo17988.diff xf86-video-intel-buildfix.diff xorg-x11-driver-video-intel-legacy-rpmlintrc xorg-x11-driver-video-intel-legacy.changes xorg-x11-driver-video-intel-legacy.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video-intel-legacy.spec ++++++ # # spec file for package xorg-x11-driver-video-intel-legacy (Version 2.9.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Guido Berhoerster. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: xorg-x11-driver-video-intel-legacy BuildRequires: Mesa-devel xorg-x11-devel xorg-x11-sdk Url: http://intellinuxgraphics.org/ License: MIT Group: System/X11/Servers/XF86_4 AutoReqProv: on Version: 2.9.1 Release: 1 Summary: Legacy Version of the Intel X.Org Driver Requires: xorg-x11-server Supplements: xorg-x11-server BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: xf86-video-intel-%{version}.tar.bz2 Source100: %{name}-rpmlintrc Patch0: xf86-video-intel-G33-1mb.diff Patch1: xf86-video-intel-NoFBC-945GME.diff Patch2: xf86-video-intel-bfo17988.diff Patch3: moblin-dump-tools.patch Patch4: moblin-2009Q2-rc2-incremental.patch Patch5: moblin-uxa-Fix-segfault-on-source-only-picture-usage.patch Patch6: xf86-video-intel-buildfix.diff Patch7: xf86-video-intel-2.9.1-xorg-server-1.7.3-fixes.patch Patch100: xf86-video-intel-2.9.1-legacy.patch %description This package contains the legacy version of the Intel X.Org driver which does not require KMS. %prep %setup -q -n xf86-video-intel-%version %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p0 %patch7 -p0 %patch100 -p1 %build autoreconf -fi %configure CFLAGS="%optflags -fno-strict-aliasing" make %{?jobs:-j%jobs} %install %make_install rm -f %{buildroot}%{_bindir}/* %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf %{buildroot} %files %defattr(-,root,root) %doc %{_mandir}/man4/intellegacy.4* %{_libdir}/libI810XvMClegacy.la %{_libdir}/libI810XvMClegacy.so %{_libdir}/libI810XvMClegacy.so.1 %{_libdir}/libI810XvMClegacy.so.1.0.0 %{_libdir}/libIntelXvMClegacy.la %{_libdir}/libIntelXvMClegacy.so %{_libdir}/libIntelXvMClegacy.so.1 %{_libdir}/libIntelXvMClegacy.so.1.0.0 %dir %{_libdir}/xorg/modules/drivers %{_libdir}/xorg/modules/drivers/ch7017legacy.la %{_libdir}/xorg/modules/drivers/ch7017legacy.so %{_libdir}/xorg/modules/drivers/ch7xxxlegacy.la %{_libdir}/xorg/modules/drivers/ch7xxxlegacy.so %{_libdir}/xorg/modules/drivers/intellegacy_drv.la %{_libdir}/xorg/modules/drivers/intellegacy_drv.so %{_libdir}/xorg/modules/drivers/ivchlegacy.la %{_libdir}/xorg/modules/drivers/ivchlegacy.so %{_libdir}/xorg/modules/drivers/sil164legacy.la %{_libdir}/xorg/modules/drivers/sil164legacy.so %{_libdir}/xorg/modules/drivers/tfp410legacy.la %{_libdir}/xorg/modules/drivers/tfp410legacy.so %changelog ++++++ moblin-2009Q2-rc2-incremental.patch ++++++ Index: xf86-video-intel-2.8.0/man/intel.man =================================================================== --- xf86-video-intel-2.8.0.orig/man/intel.man +++ xf86-video-intel-2.8.0/man/intel.man @@ -97,6 +97,16 @@ the framerate of applications that rende .IP Default: enabled. .TP +.BI "Option \*qSwapbuffersWait\*q \*q" boolean \*q +This option controls the behavior of glXSwapBuffers and glXCopySubBufferMESA +calls by GL applications. If enabled, the calls will avoid tearing by making +sure the display scanline is outside of the area to be copied before the copy +occurs. If disabled, no scanline synchronization is performed, meaning tearing +will likely occur. Note that when enabled, this option can adversely affect +the framerate of applications that render frames at less than refresh rate. +.IP +Default: enabled. +.TP .BI "Option \*qDRI\*q \*q" boolean \*q Disable or enable DRI support. .IP ++++++ moblin-dump-tools.patch ++++++ Index: xf86-video-intel-2.8.0/src/bios_reader/Makefile.am =================================================================== --- xf86-video-intel-2.8.0.orig/src/bios_reader/Makefile.am +++ xf86-video-intel-2.8.0/src/bios_reader/Makefile.am @@ -1,7 +1,7 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @PCIACCESS_CFLAGS@ \ -DREG_DUMPER -noinst_PROGRAMS = bios_reader $(BIOS_DUMPER) $(SWF_DUMPER) +bin_PROGRAMS = bios_reader $(BIOS_DUMPER) $(SWF_DUMPER) BIOS_DUMPER = bios_dumper Index: xf86-video-intel-2.8.0/src/reg_dumper/Makefile.am =================================================================== --- xf86-video-intel-2.8.0.orig/src/reg_dumper/Makefile.am +++ xf86-video-intel-2.8.0/src/reg_dumper/Makefile.am @@ -1,4 +1,4 @@ -noinst_PROGRAMS = intel_reg_dumper \ +bin_PROGRAMS = intel_reg_dumper \ intel_gtt \ intel_idle \ intel_stepping \ ++++++ moblin-uxa-Fix-segfault-on-source-only-picture-usage.patch ++++++
From 1e4784bf26e3c154f5673f7b5add3ef7af3b1474 Mon Sep 17 00:00:00 2001 From: Eric Anholt
Date: Tue, 30 Jun 2009 19:52:36 -0700 Subject: uxa: Fix segfault on source-only picture usage with FallbackDebug.
Bug #22107. --- uxa/uxa-render.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) Index: xf86-video-intel-2.8.0/uxa/uxa-render.c =================================================================== --- xf86-video-intel-2.8.0.orig/uxa/uxa-render.c +++ xf86-video-intel-2.8.0/uxa/uxa-render.c @@ -49,6 +49,11 @@ static void uxa_composite_fallback_pict_ return; } + if (pict->pDrawable == NULL) { + snprintf(string, n, "source-only"); + return; + } + switch (pict->format) { case PICT_a8r8g8b8: ++++++ xf86-video-intel-2.9.1-legacy.patch ++++++ 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 @@ -21,7 +21,7 @@ # Process this file with autoconf to produce a configure script AC_PREREQ(2.57) -AC_INIT([xf86-video-intel], +AC_INIT([xf86-video-intellegacy], 2.9.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-intel) @@ -181,7 +181,7 @@ AC_SUBST([WARN_CFLAGS]) AC_SUBST([moduledir]) -DRIVER_NAME=intel +DRIVER_NAME=intellegacy 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 @@ -27,7 +27,7 @@ drivermandir = $(DRIVER_MAN_DIR) driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) -EXTRA_DIST = $(DRIVER_NAME).man +EXTRA_DIST = intel.man CLEANFILES = $(driverman_DATA) @@ -47,7 +47,5 @@ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' -SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - -.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 @@ static XF86ModuleVersionInfo ch7017VersRec = { - "ch7017", + "ch7017legacy", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, @@ -24,7 +24,7 @@ { 0,0,0,0 } }; -_X_EXPORT XF86ModuleData ch7017ModuleData = { +_X_EXPORT XF86ModuleData ch7017legacyModuleData = { &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 @@ -6,11 +6,11 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \ @PCIACCESS_CFLAGS@ -ch7017_la_LTLIBRARIES = ch7017.la -ch7017_la_LDFLAGS = -module -avoid-version -ch7017_ladir = @moduledir@/drivers +ch7017legacy_la_LTLIBRARIES = ch7017legacy.la +ch7017legacy_la_LDFLAGS = -module -avoid-version +ch7017legacy_ladir = @moduledir@/drivers -ch7017_la_SOURCES = \ +ch7017legacy_la_SOURCES = \ 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 @@ ch7xxx_write(dev_priv, CH7xxx_PM, dev_priv->save_PM); } -_X_EXPORT I830I2CVidOutputRec CH7xxxVidOutput = { +_X_EXPORT I830I2CVidOutputRec CH7xxxLegacyVidOutput = { .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 @@ -11,7 +11,7 @@ static MODULESETUPPROTO(ch7xxxSetup); static XF86ModuleVersionInfo ch7xxxVersRec = { - "ch7xxx", + "ch7xxxlegacy", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, @@ -23,7 +23,7 @@ { 0,0,0,0 } }; -_X_EXPORT XF86ModuleData ch7xxxModuleData = { +_X_EXPORT XF86ModuleData ch7xxxlegacyModuleData = { &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 @@ -6,11 +6,11 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \ @PCIACCESS_CFLAGS@ -ch7xxx_la_LTLIBRARIES = ch7xxx.la -ch7xxx_la_LDFLAGS = -module -avoid-version -ch7xxx_ladir = @moduledir@/drivers +ch7xxxlegacy_la_LTLIBRARIES = ch7xxxlegacy.la +ch7xxxlegacy_la_LDFLAGS = -module -avoid-version +ch7xxxlegacy_ladir = @moduledir@/drivers -ch7xxx_la_SOURCES = \ +ch7xxxlegacy_la_SOURCES = \ 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 @@ static MODULESETUPPROTO(i810Setup); static XF86ModuleVersionInfo intelVersRec = { - "intel", + "intellegacy", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, @@ -310,7 +310,7 @@ {0, 0, 0, 0} }; -_X_EXPORT XF86ModuleData intelModuleData = { &intelVersRec, i810Setup, NULL }; +_X_EXPORT XF86ModuleData intellegacyModuleData = { &intelVersRec, i810Setup, NULL }; 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" #define I810_VERSION 4000 -#define I810_NAME "intel" -#define I810_DRIVER_NAME "intel" +#define I810_NAME "intellegacy" +#define I810_DRIVER_NAME "intellegacy" #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 @@ { { .type = I830_OUTPUT_DVO_TMDS, - .modulename = "sil164", - .fntablename = "SIL164VidOutput", + .modulename = "sil164legacy", + .fntablename = "SIL164LegacyVidOutput", .dvo_reg = DVOC, .address = (SIL164_ADDR_1<<1), }, { .type = I830_OUTPUT_DVO_TMDS, - .modulename = "ch7xxx", - .fntablename = "CH7xxxVidOutput", + .modulename = "ch7xxxlegacy", + .fntablename = "CH7xxxLegacyVidOutput", .dvo_reg = DVOC, .address = (CH7xxx_ADDR_1<<1), }, { .type = I830_OUTPUT_DVO_LVDS, - .modulename = "ivch", + .modulename = "ivchlegacy", .fntablename = "ivch_methods", .dvo_reg = DVOA, .address = 0x04, /* Might also be 0x44, 0x84, 0xc4 */ }, { .type = I830_OUTPUT_DVO_TMDS, - .modulename = "tfp410", - .fntablename = "TFP410VidOutput", + .modulename = "tfp410legacy", + .fntablename = "TFP410LegacyVidOutput", .dvo_reg = DVOC, .address = (TFP410_ADDR_1<<1), }, { .type = I830_OUTPUT_DVO_LVDS, - .modulename = "ch7017", + .modulename = "ch7017legacy", .fntablename = "ch7017_methods", .dvo_reg = DVOC, .address = 0xea, @@ -423,7 +423,7 @@ ret_ptr = NULL; drv->vid_rec = LoaderSymbol(drv->fntablename); - if (!strcmp(drv->modulename, "ivch") && + if (!strcmp(drv->modulename, "ivchlegacy") && 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 @@ -39,7 +39,7 @@ static MODULESETUPPROTO(ivch_setup); static XF86ModuleVersionInfo ivch_version = { - "ivch", + "ivchlegacy", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, @@ -51,7 +51,7 @@ { 0,0,0,0 } }; -_X_EXPORT XF86ModuleData ivchModuleData = { +_X_EXPORT XF86ModuleData ivchlegacyModuleData = { &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 @@ -6,11 +6,11 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \ @PCIACCESS_CFLAGS@ -ivch_la_LTLIBRARIES = ivch.la -ivch_la_LDFLAGS = -module -avoid-version -ivch_ladir = @moduledir@/drivers +ivchlegacy_la_LTLIBRARIES = ivchlegacy.la +ivchlegacy_la_LDFLAGS = -module -avoid-version +ivchlegacy_ladir = @moduledir@/drivers -ivch_la_SOURCES = \ +ivchlegacy_la_SOURCES = \ 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 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \ @PCIACCESS_CFLAGS@ -I$(top_srcdir)/uxa -I$(top_srcdir)/src/render_program -intel_drv_la_LTLIBRARIES = intel_drv.la -intel_drv_la_LDFLAGS = -module -avoid-version -intel_drv_ladir = @moduledir@/drivers -intel_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la -intel_drv_la_LIBADD += @PCIACCESS_LIBS@ +intellegacy_drv_la_LTLIBRARIES = intellegacy_drv.la +intellegacy_drv_la_LDFLAGS = -module -avoid-version +intellegacy_drv_ladir = @moduledir@/drivers +intellegacy_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la +intellegacy_drv_la_LIBADD += @PCIACCESS_LIBS@ INTEL_DRI_SRCS = \ i810_dri.c \ @@ -51,7 +51,7 @@ i965_hwmc.h -intel_drv_la_SOURCES = \ +intellegacy_drv_la_SOURCES = \ brw_defines.h \ brw_structs.h \ common.h \ @@ -116,13 +116,13 @@ $(INTEL_XVMC_SRCS) if DRI -intel_drv_la_SOURCES += \ +intellegacy_drv_la_SOURCES += \ $(INTEL_DRI_SRCS) -intel_drv_la_LIBADD += \ +intellegacy_drv_la_LIBADD += \ $(DRI_LIBS) endif if XVMC -intel_drv_la_SOURCES += \ +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 @@ -6,11 +6,11 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \ @PCIACCESS_CFLAGS@ -sil164_la_LTLIBRARIES = sil164.la -sil164_la_LDFLAGS = -module -avoid-version -sil164_ladir = @moduledir@/drivers +sil164legacy_la_LTLIBRARIES = sil164legacy.la +sil164legacy_la_LDFLAGS = -module -avoid-version +sil164legacy_ladir = @moduledir@/drivers -sil164_la_SOURCES = \ +sil164legacy_la_SOURCES = \ 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 @@ } -_X_EXPORT I830I2CVidOutputRec SIL164VidOutput = { +_X_EXPORT I830I2CVidOutputRec SIL164LegacyVidOutput = { .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 @@ -13,7 +13,7 @@ static MODULESETUPPROTO(sil164Setup); static XF86ModuleVersionInfo sil164VersRec = { - "sil164", + "sil164legacy", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, @@ -25,7 +25,7 @@ { 0,0,0,0 } }; -_X_EXPORT XF86ModuleData sil164ModuleData = { +_X_EXPORT XF86ModuleData sil164legacyModuleData = { &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 @@ -6,11 +6,11 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \ @PCIACCESS_CFLAGS@ -tfp410_la_LTLIBRARIES = tfp410.la -tfp410_la_LDFLAGS = -module -avoid-version -tfp410_ladir = @moduledir@/drivers +tfp410legacy_la_LTLIBRARIES = tfp410legacy.la +tfp410legacy_la_LDFLAGS = -module -avoid-version +tfp410legacy_ladir = @moduledir@/drivers -tfp410_la_SOURCES = \ +tfp410legacy_la_SOURCES = \ 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 @@ tfp410WriteByte(tfp, TFP410_CTL_1, tfp->SavedReg.ctl1); } -_X_EXPORT I830I2CVidOutputRec TFP410VidOutput = { +_X_EXPORT I830I2CVidOutputRec TFP410LegacyVidOutput = { .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 @@ -13,7 +13,7 @@ static MODULESETUPPROTO(tfp410Setup); static XF86ModuleVersionInfo tfp410VersRec = { - "tfp410", + "tfp410legacy", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, @@ -25,7 +25,7 @@ { 0,0,0,0 } }; -_X_EXPORT XF86ModuleData tfp410ModuleData = { +_X_EXPORT XF86ModuleData tfp410legacyModuleData = { &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 @@ -1,18 +1,18 @@ if XVMC -lib_LTLIBRARIES=libI810XvMC.la libIntelXvMC.la +lib_LTLIBRARIES=libI810XvMClegacy.la libIntelXvMClegacy.la endif SUBDIRS = shader -libI810XvMC_la_SOURCES = I810XvMC.c \ +libI810XvMClegacy_la_SOURCES = I810XvMC.c \ I810XvMC.h -libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \ - -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0 -libI810XvMC_la_LDFLAGS = -version-number 1:0:0 -libI810XvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ +libI810XvMClegacy_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ \ + @DRI_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0 +libI810XvMClegacy_la_LDFLAGS = -version-number 1:0:0 +libI810XvMClegacy_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ -libIntelXvMC_la_SOURCES = intel_xvmc.c \ +libIntelXvMClegacy_la_SOURCES = intel_xvmc.c \ intel_xvmc.h \ intel_xvmc_dump.c \ i915_structs.h \ @@ -28,7 +28,8 @@ dri2.c \ dri2.h -libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \ +libIntelXvMClegacy_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \ @XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0 -libIntelXvMC_la_LDFLAGS = -version-number 1:0:0 -libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ -lpthread -ldrm_intel +libIntelXvMClegacy_la_LDFLAGS = -version-number 1:0:0 +libIntelXvMClegacy_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ -lpthread \ + -ldrm_intel ++++++ xf86-video-intel-2.9.1-xorg-server-1.7.3-fixes.patch ++++++ --- uxa/uxa-render.c.orig 2010-05-05 22:03:00.000000000 +0200 +++ uxa/uxa-render.c 2010-05-05 23:43:07.000000000 +0200 @@ -445,8 +445,10 @@ #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC (1,6,99,1,0) #define IMAGE_FROM_PICT(P) image_from_pict(P, 0) -#else +#elif XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC (1,7,3,0,0) #define IMAGE_FROM_PICT(P) image_from_pict(P, 0, 0) +#else +#define IMAGE_FROM_PICT(P) image_from_pict(P, 0, 0, 0) #endif static PicturePtr ++++++ xf86-video-intel-G33-1mb.diff ++++++ Index: xf86-video-intel-2.8.0/src/i830_driver.c =================================================================== --- xf86-video-intel-2.8.0.orig/src/i830_driver.c +++ xf86-video-intel-2.8.0/src/i830_driver.c @@ -334,6 +334,8 @@ I830DetectMemory(ScrnInfoPtr pScrn) if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I9XX(pI830)) { switch (gmch_ctrl & I855_GMCH_GMS_MASK) { case I855_GMCH_GMS_STOLEN_1M: + if (IS_G33CLASS(pI830)) + range = 0; memsize = MB(1) - KB(range); break; case I855_GMCH_GMS_STOLEN_4M: ++++++ xf86-video-intel-NoFBC-945GME.diff ++++++ Index: xf86-video-intel-2.8.0/src/i830.h =================================================================== --- xf86-video-intel-2.8.0.orig/src/i830.h +++ xf86-video-intel-2.8.0/src/i830.h @@ -854,6 +854,12 @@ static inline int i830_fb_compression_su */ if (IS_I965GM(pI830)) return FALSE; + /* After some hours VGA external display stops working on + * 945GME with FBC enabled. For more details see: + * http://bugs.freedesktop.org/show_bug.cgi?id=18821 + */ + if (DEVICE_ID(pI830->PciInfo) == PCI_CHIP_I945_GME) + return FALSE; return TRUE; } ++++++ xf86-video-intel-bfo17988.diff ++++++ Index: xf86-video-intel-2.8.0/src/i830_display.c =================================================================== --- xf86-video-intel-2.8.0.orig/src/i830_display.c +++ xf86-video-intel-2.8.0/src/i830_display.c @@ -1820,7 +1820,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis /* Wait for the clocks to stabilize. */ usleep(150); - if (!DSPARB_HWCONTROL(pI830)) + if (!DSPARB_HWCONTROL(pI830) && ! IS_I945GM(pI830)) i830_update_dsparb(pScrn); OUTREG(htot_reg, (adjusted_mode->CrtcHDisplay - 1) | ++++++ xf86-video-intel-buildfix.diff ++++++ Index: src/xvmc/i965_xvmc.c =================================================================== --- src/xvmc/i965_xvmc.c.orig +++ src/xvmc/i965_xvmc.c @@ -184,6 +184,7 @@ static int free_object(struct media_stat for (i = 0; i < MAX_SURFACE_NUM; i++) FREE_ONE_BO(s->binding_table.surface_states[i].bo); FREE_ONE_BO(s->indirect_data.bo); + return 0; } static int alloc_object(struct media_state *s) Index: src/xvmc/xvmc_vld.c =================================================================== --- src/xvmc/xvmc_vld.c.orig +++ src/xvmc/xvmc_vld.c @@ -235,6 +235,7 @@ static int free_object(struct media_stat FREE_ONE_BO(s->mb_data.bo); FREE_ONE_BO(s->cs_object.bo); FREE_ONE_BO(s->vld_state.bo); + return 0; } static int alloc_object(struct media_state *s) ++++++ xorg-x11-driver-video-intel-legacy-rpmlintrc ++++++ addFilter("xorg-x11-driver-video-intel-legacy.* shlib-policy-missing-suffix") addFilter("xorg-x11-driver-video-intel-legacy.* devel-file-in-non-devel-package") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org