commit xorg-x11-driver-video-nouveau

27 Jul 2008

Hello community,

here is the log from the commit of package xorg-x11-driver-video-nouveau
checked in at Sun Jul 27 11:45:32 CEST 2008.


--------

--- arch/i386/xorg-x11-driver-video-nouveau/xorg-x11-driver-video-nouveau.changes	2008-04-26 04:10:59.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-nouveau/xorg-x11-driver-video-nouveau.changes	2008-07-25 19:58:05.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jul 25 18:22:27 CEST 2008 - bk@suse.de
+
+- git pull to fix drm build w/ 2.6.26, but still only swraster with
+  new Mesa because the Mesa dri API changed to __driDriverExtensions
+
+-------------------------------------------------------------------



Old:
----
  drm-0.10.1.20080424.tar.lzma
  nouveau-0.10.1.20080424.tar.lzma

New:
----
  drm-0.10.1.20080725.tar.lzma
  nouveau-0.10.1.20080725.tar.lzma

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

Other differences:
------------------
++++++ xorg-x11-driver-video-nouveau.spec ++++++
--- /var/tmp/diff_new_pack.d22674/_old	2008-07-27 11:44:51.000000000 +0200
+++ /var/tmp/diff_new_pack.d22674/_new	2008-07-27 11:44:51.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package xorg-x11-driver-video-nouveau (Version 0.10.1.20080424)
+# spec file for package xorg-x11-driver-video-nouveau (Version 0.10.1.20080725)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -17,15 +17,11 @@
 License:        LGPL v2.0 only; X11/MIT
 Group:          System/X11/Servers/XF86_4
 Summary:        Nouveau Open Source X11 driver for nVidia cards
-Version:        0.10.1.20080424
+Version:        0.10.1.20080725
 Release:        1
 %define	 drmver %nil
-%if 0%{?suse_version} <= 1030
-%define 	ext bz2
-%else
 BuildRequires:  lzma
 %define 	ext lzma
-%endif
 %define		 tarball nouveau
 Source:         %tarball-%version.tar.%ext
 Source30:       drm-%version%drmver.tar.%ext
@@ -41,7 +37,7 @@
 Patch6:         gallium-checks.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++ kernel-syms module-init-tools xorg-x11-server-sdk
-BuildRequires:  autoconf automake libtool
+BuildRequires:  automake libtool
 Obsoletes:      x11-video-nouveau
 Requires:       nouveau-kmp xorg-x11-server
 ExclusiveArch:  %ix86 x86_64 ppc ppc64
@@ -122,16 +118,17 @@
 
 
 %prep
-%setup -q -n %tarball-%{version}
-%setup -q -n %tarball-%{version} -T -D -a 30
+lzma -dc %{SOURCE0}  | tar x --recursive-unlink -f -
+%setup -q -n %tarball-%{version} -T -D
+lzma -dc %{SOURCE30} | tar x --recursive-unlink -f -
 cd drm%drmver
 %patch30 -p1
 cd -
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+#patch2 -p1
+#patch3 -p1
+#patch4 -p1
+#patch5 -p1
 %patch6 -p0
 %define cflags %(optflags="%optflags";optflags="${optflags//-fstack-protector/}";echo "${optflags//-D_FORTIFY_SOURCE=?/} -fomit-frame-pointer")
 
@@ -148,7 +145,7 @@
 # We need explicit -fpic beccause we link the static libdrm.a into the shared nouveau_drv.so:
 CFLAGS="%cflags -fpic" ./autogen.sh --prefix=$PWD/install --enable-static --disable-shared
 export PKG_CONFIG_PATH=$PWD/install/lib/pkgconfig
-make SUBDIRS=libdrm install;cp shared-core/[dn]*.h install/include/
+make SUBDIRS=libdrm install;cp shared-core/[dni]*.h install/include/
 # DDX:
 cd ../xf86-video-nouveau
 export CFLAGS="%cflags"
@@ -195,6 +192,9 @@
 %endif
 
 %changelog
+* Fri Jul 25 2008 bk@suse.de
+- git pull to fix drm build w/ 2.6.26, but still only swraster with
+  new Mesa because the Mesa dri API changed to __driDriverExtensions
 * Fri Apr 25 2008 bk@suse.de
 - git pull and fix a further issue making Google Earth a bit better
 * Fri Apr 25 2008 ro@suse.de

++++++ clone-current-gits.sh ++++++
--- arch/i386/xorg-x11-driver-video-nouveau/clone-current-gits.sh	2008-04-25 16:00:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-nouveau/clone-current-gits.sh	2008-07-25 19:34:21.000000000 +0200
@@ -29,27 +29,29 @@
 else
 	cd mesa;git pull;cd ..
 fi
-cd mesa
-	mv mesa.log mesa.log.old
-	git log >mesa.log
-	diff mesa.log.old mesa.log >mesa.diff || if [ $? -ne 1 ]; then
-		head mesa.log >mesa.diff
-	fi
-cd -
+get_head_of_mesa_log() {
+	cd mesa
+		#mv mesa.log mesa.log.old
+		git log >mesa.log
+		diff mesa.log.old mesa.log >mesa.diff || if [ $? -ne 1 ]; then
+			head mesa.log >mesa.diff
+		fi
+	cd -
+}
 if [ ! -d xf86-video-nouveau ]; then
 	git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau/
 else
 	cd xf86-video-nouveau;git pull;cd ..
 fi
 cd ..
-echo -n "compress?"
-read answer
-if [ "$answer" != y ]; then
-	exit
-fi
+#echo -n "compress?"
+#read answer
+#if [ "$answer" != y ]; then
+#	exit
+#fi
 if [ "$exclude_drm" ]; then
 	pushd git
-	for exclude in bsd-core	Doxyfile README.drm ffb i810 i915 imagine mach64 mga r128 r300 radeon savage sis tdfx via xgi .log
+	for exclude in bsd-core	Doxyfile README.drm ffb i810 i915*.c imagine mach64 mga r128 r300 radeon savage sis tdfx via xgi .log
 	do
 		drm_excludes="$drm_excludes --exclude $exclude"
 	done
@@ -58,12 +60,17 @@
 	popd
 	tar cvf - drm				\
 		--exclude .git			\
-		--exclude *-core/[b-ce-mo-z]*	\
+		--exclude *-core/[b-ce-hj-mo-z]*	\
 		$drm_excludes | lzma -c9 >../drm-$version.tar.lzma
+	lzma -dc ../drm-$version.tar.lzma | tar tvf - | grep i915
 	popd
 fi
 mv git $tarball
-tar cvf - $tarball			\
+if [ ! -e nouveau-$version.tar.lzma ] ||
+   [ git/mesa -nt nouveau-$version.tar.lzma \
+  -o git/xf86-video-nouveau -nt nouveau-$version.tar.lzma ]
+then
+    tar cvf - $tarball			\
 	$exclude_drm			\
 	--exclude .git			\
 	--exclude mesa.log		\
@@ -76,7 +83,6 @@
 	--exclude gamma			\
 	--exclude glcore		\
 	--exclude i810			\
-	--exclude i915			\
 	--exclude i965			\
 	--exclude intel			\
 	--exclude mach64		\
@@ -100,15 +106,11 @@
 	--exclude drivers/x11		\
 	--exclude mini			\
 	--exclude tnl_dd		\
-	--exclude egl			\
-	--exclude GLES			\
 	--exclude windows		\
 	--exclude glide			\
 	--exclude svga			\
 	--exclude allegro		\
 	--exclude os2			\
-	--exclude i915simple		\
-	--exclude i965simple		\
 	--exclude cell			\
 	--exclude SConscript		\
 	--exclude README*		\
@@ -116,6 +118,12 @@
 	--exclude *.dtd			\
 	--exclude *.xml			\
 	--exclude *.pyn | lzma -c9 >nouveau-$version.tar.lzma
+#	--exclude i915*.c		\
+#	--exclude i915simple/*.c
+#	--exclude i965simple
+#	--exclude egl
+#	--exclude GLES
+fi
 TAR_ERR=$?
 mv nouveau-$version git
 sh update-spec.sh

++++++ gallium-st_feedback_draw_vbo-null.diff ++++++
--- /var/tmp/diff_new_pack.d22674/_old	2008-07-27 11:44:51.000000000 +0200
+++ /var/tmp/diff_new_pack.d22674/_new	2008-07-27 11:44:51.000000000 +0200
@@ -1,3 +1,4 @@
+# Does not compile in 2008-06-25 git:
 #
 # Signed-Off-By: Bernhard Kaindl <bk@suse.de>:
 #
@@ -48,6 +49,7 @@
 #
 diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
 index f0f6224..64fae3d 100644
+# Maybe this is fixed meanwhile (test glest to check):
 --- nouveau/mesa/src/mesa/state_tracker/st_draw.c
 +++ nouveau/mesa/src/mesa/state_tracker/st_draw.c
 @@ -561,7 +561,7 @@ st_feedback_draw_vbo(GLcontext *ctx,
@@ -59,13 +61,11 @@
        unsigned indexSize;
        struct gl_buffer_object *bufobj = ib->obj;
        struct st_buffer_object *stobj = st_buffer_object(bufobj);
-@@ -619,7 +622,8 @@ st_feedback_draw_vbo(GLcontext *ctx,
+@@ -602,6 +602,7 @@
        }
     }
     if (ib) {
--      pipe->winsys->buffer_unmap(pipe->winsys, index_buffer_handle);
 +      if (index_buffer_handle)
-+	      pipe->winsys->buffer_unmap(pipe->winsys, index_buffer_handle);
+       pipe_buffer_unmap(pipe, index_buffer_handle);
        draw_set_mapped_element_buffer(draw, 0, NULL);
     }
- }


++++++ update-spec.sh ++++++
--- arch/i386/xorg-x11-driver-video-nouveau/update-spec.sh	2008-04-25 16:00:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-nouveau/update-spec.sh	2008-07-25 19:34:33.000000000 +0200
@@ -22,23 +22,21 @@
 
 diff xorg-x11-driver-video-nouveau.spec{.bak,} || :
 mv xorg-x11-driver-video-nouveau.spec.bak ..
-mkdir -p lzma bz2
-mv *.lzma lzma || :
-mv *.bz2 bz2 || :
-mv bz2/{nouveau,drm}-$version.tar.bz2 . || :
+#mkdir -p lzma bz2
+#mv *.lzma lzma || :
+#mv *.bz2 bz2 || :
+#mv bz2/{nouveau,drm}-$version.tar.bz2 . || :
+#osc addremove
+#mv lzma/{nouveau,drm}-$version.tar.lzma . || :
 osc addremove
-mv lzma/{nouveau,drm}-$version.tar.lzma . || :
 echo -n "commit?"
 read answer
 if [ "$answer" != y ]; then
 	exit
 fi
-for tarball in drm nouveau; do
-	lzma -dc $tarball-$version.tar.lzma | bzip2 -9 >$tarball-$version.tar.bz2
-done
-#mv *.lzma lzma || :
+#for tarball in drm nouveau; do
+#	lzma -dc $tarball-$version.tar.lzma | bzip2 -9 >$tarball-$version.tar.bz2
+#done
 osc addremove
-#osc add nouveau-$version.tar.bz2
 osc commit -m "$CHANGES"
-#mv lzma/{nouveau,drm}-$version.tar.lzma . || :
-mv *.tar.bz2 bz2
+#mv *.tar.bz2 bz2


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



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)