diff options
| author | George Sherwood | 2009-01-18 16:37:25 -0600 |
|---|---|---|
| committer | George Sherwood | 2009-01-18 16:37:25 -0600 |
| commit | 2f3ed85e07da4b9db69765b3f45754c23f042fe5 (patch) | |
| tree | 72536ef7e2384662464a4f1d8655a2846eecb2b0 | |
| parent | e0cf6f9e77d7bbb5a87188570cbabf55fde733a6 (diff) | |
xorg-server: Added patch to fix Bug #14937.
(cherry-picked from commit d337e27ef51b392ac3cc70d56c4ec6cc4db49720)
| -rw-r--r-- | xorg-xserver/xorg-server/HISTORY | 4 | ||||
| -rwxr-xr-x | xorg-xserver/xorg-server/PRE_BUILD | 1 | ||||
| -rw-r--r-- | xorg-xserver/xorg-server/xorg-server-mesa.patch | 10 |
3 files changed, 15 insertions, 0 deletions
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index c777b0ac4f..c98a757fbe 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -1,3 +1,7 @@ +2009-01-18 George Sherwood <gsherwood@sourcemage.org> + * PRE_BUILD: Added patch + * xorg-server-mesa.patch: Added patch to fix Bug #14937 + 2008-11-20 George Sherwood <gsherwood@sourcemage.org> * CONFIGURE: Add option to use build builtin bitmap fonts diff --git a/xorg-xserver/xorg-server/PRE_BUILD b/xorg-xserver/xorg-server/PRE_BUILD index b915f04fea..89094b4899 100755 --- a/xorg-xserver/xorg-server/PRE_BUILD +++ b/xorg-xserver/xorg-server/PRE_BUILD @@ -3,4 +3,5 @@ cd "$SOURCE_DIRECTORY" && unpack_file 2 && #patch -p0 < "$SPELL_DIRECTORY/randr.patch" +patch -p0 < "$SPELL_DIRECTORY/xorg-server-mesa.patch" patch -p1 < "$SPELL_DIRECTORY/evdev-flush.patch" diff --git a/xorg-xserver/xorg-server/xorg-server-mesa.patch b/xorg-xserver/xorg-server/xorg-server-mesa.patch new file mode 100644 index 0000000000..36541e83d6 --- /dev/null +++ b/xorg-xserver/xorg-server/xorg-server-mesa.patch @@ -0,0 +1,10 @@ +--- glx/Makefile.in.orig 2009-01-18 09:40:02.000000000 -0600 ++++ glx/Makefile.in 2009-01-18 09:40:46.000000000 -0600 +@@ -413,6 +413,7 @@ + -I$(top_srcdir)/hw/xfree86/common \ + -I$(top_srcdir)/hw/xfree86/dri \ + -I$(top_srcdir)/hw/xfree86/dri2 \ ++ -I@MESA_SOURCE@/inlcude \ + -I$(top_srcdir)/mi + + glapi_sources = \ |