summaryrefslogtreecommitdiffstats
path: root/graphics-libs
diff options
context:
space:
mode:
authorPavel Vinogradov2022-10-03 21:33:03 -0400
committerPavel Vinogradov2022-10-03 21:33:03 -0400
commitc806e0cdec4946d686516c39bf92478291e99f96 (patch)
tree8365ca343d566171b885a615b217f6721f61f5b0 /graphics-libs
parent6409e685f9bd485b3a44f3c684e2adbd3190c8c0 (diff)
graphics-libs/mesa: made xvmc option stable only, added git for scm branch
Diffstat (limited to 'graphics-libs')
-rwxr-xr-xgraphics-libs/mesa/CONFIGURE30
-rwxr-xr-xgraphics-libs/mesa/DEPENDS8
-rw-r--r--graphics-libs/mesa/HISTORY3
3 files changed, 31 insertions, 10 deletions
diff --git a/graphics-libs/mesa/CONFIGURE b/graphics-libs/mesa/CONFIGURE
index 4b26973cf7..c3bd9ab0bd 100755
--- a/graphics-libs/mesa/CONFIGURE
+++ b/graphics-libs/mesa/CONFIGURE
@@ -61,15 +61,27 @@ if list_find "$MESA_VULKAN" all; then
fi &&
config_query_option MESA_GLES1 "support GLES1 - embedded systems" n gles1=enabled gles1=disabled &&
config_query_option MESA_GLES2 "support GLES2/3 - embedded systems" n gles2=enabled gles2=disabled &&
-config_query_multi MESA_TOOLS "which tools to build" \
- etnaviv \
- freedreno \
- glsl \
- intel \
- intel-ui \
- nir \
- nouveau \
- xvmc &&
+if [[ "${MESA_BRANCH}" == "scm" ]]; then
+ config_query_multi MESA_TOOLS "which tools to build" \
+ etnaviv \
+ freedreno \
+ glsl \
+ intel \
+ intel-ui \
+ nir \
+ nouveau &&
+ list_remove MESA_TOOLS "xvmc"
+else
+ config_query_multi MESA_TOOLS "which tools to build" \
+ etnaviv \
+ freedreno \
+ glsl \
+ intel \
+ intel-ui \
+ nir \
+ nouveau \
+ xvmc
+fi &&
config_query_multi MESA_OMX "OMax support" auto disabled tizonia bellagio
# strip any leading spaces from the driver lists
diff --git a/graphics-libs/mesa/DEPENDS b/graphics-libs/mesa/DEPENDS
index a7412805f9..8b81f73476 100755
--- a/graphics-libs/mesa/DEPENDS
+++ b/graphics-libs/mesa/DEPENDS
@@ -40,8 +40,14 @@ if list_find "$MESA_EGL" wayland;then
depends wayland-protocols
fi &&
+if [[ "${MESA_BRANCH}" == "scm" ]]; then
+ depends git
+else
+ optional_depends libxvmc 'gallium-xvmc=enabled' 'gallium-xvmc=disabled' \
+ 'gallium xvmc state tracker(obsolete)'
+fi &&
+
optional_depends libvdpau 'gallium-vdpau=enabled' 'gallium-vdpau=disabled' 'gallium vdpau state tracker' &&
-optional_depends libxvmc 'gallium-xvmc=enabled' 'gallium-xvmc=disabled' 'gallium xvmc state tracker(obsolete)' &&
optional_depends libva 'gallium-va=enabled' 'gallium-va=disabled' 'gallium va state tracker' &&
if is_depends_enabled "${SPELL}" libva; then
. $GRIMOIRE/config_query_multi.function &&
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index c33a507a84..4279ad4f60 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,6 @@
+2022-10-03 Pavel Vinogradov <public@sourcemage.org>
+ * CONFIGURE, DEPENDS: made xvmc option stable only, added git for scm branch
+
2022-09-30 Pavel Vinogradov <public@sourcemage.org>
* DEPENDS: fixed llvm optional flags