diff options
| -rw-r--r-- | ports/mesa/dual-osmesa-part2b.patch | 13 | ||||
| -rw-r--r-- | ports/mesa/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/mesa/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/m-/mesa.json | 5 |
5 files changed, 9 insertions, 17 deletions
diff --git a/ports/mesa/dual-osmesa-part2b.patch b/ports/mesa/dual-osmesa-part2b.patch deleted file mode 100644 index 6d39786d7..000000000 --- a/ports/mesa/dual-osmesa-part2b.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gallium/meson.build b/src/gallium/meson.build
-index 1f81fcf1fd5..5a5a8d2f0a6 100644
---- a/src/gallium/meson.build
-+++ b/src/gallium/meson.build
-@@ -175,7 +175,7 @@ if with_dri
- subdir('frontends/dri')
- subdir('targets/dri')
- endif
--if with_osmesa == 'gallium'
-+if with_osmesa.contains('gallium')
- subdir('frontends/osmesa')
- subdir('targets/osmesa')
- endif
diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 0409a61d8..62d02a75d 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -16,8 +16,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org
OUT_SOURCE_PATH SOURCE_PATH
REPO mesa/mesa
- REF mesa-21.1.2
- SHA512 746ef292dd93ddd23ab34e18e87196db63302defd99357f31ac24876003c75b32cfa8ed38d0292271cd9142a056f6a6549ffcd0f086d0c69c4ff83ac7195188c
+ REF mesa-21.1.6
+ SHA512 93a44c6a83c03fcf3bbcc650430f8f88f5e4ec001ac982f5359b70c840ed43980ae9734db2ad77ef9bb958187948364f32e601d5a5f0087c7adb990073c33339
HEAD_REF master
PATCHES ${PATCHES}
)
diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 60db1d7a7..19167072b 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mesa", - "version": "21.1.2", + "version": "21.1.6", "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", "supports": "!(windows & arm)", diff --git a/versions/baseline.json b/versions/baseline.json index c1e63b2b8..f083492c0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4037,7 +4037,7 @@ "port-version": 0 }, "mesa": { - "baseline": "21.1.2", + "baseline": "21.1.6", "port-version": 0 }, "meschach": { diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index aeb14f4b6..ee1f3234a 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "315d3fe5a64b2a34efeb9caee72c7922bc48c148", + "version": "21.1.6", + "port-version": 0 + }, + { "git-tree": "58f52d4a0724c6d4d393b48e232ca323d8670df6", "version": "21.1.2", "port-version": 0 |