Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (6e7be21b7fa7db9e1371d8109938a8fcf347568f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (6e7be21b7fa7db9e1371d8109938a8fcf347568f)
  • Date: Thu, 30 Aug 2018 01:58:07 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

graphics-libs/mesalib/DEPENDS | 8 ++++++--
graphics-libs/mesalib/FINAL | 4 +++-
graphics-libs/mesalib/HISTORY | 3 +++
graphics-libs/mesalib/PRE_BUILD | 28 +++++++++++++++-------------
4 files changed, 27 insertions(+), 16 deletions(-)

New commits:
commit 6e7be21b7fa7db9e1371d8109938a8fcf347568f
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

graphics-libs/mesalib: added libglvnd option

diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 984e7c0..e72764f 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -1,6 +1,5 @@
. "${GRIMOIRE}/FUNCTIONS" &&

-depends smgl-gl_select &&
depends -sub "CXX" gcc &&
depends bison &&
depends flex &&
@@ -105,4 +104,9 @@ fi &&
optional_depends libva "--enable-va" "--disable-va" "video
acceleration support" &&
optional_depends libvdpau "--enable-vdpau" "--disable-vdpau" "VDPAU support"
&&
optional_depends libxvmc "--enable-xvmc" "--disable-xvmc" "XvMC support
(obsolete)"
-optional_depends libunwind "--enable-libunwind" "--disable-libunwind"
"debugging"
+optional_depends libunwind "--enable-libunwind" "--disable-libunwind"
"debugging" &&
+optional_depends libglvnd "--enable-libglvnd" "--disable-libglvnd" "GLVND
support" &&
+
+if ! is_depends_enabled "${SPELL}" "libglvnd"; then
+ depends smgl-gl_select
+fi
diff --git a/graphics-libs/mesalib/FINAL b/graphics-libs/mesalib/FINAL
index 1895a77..b55521f 100755
--- a/graphics-libs/mesalib/FINAL
+++ b/graphics-libs/mesalib/FINAL
@@ -1 +1,3 @@
-glselect mesa
+if ! is_depends_enabled "${SPELL}" "libglvnd"; then
+ glselect mesa
+fi
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 012ef17..f4d928d 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,6 @@
+2018-08-29 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS, FINAL, PRE_BUILD: added libglvnd option
+
2018-08-24 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 18.1.7

diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 571bb5e..ad18d58 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -1,18 +1,20 @@
default_pre_build &&

-cd ${SOURCE_DIRECTORY}/src &&
-sed -e '/lib_LTLIBRARIES/s:lib_:egl&:' \
- -e '/lib_LTLIBRARIES/iegllibdir = ${libdir}/.mesa' \
- -i egl/Makefile.am &&
-sed -e '/lib_LTLIBRARIES/s:lib_:gl_:' \
- -e '/gl_LTLIBRARIES/igldir = ${libdir}/.mesa' \
- -i glx/Makefile.am &&
-sed -e '/lib_LTLIBRARIES += es1api/s:lib_LTLIBRARIES +=:gles_LTLIBRARIES =:'
\
- -e '/gles_LTLIBRARIES = es1api/iglesdir = ${libdir}/.mesa' \
- -e '/lib_LTLIBRARIES += es2api/s:lib_LTLIBRARIES +=:gles2_LTLIBRARIES
=:' \
- -e '/gles2_LTLIBRARIES = es2api/igles2dir = ${libdir}/.mesa' \
- -i mapi/Makefile.am &&
-sed -i '/includedir/s;GL;&/.mesa;' Makefile.am mesa/Makefile.am &&
+if ! is_depends_enabled "${SPELL}" "libglvnd"; then
+ cd ${SOURCE_DIRECTORY}/src &&
+ sed -e '/lib_LTLIBRARIES/s:lib_:egl&:' \
+ -e '/lib_LTLIBRARIES/iegllibdir = ${libdir}/.mesa' \
+ -i egl/Makefile.am &&
+ sed -e '/lib_LTLIBRARIES/s:lib_:gl_:' \
+ -e '/gl_LTLIBRARIES/igldir = ${libdir}/.mesa' \
+ -i glx/Makefile.am &&
+ sed -e '/lib_LTLIBRARIES += es1api/s:lib_LTLIBRARIES +=:gles_LTLIBRARIES
=:' \
+ -e '/gles_LTLIBRARIES = es1api/iglesdir = ${libdir}/.mesa' \
+ -e '/lib_LTLIBRARIES += es2api/s:lib_LTLIBRARIES +=:gles2_LTLIBRARIES
=:' \
+ -e '/gles2_LTLIBRARIES = es2api/igles2dir = ${libdir}/.mesa' \
+ -i mapi/Makefile.am &&
+ sed -i '/includedir/s;GL;&/.mesa;' Makefile.am mesa/Makefile.am
+fi &&

cd ${SOURCE_DIRECTORY} &&
autoreconf -f -i --symlink



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (6e7be21b7fa7db9e1371d8109938a8fcf347568f), Pavel Vinogradov, 08/29/2018

Archive powered by MHonArc 2.6.24.

Top of Page