Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 graphics-libs/mesa/DEPENDS                                     |    2 
 graphics-libs/mesa/HISTORY                                     |    4 +
 graphics-libs/mesa/PRE_BUILD                                   |    2 
 xorg/xserver/DEPENDS                                           |    2 
 xorg/xserver/HISTORY                                           |    6 ++
 xorg/xserver/PRE_BUILD                                         |    5 +-
 xorg/xserver/patches/0001-put-extensions-in-.mesa-subdir.patch |   24 
----------
 xorg/xserver/smgl/0001-put-extensions-in-.mesa-subdir.patch    |   24 
++++++++++
 8 files changed, 41 insertions(+), 28 deletions(-)

New commits:
commit 05c052ea5012dd68ff4055819464010325de2003
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    mesa - allow build without smgl-gl_select

commit 85a466170e576b25c49b1e0fd32d6cdadd9ae270
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    xserver - allow absent smgl-gl_select

diff --git a/graphics-libs/mesa/DEPENDS b/graphics-libs/mesa/DEPENDS
index 0ddea50..b55df39 100755
--- a/graphics-libs/mesa/DEPENDS
+++ b/graphics-libs/mesa/DEPENDS
@@ -57,5 +57,5 @@ optional_depends libselinux "selinux=true" "selinux=false" 
"SELinux-aware Mesa"
 optional_depends libglvnd "glvnd=true" "glvnd=false" "enable GLVND support'" 
&&
 
 if ! is_depends_enabled "${SPELL}" "libglvnd"; then
-  depends smgl-gl_select
+  optional_depends smgl-gl_select '' '' 'allow select OPENGL provider'
 fi
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index e549704..babe847 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,7 @@
+2018-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: smgl-gl_select optional
+       * PRE_BUILD: anly pathc if needed
+
 2018-08-30 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 18.2.0-rc5
 
diff --git a/graphics-libs/mesa/PRE_BUILD b/graphics-libs/mesa/PRE_BUILD
index 92dd222..c4a78a9 100755
--- a/graphics-libs/mesa/PRE_BUILD
+++ b/graphics-libs/mesa/PRE_BUILD
@@ -1,5 +1,5 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
-if ! is_depends_enabled "${SPELL}" "libglvnd"; then
+if  is_depends_enabled "${SPELL}" smgl-gl_select; then
   apply_patch_dir patches
 fi
diff --git a/xorg/xserver/DEPENDS b/xorg/xserver/DEPENDS
index 49c769e..1f2e880 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 168944a..172810b 100644
--- a/xorg/xserver/HISTORY
+++ b/xorg/xserver/HISTORY
@@ -1,3 +1,9 @@
+2018-09-03 Treeve Jelbert <treeve AT 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 AT sourcemage.org>
        * BUILD CONFIGURE: enable listen tcp
        * PRE_BUILD: delete hack
diff --git a/xorg/xserver/PRE_BUILD b/xorg/xserver/PRE_BUILD
index 922c0ab..8f8d46a 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/patches/0001-put-extensions-in-.mesa-subdir.patch
deleted file mode 100644
index ec25c28..0000000
--- a/xorg/xserver/patches/0001-put-extensions-in-.mesa-subdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 14f039a7c6bcb8e240845ff035a92bbd9e5e5a0b Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Thu, 5 Oct 2017 08:41:49 +0200
-Subject: [PATCH 1/3] put extensions in .mesa subdir
-
----
- hw/xfree86/dixmods/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d232..453f3de 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -52,6 +52,6 @@ if build_glx
-         link_with: e,
- 
-         install: true,
--        install_dir: join_paths(module_dir, 'extensions')
-+        install_dir: join_paths(module_dir, 'extensions/.mesa')
-     )
- endif
--- 
-2.16.1
-
diff --git a/xorg/xserver/smgl/0001-put-extensions-in-.mesa-subdir.patch 
b/xorg/xserver/smgl/0001-put-extensions-in-.mesa-subdir.patch
new file mode 100644
index 0000000..ec25c28
--- /dev/null
+++ b/xorg/xserver/smgl/0001-put-extensions-in-.mesa-subdir.patch
@@ -0,0 +1,24 @@
+From 14f039a7c6bcb8e240845ff035a92bbd9e5e5a0b Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Thu, 5 Oct 2017 08:41:49 +0200
+Subject: [PATCH 1/3] put extensions in .mesa subdir
+
+---
+ hw/xfree86/dixmods/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
+index 835d232..453f3de 100644
+--- a/hw/xfree86/dixmods/meson.build
++++ b/hw/xfree86/dixmods/meson.build
+@@ -52,6 +52,6 @@ if build_glx
+         link_with: e,
+ 
+         install: true,
+-        install_dir: join_paths(module_dir, 'extensions')
++        install_dir: join_paths(module_dir, 'extensions/.mesa')
+     )
+ endif
+-- 
+2.16.1
+