debian/changelog | 7 ++
debian/patches/18_glx_initialize_getvisualconfigs_buf.diff | 23 +++++++
debian/patches/43_allow_override_BIOS_EDID_preferred_mode.diff | 12 +++-
debian/patches/44_preferredmode_infinite_loop.diff | 12 +---
debian/patches/series | 1
debian/xsfbs/xsfbs.mk | 29
+++-------
6 files changed, 56 insertions(+), 28 deletions(-)
New commits:
commit 8f33d906758c3e274111395d4decb2d12be8d13f
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jul 17 16:23:45 2008 +0200
GLX: zero the buffer used in __glXDisp_GetVisualConfigs
refresh other patches
diff --git a/debian/changelog b/debian/changelog
index 0de19bd..12c89dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.4.2-2) UNRELEASED; urgency=low
+
+ * GLX: zero the buffer used in __glXDisp_GetVisualConfigs (backport from
+ upstream).
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Thu, 17 Jul 2008 16:22:04 +0200
+
xorg-server (2:1.4.2-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/patches/18_glx_initialize_getvisualconfigs_buf.diff
b/debian/patches/18_glx_initialize_getvisualconfigs_buf.diff
new file mode 100644
index 0000000..011834e
--- /dev/null
+++ b/debian/patches/18_glx_initialize_getvisualconfigs_buf.diff
@@ -0,0 +1,23 @@
+From: Guillaume Melquiond <[EMAIL PROTECTED]>
+Subject: GLX: initialize the buffer in GetVisualConfigs
+
+Backport from edad0a9dfebcce5c54b2f9c32bd9d45549e20c51.
+
+http://bugs.freedesktop.org/show_bug.cgi?id=13358
+http://bugs.freedesktop.org/show_bug.cgi?id=13863
+
+Index: xorg-server/GL/glx/glxcmds.c
+===================================================================
+--- xorg-server.orig/GL/glx/glxcmds.c
++++ xorg-server/GL/glx/glxcmds.c
+@@ -992,6 +992,10 @@
+ buf[p++] = GLX_TRANSPARENT_INDEX_VALUE;
+ buf[p++] = modes->transparentIndex;
+
++ while (p < __GLX_TOTAL_CONFIG) {
++ buf[p++] = 0;
++ }
++
+ if ( do_swap ) {
+ __GLX_SWAP_INT_ARRAY(buf, __GLX_TOTAL_CONFIG);
+ }
diff --git a/debian/patches/43_allow_override_BIOS_EDID_preferred_mode.diff
b/debian/patches/43_allow_override_BIOS_EDID_preferred_mode.diff
index f312fd5..7fbe877 100644
--- a/debian/patches/43_allow_override_BIOS_EDID_preferred_mode.diff
+++ b/debian/patches/43_allow_override_BIOS_EDID_preferred_mode.diff
@@ -8,6 +8,8 @@ It should cause the config file to override the EDID/BIOS
detected preferred mod
# modified: hw/xfree86/modes/xf86Crtc.c
# modified: hw/xfree86/modes/xf86Crtc.h
#
+Index: xorg-server/hw/xfree86/common/xf86str.h
+===================================================================
--- xorg-server.orig/hw/xfree86/common/xf86str.h
+++ xorg-server/hw/xfree86/common/xf86str.h
@@ -132,6 +132,7 @@
@@ -18,6 +20,8 @@ It should cause the config file to override the EDID/BIOS
detected preferred mod
/* Video mode */
typedef struct _DisplayModeRec {
+Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
+===================================================================
--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c
+++ xorg-server/hw/xfree86/modes/xf86Crtc.c
@@ -711,7 +711,8 @@
@@ -30,7 +34,7 @@ It should cause the config file to override the EDID/BIOS
detected preferred mod
int diff;
if (xf86ModeWidth (mode, output->initial_rotation) > width ||
-@@ -1415,7 +1416,7 @@
+@@ -1431,7 +1432,7 @@
mode->prev = NULL;
output->probed_modes = mode;
}
@@ -39,7 +43,7 @@ It should cause the config file to override the EDID/BIOS
detected preferred mod
}
else
mode->type &= ~M_T_PREFERRED;
-@@ -1532,6 +1533,7 @@
+@@ -1548,6 +1549,7 @@
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
int o, c;
DisplayModePtr target_mode = NULL;
@@ -47,7 +51,7 @@ It should cause the config file to override the EDID/BIOS
detected preferred mod
Rotation target_rotation = RR_Rotate_0;
xf86CrtcPtr *crtcs;
DisplayModePtr *modes;
-@@ -1572,43 +1574,34 @@
+@@ -1588,43 +1590,34 @@
}
/*
@@ -111,6 +115,8 @@ It should cause the config file to override the EDID/BIOS
detected preferred mod
for (o = 0; o < config->num_output; o++)
{
xf86OutputPtr output = config->output[o];
+Index: xorg-server/hw/xfree86/modes/xf86Crtc.h
+===================================================================
--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.h
+++ xorg-server/hw/xfree86/modes/xf86Crtc.h
@@ -39,6 +39,9 @@
diff --git a/debian/patches/44_preferredmode_infinite_loop.diff
b/debian/patches/44_preferredmode_infinite_loop.diff
index 9ab791d..ea05489 100644
--- a/debian/patches/44_preferredmode_infinite_loop.diff
+++ b/debian/patches/44_preferredmode_infinite_loop.diff
@@ -11,11 +11,11 @@ to be selected by the initial mode selection code.
hw/xfree86/modes/xf86Crtc.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 0a48d5b..bb416fd 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1417,9 +1417,8 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int
maxY)
+Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c
++++ xorg-server/hw/xfree86/modes/xf86Crtc.c
+@@ -1433,9 +1433,8 @@
output->probed_modes = mode;
}
mode->type |= (M_T_PREFERRED|M_T_USERPREF);
@@ -26,6 +26,3 @@ index 0a48d5b..bb416fd 100644
}
}
---
-1.5.3.6
-
diff --git a/debian/patches/series b/debian/patches/series
index 6132c6c..8cd37db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,6 +13,7 @@
15_X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch
16_X86EMU-pass-the-correct-bus-dev-fn-tag-to-pci-emula.patch
17_x86emu_handle_cpuid.patch
+18_glx_initialize_getvisualconfigs_buf.diff
21_glx_align_fixes.patch
41_vbe_filter_less.diff
43_allow_override_BIOS_EDID_preferred_mode.diff
commit 86e7669f5d912824e341ea487a6257ec5433eb90
Author: Julien Cristau <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
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 [EMAIL PROTECTED](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 <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
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.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
