x11-xserver-utils: Changes to 'debian-unstable'
debian/changelog | 7 +
debian/patches/03_xrandr-Move-outputs-among-crtcs-as-necessary.-Fixes-14570.patch | 56 ++++++++++
debian/patches/series | 1
debian/rules | 4
debian/xsfbs/xsfbs.mk | 29 +----
5 files changed, 77 insertions(+), 20 deletions(-)
New commits:
commit 1c4e3c0aead3c0d33693d1eb3c19a8a3d11aeb64
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Aug 2 17:24:59 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 40804bb..4c1bc58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-x11-xserver-utils (7.3+4) UNRELEASED; urgency=low
+x11-xserver-utils (7.3+4) unstable; urgency=low
* xrandr: move outputs among CRTCs as necessary (closes: #486142).
* debian/rules, xsfbs: fix rule dependencies.
- -- Julien Cristau <jcristau@debian.org> Sat, 02 Aug 2008 16:58:20 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 02 Aug 2008 17:24:30 +0200
x11-xserver-utils (7.3+3) unstable; urgency=low
commit a5c171a67de0b2bbbb6961ed5efe934e372ba3b4
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Aug 2 17:22:31 2008 +0200
debian/rules, xsfbs: fix rule dependencies.
diff --git a/debian/changelog b/debian/changelog
index 107c26f..40804bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11-xserver-utils (7.3+4) UNRELEASED; urgency=low
* xrandr: move outputs among CRTCs as necessary (closes: #486142).
+ * debian/rules, xsfbs: fix rule dependencies.
-- Julien Cristau <jcristau@debian.org> Sat, 02 Aug 2008 16:58:20 +0200
diff --git a/debian/rules b/debian/rules
index d9cf5f4..3d263df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,8 +37,8 @@ else
endif
-build: genscripts patch build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
dh_testdir
for FILE in $(DEF_SUBDIRS); do \
echo "$$FILE" ; \
commit 7bcd07ba5e3b2b62061e1c0f02b6115778388578
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Aug 2 16:59:07 2008 +0200
xrandr: move outputs among CRTCs as necessary (closes: #486142).
diff --git a/debian/changelog b/debian/changelog
index 2954c42..107c26f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xserver-utils (7.3+4) UNRELEASED; urgency=low
+
+ * xrandr: move outputs among CRTCs as necessary (closes: #486142).
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 02 Aug 2008 16:58:20 +0200
+
x11-xserver-utils (7.3+3) unstable; urgency=low
* xrdb 1.0.5
diff --git a/debian/patches/03_xrandr-Move-outputs-among-crtcs-as-necessary.-Fixes-14570.patch b/debian/patches/03_xrandr-Move-outputs-among-crtcs-as-necessary.-Fixes-14570.patch
new file mode 100644
index 0000000..47bebd0
--- /dev/null
+++ b/debian/patches/03_xrandr-Move-outputs-among-crtcs-as-necessary.-Fixes-14570.patch
@@ -0,0 +1,56 @@
+From 4dcc8ae1a6903434def1a2706f7c68ff9e2a17c4 Mon Sep 17 00:00:00 2001
+From: Hong Liu <hong.liu@intel.com>
+Date: Mon, 10 Mar 2008 21:37:09 -0700
+Subject: [PATCH] Move outputs among crtcs as necessary. Fixes 14570
+
+This patch makes new requests override existing crtc allocations. Outputs
+with restricted crtc usage can now force existing outputs to switch
+automatcially.
+---
+ xrandr.c | 9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/xrandr/xrandr.c b/xrandr/xrandr.c
+index e2a657f..41e15dd 100644
+--- a/xrandr/xrandr.c
++++ b/xrandr/xrandr.c
+@@ -1241,7 +1241,7 @@ mark_changing_crtcs (void)
+ * Test whether 'crtc' can be used for 'output'
+ */
+ Bool
+-check_crtc_for_output (crtc_t *crtc, output_t *output)
++check_crtc_for_output (crtc_t *crtc, output_t *output, Bool ignore_state)
+ {
+ int c;
+ int l;
+@@ -1272,6 +1272,9 @@ check_crtc_for_output (crtc_t *crtc, output_t *output)
+ return False;
+ }
+
++ if (ignore_state)
++ return True;
++
+ if (crtc->noutput)
+ {
+ /* make sure the state matches */
+@@ -1313,7 +1316,7 @@ find_crtc_for_output (output_t *output)
+ crtc = find_crtc_by_xid (output->output_info->crtcs[c]);
+ if (!crtc) fatal ("cannot find crtc 0x%x\n", output->output_info->crtcs[c]);
+
+- if (check_crtc_for_output (crtc, output))
++ if (check_crtc_for_output (crtc, output, False))
+ return crtc;
+ }
+ return NULL;
+@@ -1518,7 +1521,7 @@ pick_crtcs_score (output_t *outputs)
+
+ /* reset crtc allocation for following outputs */
+ disable_outputs (outputs);
+- if (!check_crtc_for_output (crtc, output))
++ if (!check_crtc_for_output (crtc, output, True))
+ continue;
+
+ my_score = 1000;
+--
+1.5.6.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 3dcbcaf..4e9118b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_sessreg_implement_hostname_hashing.diff -p0
02_xmodmap_manpage.diff
+03_xrandr-Move-outputs-among-crtcs-as-necessary.-Fixes-14570.patch
commit 86e7669f5d912824e341ea487a6257ec5433eb90
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 17 15:44:45 2008 +0200
xsfbs.mk: make 'log' a separate target
'prepare' runs genscripts, and we don't want that in unpatch,
so create stampdir/log in a separate target, and make unpatch
depend on that instead of prepare.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 984e81c..f0f8953 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
- mkdir -p $(STAMP_DIR)/log
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
>$@
+.PHONY: log
+stampdir_targets+=log
+log: $(STAMP_DIR)/log
+$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+ mkdir -p $(STAMP_DIR)/log
+
# Apply all patches to the upstream source.
.PHONY: patch
stampdir_targets+=patch
@@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/prepare
+unpatch: $(STAMP_DIR)/log
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 50619e730fcaf422ffa4451468520526b2a830b8
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 16 18:42:14 2008 +0200
xsfbs.mk: update the list of releases, and drop some unused code
we haven't had a separate source tree since modularization.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2350f80..984e81c 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://')
BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}})
# Find out if this is an official build; an official build has nothing but
-# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the
+# digits, dots, and/or the codename of a release in the Debian part of the
# version number. Anything else indicates an unofficial build.
-OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi)
+OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi)
# Set up parameters for the Debian build environment.
@@ -69,16 +69,6 @@ endif
# $(STAMP_DIR) houses stamp files for complex targets.
STAMP_DIR:=stampdir
-# $(SOURCE_DIR) houses one or more source trees.
-SOURCE_DIR:=build-tree
-
-# $(SOURCE_TREE) is the location of the source tree to be compiled. If there
-# is more than one, others are found using this name plus a suffix to indicate
-# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The
-# "setup" target is responsible for creating such trees.
-#SOURCE_TREE:=$(SOURCE_DIR)/xc
-#FIXME We need to define this in our debian/rules file
-
# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place
# their files.
DEBTREEDIR:=$(CURDIR)/debian/tmp
commit 6c29758eb1a2798f6b77516b7a75dc399769d217
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: more parallel make fixing
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index fa2431e..2350f80 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,8 +119,8 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
+prepare: $(STAMP_DIR)/prepare
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
mkdir -p $(STAMP_DIR)/log
>$@
commit 78b3958b14a5298165d8500d711342be1b7b6463
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: fix the prepare target for parallel make
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b871b3b..fa2431e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,11 +119,9 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- if [ ! -e $(STAMP_DIR)/log ]; then \
- mkdir $(STAMP_DIR)/log; \
- fi; \
+ mkdir -p $(STAMP_DIR)/log
>$@
# Apply all patches to the upstream source.
Reply to: