Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Wed Mar 7 01:53:30 CET 2007. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-03-01 19:00:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-03-06 11:37:38.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Mar 6 11:35:41 CET 2007 - sndirsch@suse.de + +- do not overwrite "i810" driver with symlink to "intel" driver; we + still need two different Intel drivers ("i810" + "intel") + +------------------------------------------------------------------- +Mon Mar 5 14:34:56 CET 2007 - sndirsch@suse.de + +- updated to "intel" (modesetting) driver release 1.9.91; obsoletes + additional "i810beta"/"i810sdvo" drivers +- specfile cleanup + +------------------------------------------------------------------- Old: ---- p_i810-refresh.diff xf86-video-intel.modesetting-20061121.tar.bz2 xf86-video-intel.modesetting.diff xf86-video-intel.modesetting-sdvo-stuffing-20061209.tar.bz2 xf86-video-intel.modesetting-sdvo-stuffing.diff New: ---- xf86-video-intel-1.9.91.tar.bz2 xf86-video-intel.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.J11530/_old 2007-03-07 01:52:55.000000000 +0100 +++ /var/tmp/diff_new_pack.J11530/_new 2007-03-07 01:52:55.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: 58 +Release: 59 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -66,8 +66,8 @@ 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-20061121.tar.bz2 -Source46: xf86-video-intel.modesetting-sdvo-stuffing-20061209.tar.bz2 +Source45: xf86-video-intel-1.9.91.tar.bz2 +Patch: xf86-video-intel.diff Patch1: radeon-xrandr-dotclock.diff Patch2: radeon_dell.diff Patch3: ps_nv.diff @@ -78,10 +78,7 @@ Patch12: xf86-video-mga-hal.diff Patch14: xf86-video-rendition.diff Patch16: xf86-video-nsc.diff -Patch17: p_i810-refresh.diff Patch18: radeon-vbios-ppc.diff -Patch24: xf86-video-intel.modesetting.diff -Patch25: xf86-video-intel.modesetting-sdvo-stuffing.diff Patch26: rn50_pixel_clock_limit.patch Patch27: xf86-video-ati-mergedfb-dpi.diff @@ -91,9 +88,11 @@ %prep -%setup -n . -T -D -rm -rf $RPM_BUILD_DIR/* +%setup -T -c %{name} for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done +pushd xf86-video-intel-* +%patch -p0 +popd pushd xf86-video-ati-*/src %patch1 -p1 %patch2 -p0 @@ -107,10 +106,8 @@ pushd xf86-video-mga-*/src tar xzf %{SOURCE44} %patch5 -p1 -popd -pushd xf86-video-mga-* %ifarch %ix86 -%patch12 +%patch12 -p1 %endif popd pushd xf86-video-sunffb-* @@ -128,41 +125,13 @@ pushd xf86-video-nsc-* %patch16 popd -pushd xf86-video-i810-* -### disabled for now -#%patch17 -popd -pushd xf86-video-intel.modesetting -%patch24 -p0 -mv man/i810.man man/i810beta.man -popd -pushd xf86-video-intel.modesetting-sdvo-stuffing -%patch25 -p0 -mv man/i810.man man/i810sdvo.man -popd %build -for dir in xf86-video-via-* \ - xf86-video-intel.modesetting \ - xf86-video-intel.modesetting-sdvo-stuffing \ - 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-intel.modesetting-sdvo-stuffing \ - -e xf86-video-nv \ - -e xf86-video-i810 \ - -e xf86-video-mga \ - -e xf86-video-ati); do +for dir in xf86-video-intel-* $(ls | grep -v -e xf86-video-impact -e xf86-video-intel); do pushd $dir case $dir in - xf86-video-i810-* | \ - xf86-video-intel.modesetting | \ - xf86-video-intel.modesetting-sdvo-stuffing | \ xf86-video-mga-* | \ + xf86-video-intel-* | \ xf86-video-nsc-*) autoreconf -fi ;; *) ;; esac @@ -173,15 +142,9 @@ done %install -for dir in $(ls | grep -v -e xf86-video-impact \ - -e xf86-video-intel.modesetting-sdvo-stuffing \ - -e xf86-video-intel.modesetting); do +for dir in xf86-video-intel-* $(ls | grep -v -e xf86-video-impact); 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 -install -m 755 xf86-video-intel.modesetting-sdvo-stuffing/src/.libs/i810_drv.so \ - $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/drivers/i810sdvo_drv.so ln -snf nv_drv.so \ $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/drivers/nvidia_drv.so %ifarch %ix86 @@ -264,6 +227,13 @@ %{_mandir}/man4/* %changelog +* Tue Mar 06 2007 - sndirsch@suse.de +- do not overwrite "i810" driver with symlink to "intel" driver; we + still need two different Intel drivers ("i810" + "intel") +* Mon Mar 05 2007 - sndirsch@suse.de +- updated to "intel" (modesetting) driver release 1.9.91; obsoletes + additional "i810beta"/"i810sdvo" drivers +- specfile cleanup * Thu Mar 01 2007 - sndirsch@suse.de - xf86-video-ati-mergedfb-dpi.diff: * fixes DPI values for mergedfb configs (Bug #239033) ++++++ xf86-video-intel.modesetting.diff -> xf86-video-intel.diff ++++++ --- xorg-x11-driver-video/xf86-video-intel.modesetting.diff 2006-10-30 13:07:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xf86-video-intel.diff 2007-03-06 11:33:07.000000000 +0100 @@ -1,47 +1,12 @@ -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) +--- src/Makefile.am.orig 2007-03-06 11:27:56.720844581 +0100 ++++ src/Makefile.am 2007-03-06 11:32:35.350947163 +0100 +@@ -178,9 +178,3 @@ + intel_drv_la_SOURCES += \ + $(INTEL_DRI_SRCS) + endif +- +-install-data-local: install-intel_drv_laLTLIBRARIES +- (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && ln -s intel_drv.so i810_drv.so) +- +-uninstall-local: +- (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org