Skip to Content.
Sympa Menu

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

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 (dcbfaaad9f9b51f863051ac560ff476e7cbf54bb)
  • Date: Fri, 24 Mar 2017 02:45:17 +0000

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

graphics-libs/mesalib/CONFIGURE | 44 -----------------------
graphics-libs/mesalib/DEPENDS | 76
+++++++++++++++++++++++++++++++---------
graphics-libs/mesalib/HISTORY | 3 +
3 files changed, 62 insertions(+), 61 deletions(-)

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

graphics-libs/mesalib: reorganized the code around Gallium drivers

diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 42e1989..10db778 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -27,50 +27,6 @@ case $MESALIB_BUILD in

if list_find "$MESALIB_DRIVERS" all; then
MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
- fi &&
-
-
-# TODO: Proper dependencies for those ... also libdrm ...
- AVAILABLE_GALLIUM="i915 llvmpipe nouveau r300 r600 radeon radeonsi
softpipe svga swrast virgl"
-
- config_query_multi MESALIB_GALLIUM \
- "What Gallium3D drivers woulld you like to build?" \
- none all $AVAILABLE_GALLIUM
- if [[ $MESALIB_GALLIUM = all ]]; then
- MESALIB_GALLIUM=$AVAILABLE_GALLIUM
- fi &&
-
- if [[ $MESALIB_GALLIUM != "" ]] && [[ $MESALIB_GALLIUM != none ]]; then
- list_add MESALIB_OPTS "--enable-gallium-llvm" &&
- list_add MESALIB_OPTS "--enable-egl" &&
-# remove obsolete fbdev option
- list_remove MESA_EGL fbdev &&
- config_query_multi MESA_EGL "which EGL platforms?" drm wayland x11
- if list_find "$MESA_EGL" wayland;then
- list_remove MESALIB_OPTS "--disable-shared-glapi" &&
- list_remove MESALIB_OPTS "--disable-gbm" &&
- list_remove MESALIB_OPTS "--disable-gles2" &&
- list_add MESALIB_OPTS "--enable-shared-glapi"&&
- list_add MESALIB_OPTS "--enable-gbm" &&
- list_add MESALIB_OPTS "--enable-gles2"
- else
- config_query_option MESALIB_OPTS "enable shared GLapi" n \
- "--enable-shared-glapi" "--disable-shared-glapi" &&
-
- config_query_option MESALIB_OPTS "enable Generic Buffer Management?" n
\
- "--enable-gbm" "--disable-gbm"
- config_query_option MESALIB_OPTS "enable support for OpenGL ES 2.x
API?" n \
- "--enable-gles2" "--disable-gles2"
- fi
-# config_query_option MESALIB_OPTS "enable support for OpenGL ES 1.x
API?" n \
-# "--enable-gles1" "--disable-gles1"
- else
- MESALIB_GALLIUM=
- config_query_option MESALIB_OPTS "enable EGL library?" y \
- "--enable-egl" "--disable-egl"
- if list_find "$MESALIB_OPTS" --enable-egl; then
- MESALIB_OPTS+=" --enable-gbm" # Mandatory!
- fi
fi
;;
xlib)
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index e7f2667..ca73aa0 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -30,25 +30,70 @@ case ${MESALIB_BUILD} in
optional_depends DEVICE-MANAGER \
"" \
"--enable-sysfs" \
- "Use a device manager instead of sysfs"
+ "Use a device manager instead of sysfs" &&
+
+ optional_depends llvm \
+ "--enable-llvm" \
+ "--disable-llvm" \
+ "for Gallium drivers" &&
+
+ if is_depends_enabled "${SPELL}" "llvm"; then
+ list_add MESALIB_OPTS "--enable-egl" &&
+
+ depends LIBELF &&
+ depends mako &&
+ depends python &&
+
+ local AVAILABLE_GALLIUM="i915 llvmpipe nouveau r300 r600 radeon radeonsi
softpipe svga swrast virgl" &&
+ config_query_multi MESALIB_GALLIUM \
+ "What Gallium3D drivers woulld you like to build?" \
+ all ${AVAILABLE_GALLIUM} &&
+ if list_find "${MESALIB_GALLIUM}" "all"; then
+ MESALIB_GALLIUM=${AVAILABLE_GALLIUM}
+ fi &&
+
+ # remove obsolete fbdev option
+ list_remove MESA_EGL fbdev &&
+ config_query_multi MESA_EGL "which EGL platforms?" drm wayland x11
+
+ if list_find "${MESA_EGL}" "wayland"; then
+ list_remove MESALIB_OPTS "--disable-shared-glapi" &&
+ list_remove MESALIB_OPTS "--disable-gbm" &&
+ list_remove MESALIB_OPTS "--disable-gles2" &&
+ list_add MESALIB_OPTS "--enable-shared-glapi --enable-gbm
--enable-gles2" &&
+ depends wayland
+ else
+ config_query_option MESALIB_OPTS "enable shared GLapi" n \
+ "--enable-shared-glapi" "--disable-shared-glapi" &&
+ config_query_option MESALIB_OPTS "enable Generic Buffer Management?" n
\
+ "--enable-gbm" "--disable-gbm"
+ config_query_option MESALIB_OPTS "enable support for OpenGL ES 2.x
API?" n \
+ "--enable-gles2" "--disable-gles2"
+ fi
+
+ if list_find "${MESALIB_GALLIUM}" "i915"; then
+ sub_depends libdrm INTEL
+ fi &&
+ if list_find "${MESALIB_GALLIUM}" "nouveau"; then
+ sub_depends libdrm NOUVEAU
+ fi &&
+ if (list_find "${MESALIB_GALLIUM}" "r300") ||
+ (list_find "${MESALIB_GALLIUM}" "r600") ||
+ (list_find "${MESALIB_GALLIUM}" "radeon"); then
+ sub_depends libdrm RADEON
+ fi &&
+ if list_find "${MESALIB_GALLIUM}" "radeonsi"; then
+ sub_depends libdrm AMD
+ fi
+ else
+ config_query_option MESALIB_OPTS "enable EGL library?" y \
+ "--enable-egl --enable-gbm" "--disable-egl"
+ fi
;;
*)
;;
esac &&

-if [[ -n ${MESALIB_GALLIUM} ]] && [[ "${MESALIB_GALLIUM}" != "none" ]]; then
- depends llvm &&
- depends LIBELF &&
- depends mako &&
- depends python &&
- if list_find "${MESA_EGL}" wayland;then
- depends wayland
- fi &&
- if list_find "${MESALIB_GALLIUM}" radeonsi;then
- sub_depends libdrm AMD
- fi
-fi &&
-
if ( list_find "${MESALIB_DRIVERS}" i915 ) || \
( list_find "${MESALIB_DRIVERS}" i965); then
sub_depends libdrm INTEL
@@ -63,9 +108,6 @@ if ( list_find "${MESALIB_DRIVERS}" nouveau); then
sub_depends libdrm NOUVEAU
fi &&

-if list_find "${MESA_EGL}" wayland;then
- depends wayland
-fi &&
optional_depends libva "" "" "video acceleration support" &&
optional_depends libvdpau "" "" "VDPAU support" &&
optional_depends libxvmc "--enable-xvmc" "--disable-xvmc" "XvMC support
(obsolete)"
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index f3945dc..71cd684 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,6 @@
+2017-03-23 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFIGURE, DEPENDS: reorganized the code around Gallium drivers
+
2017-03-21 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: removed STAGED_INSTALL=off, caused missing dri and vdpau
drivers



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (dcbfaaad9f9b51f863051ac560ff476e7cbf54bb), Pavel Vinogradov, 03/23/2017

Archive powered by MHonArc 2.6.24.

Top of Page