diff options
| author | Pavel Vinogradov | 2018-08-30 20:37:57 -0400 |
|---|---|---|
| committer | Pavel Vinogradov | 2018-08-30 20:37:57 -0400 |
| commit | 58fa75ee37a97bf24bdcc926328d037a06ba9275 (patch) | |
| tree | f5818f3a4132230a35557702e6fdd42b0fe764a7 /xorg-xserver/xorg-server | |
| parent | 79f325ddd97e2b856de950e4e48dbd32e8a0f8fb (diff) | |
xorg-xserver/xorg-server: handle the case when smgl-gl_select isn't installed
Diffstat (limited to 'xorg-xserver/xorg-server')
| -rw-r--r-- | xorg-xserver/xorg-server/HISTORY | 4 | ||||
| -rwxr-xr-x | xorg-xserver/xorg-server/POST_RESURRECT | 6 | ||||
| -rwxr-xr-x | xorg-xserver/xorg-server/PRE_BUILD | 12 | ||||
| -rwxr-xr-x | xorg-xserver/xorg-server/REPAIR^all^POST_RESURRECT | 6 |
4 files changed, 19 insertions, 9 deletions
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index 18245f3300..11b14421e9 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -1,3 +1,7 @@ +2018-08-30 Pavel Vinogradov <public@sourcemage.org> + * POST_RESURRECT, PRE_BUILD, REPAIR^all^POST_RESURRECT: added check + for smgl-gl_select availability + 2018-08-07 Pavel Vinogradov <public@sourcemage.org> * DETAILS: version 1.20.1 diff --git a/xorg-xserver/xorg-server/POST_RESURRECT b/xorg-xserver/xorg-server/POST_RESURRECT index 44b09764dc..b17d803915 100755 --- a/xorg-xserver/xorg-server/POST_RESURRECT +++ b/xorg-xserver/xorg-server/POST_RESURRECT @@ -1,2 +1,4 @@ -. $GRIMOIRE/FUNCTIONS -glselect mesa +. "${GRIMOIRE}/FUNCTIONS" && +if spell_ok "smgl-gl_select"; then + glselect mesa +fi diff --git a/xorg-xserver/xorg-server/PRE_BUILD b/xorg-xserver/xorg-server/PRE_BUILD index 7e44ca5c5c..8a67cbfd3a 100755 --- a/xorg-xserver/xorg-server/PRE_BUILD +++ b/xorg-xserver/xorg-server/PRE_BUILD @@ -1,8 +1,10 @@ default_pre_build && -# required to build -glselect mesa && cd "$SOURCE_DIRECTORY" && -# some install scripts are missing! -autoreconf -f -i --symlink && -patch -p1 < $SPELL_DIRECTORY/gl_select.patch +if spell_ok "smgl-gl_select"; then + # required to build + glselect mesa && + # some install scripts are missing! + autoreconf -f -i --symlink && + patch -p1 < $SPELL_DIRECTORY/gl_select.patch +fi diff --git a/xorg-xserver/xorg-server/REPAIR^all^POST_RESURRECT b/xorg-xserver/xorg-server/REPAIR^all^POST_RESURRECT index 44b09764dc..b17d803915 100755 --- a/xorg-xserver/xorg-server/REPAIR^all^POST_RESURRECT +++ b/xorg-xserver/xorg-server/REPAIR^all^POST_RESURRECT @@ -1,2 +1,4 @@ -. $GRIMOIRE/FUNCTIONS -glselect mesa +. "${GRIMOIRE}/FUNCTIONS" && +if spell_ok "smgl-gl_select"; then + glselect mesa +fi |