Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Wed Oct 31 17:23:51 CET 2007. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-10-24 04:26:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-10-31 16:32:48.070375000 +0100 @@ -1,0 +2,6 @@ +Wed Oct 31 16:37:54 CET 2007 - sndirsch@suse.de + +- xf86-video-intel + * updated to git commit ecd995d + +------------------------------------------------------------------- Old: ---- xf86-video-intel-2.1.1.tar.bz2 New: ---- xf86-video-intel-ecd995d.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.D16838/_old 2007-10-31 17:23:06.000000000 +0100 +++ /var/tmp/diff_new_pack.D16838/_new 2007-10-31 17:23:06.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.3 -Release: 19 +Release: 24 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -59,7 +59,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-2.1.1.tar.bz2 +Source45: xf86-video-intel-ecd995d.tar.bz2 Source46: xf86-video-ati-6.7.195.tar.bz2 Source48: xf86-video-mga-1.9.100.tar.bz2 Source50: xf86-video-xgi-1.5.0.tar.bz2 @@ -132,7 +132,7 @@ pushd xf86-video-mga-1.9.100 %patch30 -p1 popd -pushd xf86-video-intel-* +pushd xf86-video-intel %patch -p0 %patch36 -p1 %patch38 -p1 @@ -197,7 +197,7 @@ pushd $dir case $dir in xf86-video-mga-1.4.6.1 | \ - xf86-video-intel-* | \ + xf86-video-intel | \ xf86-video-mga-1.9.100 | \ xf86-video-ati-6.6.3 | \ xf86-video-ati-6.7.* | \ @@ -251,6 +251,9 @@ /usr/%{_lib}/xorg/modules/ %{_mandir}/man4/* %changelog +* Wed Oct 31 2007 - sndirsch@suse.de +- xf86-video-intel + * updated to git commit ecd995d * Wed Oct 24 2007 - sndirsch@suse.de - xf86-video-nv 2.1.6 * Remove unused headers. ++++++ xf86-video-intel-xvmc_i915_i945.diff ++++++ --- /var/tmp/diff_new_pack.D16838/_old 2007-10-31 17:23:07.000000000 +0100 +++ /var/tmp/diff_new_pack.D16838/_new 2007-10-31 17:23:07.000000000 +0100 @@ -64,35 +64,6 @@ #endif /* Setup 3D engine, needed for rotation too */ -diff --git a/src/i830_memory.c b/src/i830_memory.c -index b38a5df..b2c5149 100644 ---- a/src/i830_memory.c -+++ b/src/i830_memory.c -@@ -1758,4 +1758,24 @@ i830_xf86AllocateOffscreenLinear(ScreenPtr pScreen, int length, - - return linear; - } -+ - #endif -+ -+/* -+ * Allocate memory for MC compensation -+ */ -+Bool i830_allocate_xvmc_buffer(ScrnInfoPtr pScrn, const char *name, -+ i830_memory **buffer, unsigned long size, -+ int flags) -+{ -+ *buffer = i830_allocate_memory(pScrn, name, size, -+ GTT_PAGE_SIZE, flags); -+ -+ if (!*buffer) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Failed to allocate memory for %s.\n", name); -+ return FALSE; -+ } -+ -+ return TRUE; -+} diff --git a/src/i830_video.c b/src/i830_video.c index b4f9e74..ed68104 100644 --- a/src/i830_video.c @@ -7695,3 +7666,28 @@ +#define sz_xXF86DRICloseFullScreenReply 32 + +#endif /* _XF86DRISTR_H_ */ +--- a/src/i830_memory.c.orig 2007-10-31 16:19:15.883617250 +0100 ++++ b/src/i830_memory.c 2007-10-31 16:20:04.102630750 +0100 +@@ -1991,3 +1991,22 @@ I830CheckAvailableMemory(ScrnInfoPtr pSc + + return maxPages * 4; + } ++ ++/* ++ * Allocate memory for MC compensation ++ */ ++Bool i830_allocate_xvmc_buffer(ScrnInfoPtr pScrn, const char *name, ++ i830_memory **buffer, unsigned long size, ++ int flags) ++{ ++ *buffer = i830_allocate_memory(pScrn, name, size, ++ GTT_PAGE_SIZE, flags); ++ ++ if (!*buffer) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Failed to allocate memory for %s.\n", name); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org