commit xorg-x11-driver-video

31 May 2006

Hello community,

here is the log from the commit of package xorg-x11-driver-video
checked in at Wed May 31 02:57:58 CEST 2006.

--------

--- xorg-x11-driver-video/xorg-x11-driver-video.changes	2006-05-23 10:01:39.000000000 +0200
+++ xorg-x11-driver-video/xorg-x11-driver-video.changes	2006-05-30 11:11:04.000000000 +0200
@@ -1,0 +2,5 @@
+Tue May 30 11:10:45 CEST 2006 - sndirsch@suse.de
+
+- added alternative i810 driver (Bug #179773)
+
+-------------------------------------------------------------------

New:
----
  randrstr.h
  xf86-video-i810-X11R7.1-1.6.0.diff
  xf86-video-i810-X11R7.1-1.6.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.B6LM4B/_old	2006-05-31 02:57:34.000000000 +0200
+++ /var/tmp/diff_new_pack.B6LM4B/_new	2006-05-31 02:57:34.000000000 +0200
@@ -20,7 +20,7 @@
 Group:          System/X11/Servers/XF86_4
 Autoreqprov:    on
 Version:        6.9.0
-Release:        47
+Release:        48
 Summary:        Various X.Org video drivers
 Requires:       xorg-x11-server
 Provides:       xorg-x11-server:/usr/X11R6/%{_lib}/modules/drivers/sis_drv.o
@@ -35,6 +35,8 @@
 Source8:        xorg-x11-sis-6.9.0.tar.bz2
 Source9:        xorg-x11-ati-6.8.2suse100.tar.bz2
 Source10:       xorg-x11-ati-1_0_branch-060425.tar.bz2
+Source11:       xf86-video-i810-X11R7.1-1.6.0.tar.bz2
+Source12:       randrstr.h
 Patch:          ps_nv.diff
 Patch1:         p_64bit-clean.diff
 Patch2:         p_radeon-memmap.diff
@@ -58,6 +60,7 @@
 Patch20:        nv-060426.diff
 Patch21:        radeon_bios.diff
 Patch22:        rn50_disable-render-accel.diff
+Patch23:        xf86-video-i810-X11R7.1-1.6.0.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define BUILD_ALL 1
 %define ATI_SUSE100 1
@@ -152,7 +155,7 @@
 %endif
 %prep
 %if %ATI_SUSE100
-%setup -n xc/programs/Xserver/hw/xfree86/drivers -b3 -b4 -b5 -b6 -b7 -b8 -b9
+%setup -n xc/programs/Xserver/hw/xfree86/drivers -b3 -b4 -b5 -b6 -b7 -b8 -b9 -a11
 pushd ati-6.8.2suse100
 %patch3
 popd
@@ -210,14 +213,22 @@
 %patch20
 popd
 %endif
+pushd xf86-video-i810-X11R7.1-1.6.0/src
+ cp ../../i810/Imakefile .
+ cp $RPM_SOURCE_DIR/randrstr.h .
+ patch -p0 < $RPM_SOURCE_DIR/xf86-video-i810-X11R7.1-1.6.0.diff
+popd
 
 %build
 %ifnarch s390 s390x
 %if %BUILD_ALL
-for dir in $(ls); do
+for dir in xf86-video-i810-X11R7.1-1.6.0/src $(ls|grep -v xf86-video-i810-X11R7.1-1.6.0); do
 %else
 for dir in $(ls|grep ast); do
 %endif
+%ifarch ppc64
+  test "$dir" == "xf86-video-i810-X11R7.1-1.6.0/src" && continue
+%endif
   pushd $dir
     xmkmf
     make CDEBUGFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -I/usr/X11R6/%{_lib}/Server/include -I/usr/X11R6/%{_lib}/Server/include/extensions -I/usr/X11R6/%{_lib}/Server/drivers/ati -I/usr/include/drm" PREPROCESSMANPAGES="true"
@@ -228,10 +239,13 @@
 %install
 %ifnarch s390 s390x
 %if %BUILD_ALL
-for dir in $(ls); do
+for dir in xf86-video-i810-X11R7.1-1.6.0/src $(ls|grep -v xf86-video-i810-X11R7.1-1.6.0); do
 %else
 for dir in $(ls|grep ast); do
 %endif
+%ifarch ppc64
+  test "$dir" == "xf86-video-i810-X11R7.1-1.6.0/src" && continue
+%endif
   pushd $dir
     make install DESTDIR=$RPM_BUILD_ROOT
     make install.man DESTDIR=$RPM_BUILD_ROOT
@@ -269,6 +283,9 @@
 /usr/X11R6/%{_lib}/modules/drivers/ati_drv.so
 /usr/X11R6/%{_lib}/modules/drivers/atimisc_drv.so
 /usr/X11R6/%{_lib}/modules/drivers/i810_drv.so
+%ifnarch ppc64
+/usr/X11R6/%{_lib}/modules/drivers/i810xorg71_drv.so
+%endif
 /usr/X11R6/%{_lib}/modules/drivers/mga_drv.so
 %ifarch %ix86
 /usr/X11R6/%{_lib}/modules/drivers/mga_hal_drv.so
@@ -304,6 +321,8 @@
 %endif
 
 %changelog -n xorg-x11-driver-video
+* Tue May 30 2006 - sndirsch@suse.de
+- added alternative i810 driver (Bug #179773)
 * Tue May 23 2006 - sndirsch@suse.de
 - no longer remove NVIDIA driver in %%pre of
   xorg-x11-driver-video-nvidia; it no longer conflicts with NVIDIA


++++++ xf86-video-i810-X11R7.1-1.6.0.diff ++++++
diff -u -r ../src.orig/Imakefile ./Imakefile
--- ../src.orig/Imakefile	2006-05-29 20:04:27.000000000 +0000
+++ ./Imakefile	2006-05-29 20:03:54.000000000 +0000
@@ -42,9 +42,9 @@
 	   i810_video.o i810_io.o i830_modes.o
 #endif
 I830SRCS = i830_driver.c i830_memory.c i830_cursor.c i830_accel.c i830_io.c \
-	   i830_dga.c i830_shadow.c $(I830SRCS1) $(I830SRCS2)
+	   i830_dga.c i830_randr.c i830_rotate.c $(I830SRCS1) $(I830SRCS2)
 I830OBJS = i830_driver.o i830_memory.o i830_cursor.o i830_accel.o i830_io.o \
-	   i830_dga.o i830_shadow.o $(I830OBJS1) $(I830OBJS2)
+	   i830_dga.o i830_randr.o i830_rotate.o $(I830OBJS1) $(I830OBJS2)
 
 SRCS = 	i810_driver.c \
 	$(I810SRCS) $(I830SRCS) $(DRISRCS)
@@ -86,13 +86,9 @@
 
 ModuleObjectRule()
 
-ObjectModuleTarget(i810,$(OBJS))
+ObjectModuleTarget(i810xorg71,$(OBJS))
 
-InstallVideoObjectModule(i810,$(MODULEDIR))
-
-#if !defined(XF86DriverSDK)
-InstallModuleManPage(i810)
-#endif
+InstallVideoObjectModule(i810xorg71,$(MODULEDIR))
 
 DependTarget()
 
@@ -121,7 +117,8 @@
 InstallDriverSDKNonExecFile(i830_dri.h,$(DRIVERSDKDIR)/drivers/i810)
 InstallDriverSDKNonExecFile(i830_driver.c,$(DRIVERSDKDIR)/drivers/i810)
 InstallDriverSDKNonExecFile(i830_memory.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i830_shadow.c,$(DRIVERSDKDIR)/drivers/i810)
+InstallDriverSDKNonExecFile(i830_randr.c,$(DRIVERSDKDIR)/drivers/i810)
+InstallDriverSDKNonExecFile(i830_rotate.c,$(DRIVERSDKDIR)/drivers/i810)
 InstallDriverSDKNonExecFile(i830_video.c,$(DRIVERSDKDIR)/drivers/i810)
 
 InstallDriverSDKObjectModule(i810,$(DRIVERSDKMODULEDIR),drivers)
diff -u -r ../src.orig/i810.h ./i810.h
--- ../src.orig/i810.h	2006-05-29 20:00:09.000000000 +0000
+++ ./i810.h	2006-05-29 20:07:46.000000000 +0000
@@ -62,8 +62,8 @@
 #include "common.h"
 
 #define I810_VERSION 4000
-#define I810_NAME "I810"
-#define I810_DRIVER_NAME "i810"
+#define I810_NAME "I810XORG71"
+#define I810_DRIVER_NAME "i810xorg71"
 #define I810_MAJOR_VERSION 1
 #define I810_MINOR_VERSION 6
 #define I810_PATCHLEVEL 0
diff -u -r ../src.orig/i810_driver.c ./i810_driver.c
--- ../src.orig/i810_driver.c	2006-05-29 20:00:09.000000000 +0000
+++ ./i810_driver.c	2006-05-29 20:06:34.000000000 +0000
@@ -367,7 +367,7 @@
 static MODULESETUPPROTO(i810Setup);
 
 static XF86ModuleVersionInfo i810VersRec = {
-   "i810",
+   "i810xorg71",
    MODULEVENDORSTRING,
    MODINFOSTRING1,
    MODINFOSTRING2,
@@ -379,7 +379,7 @@
    {0, 0, 0, 0}
 };
 
-_X_EXPORT XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, 0 };
+_X_EXPORT XF86ModuleData i810xorg71ModuleData = { &i810VersRec, i810Setup, 0 };
 
 static pointer
 i810Setup(pointer module, pointer opts, int *errmaj, int *errmin)
--- i830_rotate.c.orig	2006-05-29 20:32:24.000000000 +0000
+++ i830_rotate.c	2006-05-29 20:34:35.000000000 +0000
@@ -199,7 +199,7 @@
    I830Ptr pI830 = I830PTR(pScrn);
    ScrnInfoPtr pScrn1 = pScrn;
    I830Ptr pI8301 = NULL;
-   RegionPtr	damage = shadowDamage(pBuf);
+   RegionPtr	damage = (RegionPtr) shadowDamage(pBuf);
    int		nbox = REGION_NUM_RECTS (damage);
    BoxPtr		pbox = REGION_RECTS (damage);
    int		box_x1, box_x2, box_y1, box_y2;
@@ -431,7 +431,7 @@
    I830Ptr pI830 = I830PTR(pScrn);
    I830Ptr pI8301 = NULL;
    ScrnInfoPtr pScrn1 = pScrn;
-   RegionPtr	damage = shadowDamage(pBuf);
+   RegionPtr	damage = (RegionPtr) shadowDamage(pBuf);
    int		nbox = REGION_NUM_RECTS (damage);
    BoxPtr		pbox = REGION_RECTS (damage);
    int		box_x1, box_x2, box_y1, box_y2;

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)