Hello community, here is the log from the commit of package xorg-x11-driver-video-nouveau checked in at Sat Apr 26 11:42:28 CEST 2008. -------- --- arch/i386/xorg-x11-driver-video-nouveau/xorg-x11-driver-video-nouveau.changes 2008-04-25 15:23:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-nouveau/xorg-x11-driver-video-nouveau.changes 2008-04-26 04:10:59.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 25 16:06:20 CEST 2008 - bk@suse.de + +- git pull and fix a further issue making Google Earth a bit better + +------------------------------------------------------------------- Old: ---- nouveau-0.10.1.20080421.tar.lzma New: ---- drm-0.10.1.20080424.tar.lzma drm-link_drm_into_nouveau.diff gallium-checks.diff nouveau-0.10.1.20080424.tar.lzma ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video-nouveau.spec ++++++ --- /var/tmp/diff_new_pack.l28572/_old 2008-04-26 11:42:13.000000000 +0200 +++ /var/tmp/diff_new_pack.l28572/_new 2008-04-26 11:42:13.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xorg-x11-driver-video-nouveau (Version 0.10.1.20080421) +# spec file for package xorg-x11-driver-video-nouveau (Version 0.10.1.20080424) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,8 +17,9 @@ 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.20080421 -Release: 3 +Version: 0.10.1.20080424 +Release: 1 +%define drmver %nil %if 0%{?suse_version} <= 1030 %define ext bz2 %else @@ -27,6 +28,8 @@ %endif %define tarball nouveau Source: %tarball-%version.tar.%ext +Source30: drm-%version%drmver.tar.%ext +Patch30: drm-link_drm_into_nouveau.diff Source1: update-spec.sh Source2: clone-current-gits.sh Source3: preamble @@ -35,6 +38,7 @@ Patch3: ddx-enable-randr12-default.diff Patch4: gallium-warnings.diff Patch5: gallium-st_feedback_draw_vbo-null.diff +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 @@ -118,31 +122,22 @@ %prep -: 'To create an updated source tarball using git clone or git pull, use: -cd git -git clone git://anongit.freedesktop.org/git/mesa/drm/ -git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau/ -git clone git://anongit.freedesktop.org/git/nouveau/mesa -cd mesa -git checkout -b gallium origin/gallium-0.1 -cd ../.. -cd git/drm;git pull;cd ../mesa;git pull;cd ../xf86-video-nouveau;git pull;cd ../.. -version=0.`date +%Y%m%d` -mv git nouveau-$version -tar cvfj nouveau-$version.tar.bz2 nouveau-$version --exclude .git -mv nouveau-$version git -' %setup -q -n %tarball-%{version} +%setup -q -n %tarball-%{version} -T -D -a 30 +cd drm%drmver +%patch30 -p1 +cd - %patch1 -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") %build # kernel modules: -cd drm +cd drm%drmver export EXTRA_CFLAGS="-DVERSION=%version" for flavor in %flavors_to_build; do rm -rf $flavor @@ -173,9 +168,9 @@ %install # kernel modules -pushd drm +pushd drm%drmver export INSTALL_MOD_PATH=$RPM_BUILD_ROOT -export INSTALL_MOD_DIR=weak-updates # needed because nouveau needs the drm.ko from nouveau's git tree +#export INSTALL_MOD_DIR=weak-updates # needed because nouveau needs the drm.ko from nouveau's git tree for flavor in %flavors_to_build; do make -C $flavor LINUXDIR=/usr/src/linux-obj/%_target_cpu/$flavor install M=$PWD/$flavor done @@ -200,6 +195,8 @@ %endif %changelog +* 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 - added preamble file for KMP package - fix KMP package name in specfile ++++++ clone-current-gits.sh ++++++ --- arch/i386/xorg-x11-driver-video-nouveau/clone-current-gits.sh 2008-04-20 14:57:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-nouveau/clone-current-gits.sh 2008-04-25 16:00:37.000000000 +0200 @@ -1,3 +1,9 @@ +#include_drm=true +update_drm=true +include_drm=false +#version=0.10.1.20080404 +version=0.10.1.`date +%Y%m%d` +tarball=nouveau-$version get_mesa() { git clone git://anongit.freedesktop.org/git/nouveau/mesa cd mesa @@ -6,16 +12,30 @@ } set -xe cd git -if [ ! -d drm ]; then - git clone git://anongit.freedesktop.org/git/mesa/drm/ +if $update_drm; then + if [ ! -d drm ]; then + git clone git://anongit.freedesktop.org/git/mesa/drm/ + else + cd drm; git pull; cd .. + fi +fi +if $include_drm; then + exclude_drm= else - cd drm; git pull; cd .. + exclude_drm="--exclude $tarball/drm" fi if [ ! -d mesa ]; then get_mesa 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 - if [ ! -d xf86-video-nouveau ]; then git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau/ else @@ -27,13 +47,26 @@ if [ "$answer" != y ]; then exit fi -version=0.10.1.`date +%Y%m%d` -#version=0.10.1.20080404 -mv git nouveau-$version -tar cvf - nouveau-$version/. \ - --exclude bsd-core \ - --exclude *-core/[b-ce-mo-z]* \ - --exclude .git* \ +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 + do + drm_excludes="$drm_excludes --exclude $exclude" + done + #drm-2.3.0-1215-g9ba3aaaa1a22663ec: + pushd drm; git-describe --abbrev=17 >linux-core/git-describe + popd + tar cvf - drm \ + --exclude .git \ + --exclude *-core/[b-ce-mo-z]* \ + $drm_excludes | lzma -c9 >../drm-$version.tar.lzma + popd +fi +mv git $tarball +tar cvf - $tarball \ + $exclude_drm \ + --exclude .git \ + --exclude mesa.log \ --exclude docs \ --exclude doxygen \ --exclude progs \ ++++++ drm-link_drm_into_nouveau.diff ++++++ --- drm/linux-core/Makefile.kernel +++ drm/linux-core/Makefile.kernel @@ -52,7 +52,9 @@ xgi-objs += xgi_ioc32.o endif -obj-m += drm.o +# Changed to not build drm.ko but link drm into nouveau.ko: +nouveau-objs += $(drm-objs) + obj-$(CONFIG_DRM_TDFX) += tdfx.o obj-$(CONFIG_DRM_R128) += r128.o obj-$(CONFIG_DRM_RADEON)+= radeon.o --- drm/linux-core/drm_drv.c +++ drm/linux-core/drm_drv.c @@ -462,7 +462,7 @@ .open = drm_stub_open }; -static int __init drm_core_init(void) +int __init drm_core_init(void) { int ret; struct sysinfo si; @@ -525,7 +525,7 @@ return ret; } -static void __exit drm_core_exit(void) +void __exit drm_core_exit(void) { remove_proc_entry("dri", NULL); drm_sysfs_destroy(); @@ -535,8 +535,6 @@ idr_destroy(&drm_minors_idr); } -module_init(drm_core_init); -module_exit(drm_core_exit); /** * Get version information --- drm/linux-core/nouveau_drv.c +++ drm/linux-core/nouveau_drv.c @@ -101,8 +101,14 @@ return drm_get_dev(pdev, ent, &driver); } +int __init drm_core_init(void); +void __exit drm_core_exit(void); + static int __init nouveau_init(void) { + int ret = drm_core_init(); + if (ret) + return ret; driver.num_ioctls = nouveau_max_ioctl; return drm_init(&driver, pciidlist); } @@ -110,6 +116,7 @@ static void __exit nouveau_exit(void) { drm_exit(&driver); + drm_core_exit(); } module_init(nouveau_init); ++++++ gallium-checks.diff ++++++ --- mesa/src/mesa/state_tracker/st_cb_texture.c +++ mesa/src/mesa/state_tracker/st_cb_texture.c @@ -881,6 +881,12 @@ _mesa_lookup_enum_by_nr(target), level, xoffset, yoffset, width, height); + // Triggered in server by googleearth, crashes it when not caught... + if (!stImage->pt && !texImage->Data) { + assert(0); + return; + } + pixels = _mesa_validate_pbo_teximage(ctx, dims, width, height, depth, format, type, pixels, packing, "glTexSubImage2D"); ++++++ preamble ++++++ --- arch/i386/xorg-x11-driver-video-nouveau/preamble 2008-04-25 15:18:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-nouveau/preamble 2008-04-25 16:00:37.000000000 +0200 @@ -1 +1,2 @@ Enhances: kernel-%1 +PreReq: grep coreutils ++++++ update-spec.sh ++++++ --- arch/i386/xorg-x11-driver-video-nouveau/update-spec.sh 2008-04-21 14:51:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-nouveau/update-spec.sh 2008-04-25 16:00:37.000000000 +0200 @@ -1,28 +1,44 @@ -version=0.10.1.`date +%Y%m%d` +if [ -z "$version" ]; then + #version=0.10.1.`date +%Y%m%d` + version=`sed -n 's/^Version:[[:space:]]*//p' *.spec` +fi #version=`ls nouveau-*.tar.bz2|tail -1|sed 's/nouveau-//;s/.tar.bz2//'` echo $version -OLDVER=`sed -n "s/Version: //p" xorg-x11-driver-video-nouveau.spec` sed --in-place=.bak "s/Version:.*/Version: $version/" xorg-x11-driver-video-nouveau.spec +OLDVER=`sed -n "s/Version: //p" xorg-x11-driver-video-nouveau.spec.bak` diff -u xorg-x11-driver-video-nouveau.spec{.bak,} if [ "$OLDVER" != "$version" ]; then osc del nouveau-$OLDVER.tar.bz2 osc del nouveau-$OLDVER.tar.lzma fi +set -eu set -x -#osc add nouveau-$version.tar.lzma -osc add nouveau-$version.tar.bz2 +#osc add +DATE=`stat -c %y nouveau-$version.tar.lzma|sed 's|.00000.*||;s|:..$||'` sed --in-place '/^%changelog/,$d' xorg-x11-driver-video-nouveau.spec -CHANGES="- update to git checkouts as of `date` -except for drm, which uses git checkout from 2008-03-12 due to kernel oops -and the DDX, which uses git checkout from 2008-03-19 before randr12 DPMS changes" - +CHANGES="- update to git of $DATE" echo -e "%changelog\n* `date '+%a %b %e %Y'` bk@suse.de $CHANGES" >>xorg-x11-driver-video-nouveau.spec -diff xorg-x11-driver-video-nouveau.spec{.bak,} +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 . || : +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 || : +osc addremove +#osc add nouveau-$version.tar.bz2 osc commit -m "$CHANGES" +#mv lzma/{nouveau,drm}-$version.tar.lzma . || : +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