debian/changelog | 12 +++++++++++
debian/scripts/vars.arm | 25 -----------------------
debian/scripts/vars.armeb | 25 -----------------------
debian/scripts/vars.ia64 | 22 --------------------
debian/scripts/vars.m32r | 25 -----------------------
debian/scripts/vars.s390 | 8 -------
debian/scripts/vars.sparc | 23 ---------------------
xsf-docs/howto/build-mesa.txt | 40 +++++++++++--------------------------
xsf-docs/howto/configure-input.txt | 2 -
9 files changed, 25 insertions(+), 157 deletions(-)
New commits:
commit c0cccc699942ca63b290a310312db7d53433c8b6
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Mon Aug 31 18:54:00 2015 +0200
Drop vars files for unsupported architectures
diff --git a/debian/changelog b/debian/changelog
index 0fd9846..ee6a902 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xorg (1:7.7+12) UNRELEASED; urgency=medium
- build-mesa: Update ./configure options
- build-mesa: Drop obsolete FIXME and s/test_application/es2_info/
- build-mesa: Drop obsolete information for squeeze
+ * Drop vars files for unsupported architectures: arm, armeb, ia64,
+ m32r, s390 and sparc.
-- Andreas Boll <andreas.boll....@gmail.com> Mon, 31 Aug 2015 18:37:12 +0200
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
deleted file mode 100644
index b8796b8..0000000
--- a/debian/scripts/vars.arm
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# This file is NOT a shell script.
-#
-# This file gets included by both debian/rules (make) AND the scripts in
-# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="\
- xserver-xorg-video-ati, \
- xserver-xorg-video-cirrus, \
- xserver-xorg-video-fbdev, \
- xserver-xorg-video-mga, \
- xserver-xorg-video-neomagic, \
- xserver-xorg-video-savage, \
- xserver-xorg-video-sisusb, \
- xserver-xorg-video-tdfx, \
- xserver-xorg-video-trident, \
- xserver-xorg-video-vesa, \
-"
-
-# xserver-xorg-video-glide,
-
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics"
-
-
-XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
deleted file mode 100644
index b8796b8..0000000
--- a/debian/scripts/vars.armeb
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# This file is NOT a shell script.
-#
-# This file gets included by both debian/rules (make) AND the scripts in
-# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="\
- xserver-xorg-video-ati, \
- xserver-xorg-video-cirrus, \
- xserver-xorg-video-fbdev, \
- xserver-xorg-video-mga, \
- xserver-xorg-video-neomagic, \
- xserver-xorg-video-savage, \
- xserver-xorg-video-sisusb, \
- xserver-xorg-video-tdfx, \
- xserver-xorg-video-trident, \
- xserver-xorg-video-vesa, \
-"
-
-# xserver-xorg-video-glide,
-
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics"
-
-
-XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
deleted file mode 100644
index 0da2b7d..0000000
--- a/debian/scripts/vars.ia64
+++ /dev/null
@@ -1,22 +0,0 @@
-
-# This file is NOT a shell script.
-#
-# This file gets included by both debian/rules (make) AND the scripts in
-# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="\
- xserver-xorg-video-ati, \
- xserver-xorg-video-cirrus, \
- xserver-xorg-video-fbdev, \
- xserver-xorg-video-mga, \
- xserver-xorg-video-neomagic, \
- xserver-xorg-video-savage, \
- xserver-xorg-video-tdfx, \
- xserver-xorg-video-trident, \
- xserver-xorg-video-vesa, \
-"
-
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics"
-
-
-XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.m32r b/debian/scripts/vars.m32r
deleted file mode 100644
index b8796b8..0000000
--- a/debian/scripts/vars.m32r
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# This file is NOT a shell script.
-#
-# This file gets included by both debian/rules (make) AND the scripts in
-# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="\
- xserver-xorg-video-ati, \
- xserver-xorg-video-cirrus, \
- xserver-xorg-video-fbdev, \
- xserver-xorg-video-mga, \
- xserver-xorg-video-neomagic, \
- xserver-xorg-video-savage, \
- xserver-xorg-video-sisusb, \
- xserver-xorg-video-tdfx, \
- xserver-xorg-video-trident, \
- xserver-xorg-video-vesa, \
-"
-
-# xserver-xorg-video-glide,
-
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics"
-
-
-XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.s390 b/debian/scripts/vars.s390
deleted file mode 100644
index 525866e..0000000
--- a/debian/scripts/vars.s390
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# This file is NOT a shell script.
-#
-# This file gets included by both debian/rules (make) AND the scripts in
-# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-dummy"
-
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-void"
diff --git a/debian/scripts/vars.sparc b/debian/scripts/vars.sparc
deleted file mode 100644
index 1b7318f..0000000
--- a/debian/scripts/vars.sparc
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# This file is NOT a shell script.
-#
-# This file gets included by both debian/rules (make) AND the scripts in
-# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="\
- xserver-xorg-video-ati, \
- xserver-xorg-video-cirrus, \
- xserver-xorg-video-fbdev, \
- xserver-xorg-video-mga, \
- xserver-xorg-video-neomagic, \
- xserver-xorg-video-savage, \
- xserver-xorg-video-sunffb, \
- xserver-xorg-video-tdfx, \
- xserver-xorg-video-trident, \
- xserver-xorg-video-vesa, \
-"
-
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics"
-
-
-XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
commit 6eb2df01bad2b4c045413ad857b5e3e9958f9c05
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Mon Aug 31 18:38:51 2015 +0200
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index a9b0b9f..0fd9846 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg (1:7.7+12) UNRELEASED; urgency=medium
+
+ * Merge xsf-docs up to 4116d1e commit:
+ - build-mesa: Drop nouveau note
+ - build-mesa: Update ./configure options
+ - build-mesa: Drop obsolete FIXME and s/test_application/es2_info/
+ - build-mesa: Drop obsolete information for squeeze
+
+ -- Andreas Boll <andreas.boll....@gmail.com> Mon, 31 Aug 2015 18:37:12 +0200
+
xorg (1:7.7+11) experimental; urgency=medium
* Fix arch-specific build broken in 1:7.7+10.
commit 4116d1edff8d6d66a093fb98e0bd0bff5982b263
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Mon Aug 31 18:35:34 2015 +0200
build-mesa: Drop obsolete information for squeeze
diff --git a/xsf-docs/howto/build-mesa.txt b/xsf-docs/howto/build-mesa.txt
index 1beeb8e..eb17cba 100644
--- a/xsf-docs/howto/build-mesa.txt
+++ b/xsf-docs/howto/build-mesa.txt
@@ -77,10 +77,6 @@ $ sudo apt-get install build-essential git
$ sudo apt-get build-dep mesa
----
-If you’re on `squeeze` you may need to install a few more packages:
-newer `libdrm-dev` (it is available in `squeeze-backports`),
-as well as `libxmu-dev`, `libxi-dev`.
-
Make sure you have some disc space available, since the git repository
is over 120MB, and since the mesa directory is over 500MB after a
build. Once you’re ready, grab the upstream mesa sources:
commit d944cbf937fdb0c9c4ee5bfdb6ac672d74a001bf
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Mon Jul 7 12:17:03 2014 +0200
build-mesa: Drop obsolete FIXME and s/test_application/es2_info/
We ship the EGL-aware application es2_info in mesa-utils-extra.
diff --git a/xsf-docs/howto/build-mesa.txt b/xsf-docs/howto/build-mesa.txt
index b39c351..1beeb8e 100644
--- a/xsf-docs/howto/build-mesa.txt
+++ b/xsf-docs/howto/build-mesa.txt
@@ -190,9 +190,7 @@ _Did this work?_
+
_Did this work?_
+
-*FIXME: We should be shipping EGL-aware applications through `mesa-utils`.*
-+
- $ EGL_LOG_LEVEL=debug test_application 2>&1 >/dev/null | grep '\.so'
+ $ EGL_LOG_LEVEL=debug es2_info 2>&1 >/dev/null | grep '\.so'
libEGL debug: added lib/egl/egl_gallium.so to module array
libEGL debug: dlopen(lib/egl/egl_gallium.so)
libEGL debug: DRI2: dlopen(lib/i915_dri.so)
commit 64154e2923f83f7331dcb35b462b8840f7c5f975
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Mon Jul 7 11:33:19 2014 +0200
build-mesa: Update ./configure options
diff --git a/xsf-docs/howto/build-mesa.txt b/xsf-docs/howto/build-mesa.txt
index 0557d49..b39c351 100644
--- a/xsf-docs/howto/build-mesa.txt
+++ b/xsf-docs/howto/build-mesa.txt
@@ -96,23 +96,19 @@ Here’s what the `./configure` call will look like:
----
$ ./configure --prefix=/usr \
--enable-driglx-direct \
- --enable-gallium \
- --enable-gles-overlay \
--enable-gles1 \
--enable-gles2 \
--enable-glx-tls \
- --with-driver=dri \
--with-dri-driverdir=/usr/lib/dri \
--with-egl-platforms='drm x11' \
- --with-state-trackers=egl,glx,dri,vega \
…
----
Now, what are the parameters to replace “++…++” with? Basically, if
you determined an Intel driver (`i915` or `i965`), you want to use the
-classic drivers and to disable the Gallium drivers. If you saw a
-Radeon driver (`r300` or `r600`), you should prefer the Gallium
-drivers.
+classic drivers and to disable the Gallium drivers. Other drivers are
+only available on Gallium (`r300`, `r600`, `radeonsi` and more).
+Running `./configure --help` might be useful.
Examples for common drivers:
@@ -127,15 +123,19 @@ Examples for common drivers:
* For `nouveau`, you may want to try:
- --with-dri-drivers=nouveau --enable-gallium-nouveau
+ --with-dri-drivers=nouveau --with-gallium-drivers=nouveau
- * For `r300` (the options are named `radeon`), you need:
+ * For `r300`, you need:
- --with-dri-drivers=radeon --enable-gallium-radeon
+ --with-gallium-drivers=r300
* For `r600`, you need:
- --with-dri-drivers=r600 --enable-gallium-r600
+ --with-gallium-drivers=r600
+
+ * For `radeonsi`, you need:
+
+ --with-gallium-drivers=radeonsi
Now, once you’ve run `./configure`, time for your favorite beverage:
commit 14d63a8ce1beb6745b9197d5ce75ec3471e28a18
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Mon Jul 7 10:58:09 2014 +0200
build-mesa: Drop nouveau note
We are shipping nouveau_dri.so in libgl1-mesa-dri and we dropped the
package libgl1-mesa-dri-experimental.
diff --git a/xsf-docs/howto/build-mesa.txt b/xsf-docs/howto/build-mesa.txt
index ade3771..0557d49 100644
--- a/xsf-docs/howto/build-mesa.txt
+++ b/xsf-docs/howto/build-mesa.txt
@@ -27,15 +27,6 @@ in which case the appropriate options to be passed to
`./configure`
should be looked up in the `debian/rules` file of the Debian source
package.
-****
-.Note
-Before reading further, be aware that `nouveau` is a bit special:
-
- * It’s considered experimental, and shipped in the
- `libgl1-mesa-dri-experimental` package accordingly.
- * It may fail to build (both API and ABI are still changing).
-****
-
<<<
Gathering information
@@ -121,8 +112,7 @@ Now, what are the parameters to replace “++…++” with?
Basically, if
you determined an Intel driver (`i915` or `i965`), you want to use the
classic drivers and to disable the Gallium drivers. If you saw a
Radeon driver (`r300` or `r600`), you should prefer the Gallium
-drivers. If you’re using `nouveau`, make sure you read the note in the
-_Foreword_. The following assumes you’re using `nouveau_dri.so`.
+drivers.
Examples for common drivers:
commit 25b7a98e88565d091adc6814e333616e6bc12aad
Author: Cyril Brulebois <k...@debian.org>
Date: Tue May 13 14:57:57 2014 +0200
Fix missing quotation mark in 42-evdev.conf example.
diff --git a/xsf-docs/howto/configure-input.txt
b/xsf-docs/howto/configure-input.txt
index 3ec15ca..0a44e7a 100644
--- a/xsf-docs/howto/configure-input.txt
+++ b/xsf-docs/howto/configure-input.txt
@@ -117,7 +117,7 @@ Section "InputClass"
Identifier "evdev pointer tweaked catchall"
MatchIsPointer "on"
Driver "evdev"
- Option "Emulate3Buttons" True"
+ Option "Emulate3Buttons" "True"
Option "SwapAxes" "True"
EndSection
----
