xserver-xorg-video-nouveau: Changes to 'debian-experimental'
debian/README.Debian | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++
debian/README.source | 2 -
debian/changelog | 21 +++++++++++
debian/xsfbs/xsfbs.mk | 13 +++----
4 files changed, 117 insertions(+), 7 deletions(-)
New commits:
commit 7aab3aee479c517bed392d304ebaa429f74bdaf0
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Apr 16 01:00:01 2010 +0200
Upload to unstable, thanks to early testers!
diff --git a/debian/changelog b/debian/changelog
index 4229ac9..1944b49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-3) UNRELEASED; urgency=low
+xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-3) unstable; urgency=low
[ Sven Joachim ]
* Add a README.Debian describing various possible problems.
@@ -13,8 +13,11 @@ xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-3) UNRELEASED; urgency=
there's no need for any firmware. Since it's a transient matter, only
mention it in this changelog, and only mention the general case in
README.Debian.
+ * Given that we've got documentation now, and given we received positive
+ feedback through debian-x@, let's be confident and upload this to
+ unstable. Many thanks to the early testers!
- -- Sven Joachim <svenjoac@gmx.de> Wed, 14 Apr 2010 18:39:33 +0200
+ -- Cyril Brulebois <kibi@debian.org> Fri, 16 Apr 2010 00:59:08 +0200
xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-2) experimental; urgency=low
commit 92d3fb57f0b731385145314d874c181dca2e332a
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Apr 16 00:56:23 2010 +0200
Document that there's no need for any firmware.
diff --git a/debian/README.Debian b/debian/README.Debian
index 33d62f0..93851d0 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -11,6 +11,9 @@ kernels <= 2.6.32 lack the nouveau module altogether, and versions >=
2.6.34 contain an incompatible version. If you build your own kernel,
you have to enable the module under Drivers -> Staging drivers.
+There's no need for any firmware at all, the Linux kernel takes care of
+that automatically.
+
Enabling the X.Org video driver
===============================
diff --git a/debian/changelog b/debian/changelog
index 0189d4b..4229ac9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,11 @@ xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-3) UNRELEASED; urgency=
* Merge above changes by Sven, thanks!
* Mention in README.Debian that nouveau might be preferred above nv in
the next future if everything goes well.
+ * Some cards (nv50) used to need some firmware, but starting with
+ linux-image-2.6.32-4-$arch packages built from linux-2.6 2.6.32-11,
+ there's no need for any firmware. Since it's a transient matter, only
+ mention it in this changelog, and only mention the general case in
+ README.Debian.
-- Sven Joachim <svenjoac@gmx.de> Wed, 14 Apr 2010 18:39:33 +0200
commit 5415f5ca375c89106a48d771db9298ea79674604
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Apr 16 00:40:53 2010 +0200
Mention in README.Debian that nouveau might be preferred above nv in the next future if everything goes well.
diff --git a/debian/README.Debian b/debian/README.Debian
index 1238b6d..33d62f0 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -20,6 +20,9 @@ add the nouveau driver to the "Device" section of /etc/X11/xorg.conf
or change an existing section accordingly. A minimal xorg.conf is
provided in the examples/ directory.
+This will probably be changed once nouveau gets a bit more testing if
+no showstoppers get in the way.
+
Incompatibilities with other drivers
====================================
diff --git a/debian/changelog b/debian/changelog
index 6f0616a..0189d4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-3) UNRELEASED; urgency=
[ Cyril Brulebois ]
* Merge above changes by Sven, thanks!
+ * Mention in README.Debian that nouveau might be preferred above nv in
+ the next future if everything goes well.
-- Sven Joachim <svenjoac@gmx.de> Wed, 14 Apr 2010 18:39:33 +0200
commit 1ca283f2cf71f3c966dd85683ddb89825766b552
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Apr 16 00:41:04 2010 +0200
Merge above changes by Sven, thanks!
diff --git a/debian/changelog b/debian/changelog
index e37234c..6f0616a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-3) UNRELEASED; urgency=low
+ [ Sven Joachim ]
* Add a README.Debian describing various possible problems.
* Update xsfbs to 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff.
+ [ Cyril Brulebois ]
+ * Merge above changes by Sven, thanks!
+
-- Sven Joachim <svenjoac@gmx.de> Wed, 14 Apr 2010 18:39:33 +0200
xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-2) experimental; urgency=low
commit 01b17507264341bf4ad3d25ef18df0a96044f6cf
Author: Sven Joachim <svenjoac@gmx.de>
Date: Wed Apr 14 19:57:41 2010 +0200
debian/changelog entry for xsfbs update
diff --git a/debian/changelog b/debian/changelog
index 6cd9ab5..e37234c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-3) UNRELEASED; urgency=low
* Add a README.Debian describing various possible problems.
+ * Update xsfbs to 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff.
-- Sven Joachim <svenjoac@gmx.de> Wed, 14 Apr 2010 18:39:33 +0200
commit f367fd4f2f0cf5b449df81a0150628531d7e708c
Author: Sven Joachim <svenjoac@gmx.de>
Date: Wed Apr 14 19:15:08 2010 +0200
Add a README.Debian describing various possible problems
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..1238b6d
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,82 @@
+Requirements for using Nouveau
+==============================
+
+You need a Linux kernel that contains a nouveau.ko module which works
+with the libdrm-nouveau package in Debian. Unfortunately,
+libdrm-nouveau and the kernel module are coupled very tightly, and you
+may not be able to upgrade one without the other. As of this writing,
+supported kernels are the Debian 2.6.32 kernel, starting with
+linux-image-2.6.32-4-$arch versions, and any 2.6.33 kernel. Upstream
+kernels <= 2.6.32 lack the nouveau module altogether, and versions >=
+2.6.34 contain an incompatible version. If you build your own kernel,
+you have to enable the module under Drivers -> Staging drivers.
+
+
+Enabling the X.Org video driver
+===============================
+
+Currently the default driver for Nvidia cards is nv, so you have to
+add the nouveau driver to the "Device" section of /etc/X11/xorg.conf
+or change an existing section accordingly. A minimal xorg.conf is
+provided in the examples/ directory.
+
+
+Incompatibilities with other drivers
+====================================
+
+The nouveau kernel module includes a framebuffer driver for the
+virtual console, giving you a nice high resolution text console.
+Unfortunately, this is incompatible with other display drivers,
+including the Nvidia proprietary driver. Among others, the following
+kernel modules must not be loaded before nouveau: vga16fb, nvidiafb,
+rivafb and nvidia. Note that vesafb should not be a problem.
+
+If you decide to switch back to the proprietary driver, it is
+necessary to reboot since there is no way to unload the nouveau
+module.
+
+
+Interferences of the Nvidia OpenGL implementation
+=================================================
+
+The proprietary Nvidia driver comes with its own OpenGL implementation
+that is incompatible with free drivers. To be able to use OpenGL
+programs with nouveau, you need to uninstall the Nvidia files. If you
+have used the nvidia-glx package or any of its legacy variants, it
+suffices to remove it. If you ran the Nvidia installer, you need to
+reinstall the xserver-xorg-core and libgl1-mesa-glx packages. In
+either case, restarting X is also necessary.
+
+A simple OpenGL test program is glxgears, contained in the mesa-utils
+package. Note that OpenGL with nouveau will not be much fun, see the
+next section.
+
+
+(Lack of) DRI and 3D support
+============================
+
+DRI and 3D support is immature and not enabled, you will likely see
+messages like these in /var/log/Xorg.log:
+
+(EE) AIGLX error: dlopen of /usr/lib/dri/nouveau_dri.so failed
+(/usr/lib/dri/nouveau_dri.so: cannot open shared object file: No such
+file or directory)
+(EE) AIGLX: reverting to software rendering
+
+Software rendering means that OpenGL applications and games will run
+very slowly and often be unusable. In particular, you probably need
+to deactivate Compiz. Some programs may be configured to use XRender
+instead of OpenGL which should drastically improve their performance.
+
+
+Further information
+===================
+
+Please see the nouveau Wiki for more information and possible
+problems.
+
+http://nouveau.freedesktop.org/wiki/
+http://nouveau.freedesktop.org/wiki/FAQ
+http://nouveau.freedesktop.org/wiki/TroubleShooting
+
+ -- Sven Joachim <svenjoac@gmx.de>, Wed, 14 Apr 2010 18:29:55 +0200
diff --git a/debian/changelog b/debian/changelog
index e56bcb3..6cd9ab5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-3) UNRELEASED; urgency=low
+
+ * Add a README.Debian describing various possible problems.
+
+ -- Sven Joachim <svenjoac@gmx.de> Wed, 14 Apr 2010 18:39:33 +0200
+
xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-2) experimental; urgency=low
* Add a debug package: xserver-xorg-video-nouveau-dbg.
commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 13 14:06:33 2010 +0200
xsfbs.mk: don't use a directory as a make target
The timestamp on the directory gets updated each time a file is added in
it, which causes useless rebuilds.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e16b10..351fea5 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts
>$@
-.PHONY: log
-stampdir_targets+=log
-log: $(STAMP_DIR)/log
-$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+.PHONY: logdir
+stampdir_targets+=logdir
+logdir: $(STAMP_DIR)/logdir
+$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir
mkdir -p $(STAMP_DIR)/log
+ >$@
# Apply all patches to the upstream source.
.PHONY: patch
@@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/log
+unpatch: $(STAMP_DIR)/logdir
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Apr 1 20:49:15 2010 +0200
Fix typo.
diff --git a/debian/README.source b/debian/README.source
index 34ab4bf..b09a1ab 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch.
Otherwise, the upstream sources are manually installed in the Debian
git repository.
-The .orig.tar.gz upstream source file could be generated this
+The .orig.tar.gz upstream source file could be generated using this
"upstream-*" branch in the Debian git repository but it is actually
copied from upstream tarballs directly.
Reply to: