diff options
| author | Ethan Grammatikidis | 2009-01-20 17:47:22 +0000 |
|---|---|---|
| committer | Arwed von Merkatz | 2009-01-26 18:28:34 +0100 |
| commit | 68de77638b6a83b3d362fc8aab8c5fc4a6c66cfd (patch) | |
| tree | c3dec65704ce71e2a8b1dbecb17b8fa3c2c2ec65 | |
| parent | 4a92d06bf6eebe9cce49534b8b31f50787b9a2e9 (diff) | |
xorg-server: made mesa header path patch optional
(cherry picked from commit 23d238f863e383287b0c526ab9bef3ac54b2cff1)
| -rwxr-xr-x | xorg-xserver/xorg-server/CONFIGURE | 8 | ||||
| -rw-r--r-- | xorg-xserver/xorg-server/HISTORY | 4 | ||||
| -rwxr-xr-x | xorg-xserver/xorg-server/PRE_BUILD | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/xorg-xserver/xorg-server/CONFIGURE b/xorg-xserver/xorg-server/CONFIGURE index c008a6773b..38f0eefc94 100755 --- a/xorg-xserver/xorg-server/CONFIGURE +++ b/xorg-xserver/xorg-server/CONFIGURE @@ -374,4 +374,10 @@ config_query_multi XORG_SERVER_VIDEO_DRIVER_OBSCURE \ xf86-video-suncg14 \ xf86-video-newport \ xf86-video-rendition \ - xf86-video-siliconmotion + xf86-video-siliconmotion && + +config_query_option XORG_SERVER_MESA_PATH_PATCH \ + "Apply patch to search for extra mesalib include files?"\ + n \ + "t" \ + "" diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index c98a757fbe..764a746050 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -1,3 +1,7 @@ +2009-01-20 Ethan Grammatikidis <eekee57@fastmail.fm> + * CONFIGURE, PRE_BUILD: made George's patch optional because it + broke compilation for me. + 2009-01-18 George Sherwood <gsherwood@sourcemage.org> * PRE_BUILD: Added patch * xorg-server-mesa.patch: Added patch to fix Bug #14937 diff --git a/xorg-xserver/xorg-server/PRE_BUILD b/xorg-xserver/xorg-server/PRE_BUILD index 89094b4899..016f982389 100755 --- a/xorg-xserver/xorg-server/PRE_BUILD +++ b/xorg-xserver/xorg-server/PRE_BUILD @@ -3,5 +3,7 @@ cd "$SOURCE_DIRECTORY" && unpack_file 2 && #patch -p0 < "$SPELL_DIRECTORY/randr.patch" -patch -p0 < "$SPELL_DIRECTORY/xorg-server-mesa.patch" +if [[ "$XORG_SERVER_MESA_PATH_PATCH" == "t" ]] ; then + patch -p0 < "$SPELL_DIRECTORY/xorg-server-mesa.patch" +fi && patch -p1 < "$SPELL_DIRECTORY/evdev-flush.patch" |