summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Vinogradov2022-06-16 16:50:45 -0400
committerPavel Vinogradov2022-06-16 16:52:20 -0400
commit43abe9729a846cf2cffcd399daf994692fbdbb92 (patch)
tree9c70bef6bc7fbf0f214b479ea8c8c0621efe9650
parent2ce08654cc99cfc1edd134bc2e8173cb4b7cdb16 (diff)
graphics-libs/mesa: rearranged one musl patch to be applied in stable branch only
-rw-r--r--graphics-libs/mesa/HISTORY4
-rwxr-xr-xgraphics-libs/mesa/PRE_BUILD1
-rw-r--r--graphics-libs/mesa/patches-stable/musl-stacksize.patch (renamed from graphics-libs/mesa/patches/musl-stacksize.patch)0
3 files changed, 5 insertions, 0 deletions
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 16988eb324..74d48cf08b 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,7 @@
+2022-06-16 Pavel Vinogradov <public@sourcemage.org>
+ * PRE_BUILD, patches{,-stable}/musl-stacksize.patch: made the patch to be
+ applied in stable brancch only
+
2022-06-02 Pavel Vinogradov <public@sourcemage.org>
* DETAILS: version 22.1.1
diff --git a/graphics-libs/mesa/PRE_BUILD b/graphics-libs/mesa/PRE_BUILD
index 387dbfbcfe..9a8f363bcd 100755
--- a/graphics-libs/mesa/PRE_BUILD
+++ b/graphics-libs/mesa/PRE_BUILD
@@ -2,6 +2,7 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
apply_patch_dir patches &&
+apply_patch_dir "patches-${MESA_BRANCH}" &&
if is_depends_enabled "$SPELL" smgl-gl_select; then
patch -fp1 -i "$SPELL_DIRECTORY"/0001-install-GL-headers-in-.mesa.patch
diff --git a/graphics-libs/mesa/patches/musl-stacksize.patch b/graphics-libs/mesa/patches-stable/musl-stacksize.patch
index db76699a24..db76699a24 100644
--- a/graphics-libs/mesa/patches/musl-stacksize.patch
+++ b/graphics-libs/mesa/patches-stable/musl-stacksize.patch