Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Mon Oct 30 22:50:57 CET 2006. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-10-30 10:09:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-10-30 13:11:12.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 30 13:10:43 CET 2006 - sndirsch@suse.de + +- added intel modesetting driver "i810beta" (optional) + +------------------------------------------------------------------- New: ---- xf86-video-intel.modesetting.diff xf86-video-intel.modesetting.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.04FGrZ/_old 2006-10-30 22:50:35.000000000 +0100 +++ /var/tmp/diff_new_pack.04FGrZ/_new 2006-10-30 22:50:35.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 7 +Release: 8 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -66,6 +66,7 @@ Source42: xf86-video-voodoo-1.1.1.tar.bz2 Source43: xf86-video-impact-0.2.0.tar.bz2 Source44: HALlib-4.1.tar.gz +Source45: xf86-video-intel.modesetting.tar.bz2 Patch1: radeon-xrandr-dotclock.diff Patch2: radeon_dell.diff Patch3: ps_nv.diff @@ -85,6 +86,7 @@ Patch21: xf86-video-i810-setcursorposition.diff Patch22: xf86-video-i810-mergedfb-checks.diff Patch23: xf86-video-i810-965g-xv-hang.diff +Patch24: xf86-video-intel.modesetting.diff %description This package contains X.Org video drivers. @@ -140,15 +142,21 @@ %patch22 -p1 %patch23 -p1 popd +pushd xf86-video-intel.modesetting +%patch24 -p0 +mv man/i810.man man/i810beta.man +popd %build for dir in xf86-video-via-* \ + xf86-video-intel.modesetting \ xf86-video-nv-* \ xf86-video-i810-* \ xf86-video-mga-* \ xf86-video-ati-* \ $(ls | grep -v -e xf86-video-impact \ -e xf86-video-via \ + -e xf86-video-intel.modesetting \ -e xf86-video-nv \ -e xf86-video-i810 \ -e xf86-video-mga \ @@ -156,6 +164,7 @@ pushd $dir case $dir in xf86-video-i810-* | \ + xf86-video-intel.modesetting | \ xf86-video-mga-* | \ xf86-video-nsc-*) autoreconf -fi ;; *) ;; @@ -167,9 +176,12 @@ done %install -for dir in $(ls | grep -v -e xf86-video-impact); do +for dir in $(ls | grep -v -e xf86-video-impact \ + -e xf86-video-intel.modesetting); do make -C $dir install DESTDIR=$RPM_BUILD_ROOT done +install -m 755 xf86-video-intel.modesetting/src/.libs/i810_drv.so \ + $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/drivers/i810beta_drv.so ln -snf nv_drv.so \ $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/drivers/nvidia_drv.so %ifarch %ix86 @@ -193,6 +205,8 @@ %changelog -n xorg-x11-driver-video * Mon Oct 30 2006 - sndirsch@suse.de +- added intel modesetting driver "i810beta" (optional) +* Mon Oct 30 2006 - sndirsch@suse.de - xf86-video-i810-video-debug.diff: * Make VIDEO_DEBUG into a configure option - xf86-video-i810-linearalloc.diff: ++++++ xf86-video-intel.modesetting.diff ++++++ diff -u -r ../xf86-video-intel.modesetting.orig/configure.ac ./configure.ac --- ../xf86-video-intel.modesetting.orig/configure.ac 2006-10-30 12:58:58.000000000 +0100 +++ ./configure.ac 2006-10-30 13:01:09.000000000 +0100 @@ -125,7 +125,7 @@ AC_SUBST([WARN_CFLAGS]) AC_SUBST([moduledir]) -DRIVER_NAME=i810 +DRIVER_NAME=i810beta AC_SUBST([DRIVER_NAME]) XORG_MANPAGE_SECTIONS diff -u -r ../xf86-video-intel.modesetting.orig/src/i810.h ./src/i810.h --- ../xf86-video-intel.modesetting.orig/src/i810.h 2006-10-27 17:08:25.000000000 +0200 +++ ./src/i810.h 2006-10-30 13:02:23.000000000 +0100 @@ -62,8 +62,8 @@ #include "common.h" #define I810_VERSION 4000 -#define I810_NAME "I810" -#define I810_DRIVER_NAME "i810" +#define I810_NAME "I810BETA" +#define I810_DRIVER_NAME "i810beta" /* HWMC Surfaces */ #define I810_MAX_SURFACES 7 diff -u -r ../xf86-video-intel.modesetting.orig/src/i810_driver.c ./src/i810_driver.c --- ../xf86-video-intel.modesetting.orig/src/i810_driver.c 2006-10-30 12:58:58.000000000 +0100 +++ ./src/i810_driver.c 2006-10-30 13:03:07.000000000 +0100 @@ -382,7 +382,7 @@ static MODULESETUPPROTO(i810Setup); static XF86ModuleVersionInfo i810VersRec = { - "i810", + "i810beta", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, @@ -394,7 +394,7 @@ {0, 0, 0, 0} }; -_X_EXPORT XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, 0 }; +_X_EXPORT XF86ModuleData i810betaModuleData = { &i810VersRec, i810Setup, 0 }; static pointer i810Setup(pointer module, pointer opts, int *errmaj, int *errmin) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org