diff options
| author | Treeve Jelbert | 2018-09-03 14:35:20 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2018-09-03 14:35:20 +0200 |
| commit | 85a466170e576b25c49b1e0fd32d6cdadd9ae270 (patch) | |
| tree | 6b1b7936b2765778ec6f8c3b54b4634239a4193b /xorg | |
| parent | d9196e9b34b0f7ba59d10987eac9eadd9c6783d9 (diff) | |
xserver - allow absent smgl-gl_select
Diffstat (limited to 'xorg')
| -rwxr-xr-x | xorg/xserver/DEPENDS | 2 | ||||
| -rw-r--r-- | xorg/xserver/HISTORY | 6 | ||||
| -rwxr-xr-x | xorg/xserver/PRE_BUILD | 5 | ||||
| -rw-r--r-- | xorg/xserver/smgl/0001-put-extensions-in-.mesa-subdir.patch (renamed from xorg/xserver/patches/0001-put-extensions-in-.mesa-subdir.patch) | 0 |
4 files changed, 11 insertions, 2 deletions
diff --git a/xorg/xserver/DEPENDS b/xorg/xserver/DEPENDS index 49c769e5fd..1f2e880904 100755 --- a/xorg/xserver/DEPENDS +++ b/xorg/xserver/DEPENDS @@ -62,7 +62,7 @@ if is_depends_enabled $SPELL libxv;then optional_depends libxvmc 'xvmc=true' 'xvmc=false' 'XvMC extension' fi && -#optional_depends '' '' '' +optional_depends smgl-gl_select '' '' 'select oepngl provider' && #depends libice #depends libxrender #depends libxrandr diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY index 168944a289..172810b24c 100644 --- a/xorg/xserver/HISTORY +++ b/xorg/xserver/HISTORY @@ -1,3 +1,9 @@ +2018-09-03 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: optional smgl-gl_select + * PRE_BUILD; only apply smgl patch if relevant + * 0001-put-extensions-in-.mesa-subdir.patch: move to separate subdir + since mesa, can now be built without smgl_gl_select, adapt this aslo + 2018-08-07 Treeve Jelbert <treeve@sourcemage.org> * BUILD CONFIGURE: enable listen tcp * PRE_BUILD: delete hack diff --git a/xorg/xserver/PRE_BUILD b/xorg/xserver/PRE_BUILD index 922c0ab256..8f8d46a549 100755 --- a/xorg/xserver/PRE_BUILD +++ b/xorg/xserver/PRE_BUILD @@ -1,3 +1,6 @@ default_pre_build && cd $SOURCE_DIRECTORY && -apply_patch_dir patches +apply_patch_dir patches && +if is_depends_enabled $SPELL smgl-gl_select;then + apply_patch_dir smgl +fi diff --git a/xorg/xserver/patches/0001-put-extensions-in-.mesa-subdir.patch b/xorg/xserver/smgl/0001-put-extensions-in-.mesa-subdir.patch index ec25c28f55..ec25c28f55 100644 --- a/xorg/xserver/patches/0001-put-extensions-in-.mesa-subdir.patch +++ b/xorg/xserver/smgl/0001-put-extensions-in-.mesa-subdir.patch |