Skip to Content.
Sympa Menu

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

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 (7e6d224ede8e8e3044cf8eac30909920871d2eeb)
  • Date: Mon, 17 Apr 2017 20:44:04 +0000

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

graphics-libs/mesalib/BUILD | 2
graphics-libs/mesalib/DEPENDS | 106
++++++++++++++++++++++--------------------
graphics-libs/mesalib/DETAILS | 3 -
graphics-libs/mesalib/HISTORY | 6 ++
4 files changed, 66 insertions(+), 51 deletions(-)

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

graphics-libs/mesalib: version 17.0.4 + cleanups

diff --git a/graphics-libs/mesalib/BUILD b/graphics-libs/mesalib/BUILD
index 15479ec..5ece048 100755
--- a/graphics-libs/mesalib/BUILD
+++ b/graphics-libs/mesalib/BUILD
@@ -9,6 +9,6 @@ vulkan_drivers=${vulkan_drivers//none/no} &&
OPTS+=" --with-dri-drivers=${MESALIB_DRIVERS// /,} \
--with-gallium-drivers=${MESALIB_GALLIUM// /,} \
--with-vulkan-drivers=${vulkan_drivers} \
- --with-egl-platforms=${MESA_EGL//\ /,} \
+ --with-platforms=${MESA_EGL//\ /,} \
${MESALIB_OPTS}" &&
default_build
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 0f7ccf2..be6bbb5 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -6,11 +6,7 @@ depends bison &&
depends flex &&
depends gettext &&
depends dri2proto &&
-depends -sub 'AMD' libdrm &&
-depends llvm '--enable-lvm --enable-egl' &&
-depends LIBELF &&
-depends mako &&
-depends python &&
+depends libdrm &&
depends util-macros &&
depends expat &&
depends libxdamage &&
@@ -36,50 +32,64 @@ case ${MESALIB_BUILD} in
"--enable-sysfs" \
"Use a device manager instead of sysfs" &&

- local AVAILABLE_GALLIUM="i915 ilo nouveau r300 r600 radeonsi freedreno
svga swrast vc4 virgl etnaviv imx" &&
-
- list_remove MESALIB_GALLIUM 'llvmpipe' &&
- list_remove MESALIB_GALLIUM 'radeon' &&
-
- config_query_multi MESALIB_GALLIUM \
- "What Gallium3D drivers would 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
- list_remove MESALIB_OPTS '--disable-shared-glapi' &&
- list_add MESALIB_OPTS '--enable-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
+ optional_depends llvm \
+ "--enable-llvm --enable-egl" \
+ "--disable-llvm" \
+ "for Gallium drivers" &&
+
+ if is_depends_enabled "${SPELL}" "llvm"; then
+ depends LIBELF &&
+ depends mako &&
+ depends python &&
+
+ local AVAILABLE_GALLIUM="i915 ilo nouveau r300 r600 radeonsi freedreno
svga swrast vc4 virgl etnaviv imx" &&
+
+ list_remove MESALIB_GALLIUM 'llvmpipe' &&
+ list_remove MESALIB_GALLIUM 'radeon' &&
+
+ config_query_multi MESALIB_GALLIUM \
+ "What Gallium3D drivers would 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 &&
+
+ list_remove MESA_EGL "x11" &&
+ list_remove MESA_EGL "wayland" &&
+ config_query_multi MESA_EGL "which EGL platforms?" drm surfaceless &&
+
+ 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
+ list_remove MESALIB_OPTS '--disable-shared-glapi' &&
+ list_add MESALIB_OPTS '--enable-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"); then
- sub_depends libdrm RADEON
- fi &&
- if list_find "${MESALIB_GALLIUM}" "radeonsi"; then
- sub_depends libdrm AMD
+ 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"); then
+ sub_depends libdrm RADEON
+ fi &&
+ if list_find "${MESALIB_GALLIUM}" "radeonsi"; then
+ sub_depends libdrm AMD
+ fi
fi
;;
*)
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index 7773f57..90ed6ef 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -8,8 +8,7 @@ if [[ "${MESALIB_BRANCH}" == "scm" ]]; then
SOURCE_URL[0]="git://anongit.freedesktop.org/git/mesa/mesa:${SX}"
SOURCE_IGNORE="volatile"
else
- VERSION="17.0.3"
- PATCHLEVEL=0
+ VERSION="17.0.4"
# VX=`echo $VERSION | cut -d. -f-2`
SX="mesa-${VERSION}"
SOURCE="${SX}.tar.xz"
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 36a65b3..c558bf6 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,9 @@
+2017-04-17 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 17.0.4
+ * BUILD: --with-egl-platforms -> --with-platforms
+ * DEPENDS: reworked previous messy changes, updated available
+ EGL platforms
+
2017-04-04 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: 17+ needs LIBDRM_AMD built in libdrm
Which requires llvm for 'radv', so llvm is no longer optional.



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (7e6d224ede8e8e3044cf8eac30909920871d2eeb), Pavel Vinogradov, 04/17/2017

Archive powered by MHonArc 2.6.24.

Top of Page