tree-wide: fix deprecated GitLab URLs

They will stop working in the next GitLab release, so let's update them
ASAP to make sure things are propagated to everyone by then.

See:
https://about.gitlab.com/releases/2020/05/06/gitlab-com-13-0-breaking-changes/#removal-of-deprecated-project-paths

Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5111>

16 files changed, 41 insertions, 41 deletions

diff --git a/Android.common.mk b/Android.common.mk
index 2d04573c433..9141ef951d6 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -39,7 +39,7 @@ LOCAL_CFLAGS += \
 	-Wno-initializer-overrides \
 	-Wno-mismatched-tags \
 	-DPACKAGE_VERSION=\"$(MESA_VERSION)\" \
-	-DPACKAGE_BUGREPORT=\"https://gitlab.freedesktop.org/mesa/mesa/issues\"
+	-DPACKAGE_BUGREPORT=\"https://gitlab.freedesktop.org/mesa/mesa/-/issues\"
 
 # XXX: The following __STDC_*_MACROS defines should not be needed.
 # It's likely due to a bug elsewhere, but let's temporarily add them
diff --git a/SConstruct b/SConstruct
index f905189dd9e..74a72c842e7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -94,7 +94,7 @@ with open("VERSION") as f:
   mesa_version = f.read().strip()
 env.Append(CPPDEFINES = [
     ('PACKAGE_VERSION', '\\"%s\\"' % mesa_version),
-    ('PACKAGE_BUGREPORT', '\\"https://gitlab.freedesktop.org/mesa/mesa/issues\\"'),
+    ('PACKAGE_BUGREPORT', '\\"https://gitlab.freedesktop.org/mesa/mesa/-/issues\\"'),
 ])
 
 # Includes
diff --git a/bin/pick/core_test.py b/bin/pick/core_test.py
index 8ab53172277..6ac186801ab 100644
--- a/bin/pick/core_test.py
+++ b/bin/pick/core_test.py
@@ -109,7 +109,7 @@ class TestRE:
                 affected because intensity formats are different.
 
                 Cc: 19.2 <mesa-stable@lists.freedesktop.org>
-                Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1923
+                Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1923
                 Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
                 Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
             """)
@@ -124,7 +124,7 @@ class TestRE:
                 radeonsi: enable zerovram for Rocket League
 
                 Fixes corruption on game startup.
-                Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1888
+                Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1888
 
                 Cc: 19.1 19.2 <mesa-stable@lists.freedesktop.org>
                 Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
@@ -158,8 +158,8 @@ class TestRE:
 
                  Cc: "20.0" mesa-stable@lists.freedesktop.org
                  Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-                 Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3454>
-                 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3454>
+                 Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3454>
+                 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3454>
             """)
 
             m = core.IS_CC.search(message)
@@ -173,8 +173,8 @@ class TestRE:
 
                  Cc: "20.0" "20.1" mesa-stable@lists.freedesktop.org
                  Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-                 Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3454>
-                 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3454>
+                 Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3454>
+                 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3454>
             """)
 
             m = core.IS_CC.search(message)
@@ -189,8 +189,8 @@ class TestRE:
 
                  Cc: '20.0' mesa-stable@lists.freedesktop.org
                  Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-                 Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3454>
-                 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3454>
+                 Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3454>
+                 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3454>
             """)
 
             m = core.IS_CC.search(message)
@@ -204,8 +204,8 @@ class TestRE:
 
                  Cc: '20.0' '20.1' mesa-stable@lists.freedesktop.org
                  Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-                 Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3454>
-                 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3454>
+                 Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3454>
+                 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3454>
             """)
 
             m = core.IS_CC.search(message)
diff --git a/docs/bugs.html b/docs/bugs.html
index a584a5a2251..fccd8b8291e 100644
--- a/docs/bugs.html
+++ b/docs/bugs.html
@@ -24,7 +24,7 @@ The old bug database on SourceForge is no longer used.
 
 <p>
 To file a Mesa bug, go to
-<a href="https://gitlab.freedesktop.org/mesa/mesa/issues">
+<a href="https://gitlab.freedesktop.org/mesa/mesa/-/issues">
 GitLab on freedesktop.org</a>
 </p>
 
diff --git a/docs/helpwanted.html b/docs/helpwanted.html
index 5e05e65f40b..2dbbc2b744b 100644
--- a/docs/helpwanted.html
+++ b/docs/helpwanted.html
@@ -29,7 +29,7 @@ immediately checked into git because not enough people are testing them.
 Just applying patches, testing and reporting back is helpful.
 <li>
 <b>Driver debugging.</b>
-There are plenty of open bugs in the <a href="https://gitlab.freedesktop.org/mesa/mesa/issues">bug database</a>.
+There are plenty of open bugs in the <a href="https://gitlab.freedesktop.org/mesa/mesa/-/issues">bug database</a>.
 <li>
 <b>Remove aliasing warnings.</b>
 Enable gcc's <code>-Wstrict-aliasing=2 -fstrict-aliasing</code> arguments, and
@@ -47,7 +47,7 @@ You can find some further To-do lists here:
 <b>Common To-Do lists:</b>
 </p>
 <ul>
-  <li><a href="https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/features.txt">
+  <li><a href="https://gitlab.freedesktop.org/mesa/mesa/-/blob/master/docs/features.txt">
     <code>features.txt</code></a> - Status of OpenGL 3.x / 4.x features in
     Mesa.</li>
 </ul>
diff --git a/docs/meson.html b/docs/meson.html
index 81607744735..58b59f86b41 100644
--- a/docs/meson.html
+++ b/docs/meson.html
@@ -126,7 +126,7 @@ running "meson build/" but this feature is being discussed upstream.
 For now, we have a <code>bin/meson-options.py</code> script that prints
 the options for you.
 If that script doesn't work for some reason, you can always look in the
-<a href="https://gitlab.freedesktop.org/mesa/mesa/blob/master/meson_options.txt">
+<a href="https://gitlab.freedesktop.org/mesa/mesa/-/blob/master/meson_options.txt">
 meson_options.txt</a> file at the root of the project.
 </p>
 
diff --git a/docs/relnotes/19.1.8.html b/docs/relnotes/19.1.8.html
index f1851fe4bf0..43d10639160 100644
--- a/docs/relnotes/19.1.8.html
+++ b/docs/relnotes/19.1.8.html
@@ -51,23 +51,23 @@ f0fe8289b7d147943bf2fc2147833254881577e8f9ed3d94ddb39e430e711725  mesa-19.1.8.ta
 
 <li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=111664">Bug 111664</a> - [Bisected] Segmentation fault on FS shader compilation (mat4x3 * mat4x3)</li>
 
-<li><a href="https://gitlab.freedesktop.org/mesa/mesa/issues/121">Issue #121</a> - Shared Memeory leakage in XCreateDrawable</li>
+<li><a href="https://gitlab.freedesktop.org/mesa/mesa/-/issues/121">Issue #121</a> - Shared Memeory leakage in XCreateDrawable</li>
 
-<li><a href="https://gitlab.freedesktop.org/mesa/mesa/issues/795">Issue #795</a> - Xorg does not render with mesa 19.1.7</li>
+<li><a href="https://gitlab.freedesktop.org/mesa/mesa/-/issues/795">Issue #795</a> - Xorg does not render with mesa 19.1.7</li>
 
-<li><a href="https://gitlab.freedesktop.org/mesa/mesa/issues/939">Issue #939</a> - Meson can't find 32-bit libXvMCW in non-standard path</li>
+<li><a href="https://gitlab.freedesktop.org/mesa/mesa/-/issues/939">Issue #939</a> - Meson can't find 32-bit libXvMCW in non-standard path</li>
 
-<li><a href="https://gitlab.freedesktop.org/mesa/mesa/issues/944">Issue #944</a> - Mesa doesn't build with current Scons version (3.1.0)</li>
+<li><a href="https://gitlab.freedesktop.org/mesa/mesa/-/issues/944">Issue #944</a> - Mesa doesn't build with current Scons version (3.1.0)</li>
 
-<li><a href="https://gitlab.freedesktop.org/mesa/mesa/issues/1838">Issue #1838</a> - Mesa installs gl.pc and egl.pc even with libglvnd &gt;= 1.2.0</li>
+<li><a href="https://gitlab.freedesktop.org/mesa/mesa/-/issues/1838">Issue #1838</a> - Mesa installs gl.pc and egl.pc even with libglvnd &gt;= 1.2.0</li>
 
-<li><a href="https://gitlab.freedesktop.org/mesa/mesa/issues/1844">Issue #1844</a> - libXvMC-1.0.12 breaks mesa build</li>
+<li><a href="https://gitlab.freedesktop.org/mesa/mesa/-/issues/1844">Issue #1844</a> - libXvMC-1.0.12 breaks mesa build</li>
 
-<li><a href="https://gitlab.freedesktop.org/mesa/mesa/issues/1869">Issue #1869</a> - X server does not start with Mesa 19.2.0</li>
+<li><a href="https://gitlab.freedesktop.org/mesa/mesa/-/issues/1869">Issue #1869</a> - X server does not start with Mesa 19.2.0</li>
 
-<li><a href="https://gitlab.freedesktop.org/mesa/mesa/issues/1872">Issue #1872</a> - [bisected] piglit spec.arb_texture_view.bug-layers-image causes gpu hangs on IVB</li>
+<li><a href="https://gitlab.freedesktop.org/mesa/mesa/-/issues/1872">Issue #1872</a> - [bisected] piglit spec.arb_texture_view.bug-layers-image causes gpu hangs on IVB</li>
 
-<li><a href="https://gitlab.freedesktop.org/mesa/mesa/issues/1878">Issue #1878</a> - meson.build:1447:6: ERROR: Problem encountered: libdrm required for gallium video statetrackers when using x11</li>
+<li><a href="https://gitlab.freedesktop.org/mesa/mesa/-/issues/1878">Issue #1878</a> - meson.build:1447:6: ERROR: Problem encountered: libdrm required for gallium video statetrackers when using x11</li>
 
 </ul>
 
diff --git a/docs/sourcedocs.html b/docs/sourcedocs.html
index 7bf5508f726..c010d0987b6 100644
--- a/docs/sourcedocs.html
+++ b/docs/sourcedocs.html
@@ -31,7 +31,7 @@ the <code>doxygen</code> directory and run <code>make</code>.
 
 <p>
 For an example of Doxygen usage in Mesa, see a recent source file
-such as <a href="https://gitlab.freedesktop.org/mesa/mesa/blob/master/src/mesa/main/bufferobj.c">bufferobj.c</a>.
+such as <a href="https://gitlab.freedesktop.org/mesa/mesa/-/blob/master/src/mesa/main/bufferobj.c">bufferobj.c</a>.
 </p>
 
 
diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html
index 15674291d08..fb614a790b6 100644
--- a/docs/submittingpatches.html
+++ b/docs/submittingpatches.html
@@ -76,7 +76,7 @@ platform.
 <li>If a patch addresses an issue in gitlab, use the Closes: tag
 For example:
 <pre>
-Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1
 </pre>
 <p>Prefer the full url to just <code>Closes: #1</code>, since the url makes it
 easier to get to the bug page from <code>git log</code></p>
@@ -215,7 +215,7 @@ Patches are submitted to the Mesa project via a
 
 <p>
   To participate in code review, you can monitor the GitLab Mesa
- <a href="https://gitlab.freedesktop.org/mesa/mesa/merge_requests">Merge
+ <a href="https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests">Merge
   Requests</a> page, and/or register for notifications in your gitlab
   settings.
 </p>
diff --git a/meson.build b/meson.build
index 3d4ea165c99..e0906dee3a6 100644
--- a/meson.build
+++ b/meson.build
@@ -46,7 +46,7 @@ pre_args = [
   '-D__STDC_FORMAT_MACROS',
   '-D__STDC_LIMIT_MACROS',
   '-DPACKAGE_VERSION="@0@"'.format(meson.project_version()),
-  '-DPACKAGE_BUGREPORT="https://gitlab.freedesktop.org/mesa/mesa/issues"',
+  '-DPACKAGE_BUGREPORT="https://gitlab.freedesktop.org/mesa/mesa/-/issues"',
 ]
 
 with_vulkan_icd_dir = get_option('vulkan-icd-dir')
@@ -1530,7 +1530,7 @@ else
 
   # Disable deprecated keyword warnings, since we have to use them for
   # old-bison compat.  See discussion in
-  # https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2161
+  # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2161
   if meson.version().version_compare('>= 0.52.0') and find_program('bison', required : false, version : '> 2.3').found()
     prog_bison = [prog_bison, '-Wno-deprecated']
   endif
diff --git a/src/compiler/nir/nir_opt_if.c b/src/compiler/nir/nir_opt_if.c
index 4b2d0159bab..e07e852f869 100644
--- a/src/compiler/nir/nir_opt_if.c
+++ b/src/compiler/nir/nir_opt_if.c
@@ -630,7 +630,7 @@ opt_simplify_bcsel_of_phi(nir_builder *b, nir_loop *loop)
     * bcsel that must come before any break.
     *
     * For more details, see
-    * https://gitlab.freedesktop.org/mesa/mesa/merge_requests/170#note_110305
+    * https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/170#note_110305
     */
    nir_foreach_instr_safe(instr, header_block) {
       if (instr->type != nir_instr_type_alu)
diff --git a/src/gallium/drivers/i915/TODO b/src/gallium/drivers/i915/TODO
index b8693346364..20c082062cd 100644
--- a/src/gallium/drivers/i915/TODO
+++ b/src/gallium/drivers/i915/TODO
@@ -35,4 +35,4 @@ Random list of problems with i915g:
 - Fix fragment discard
 
 Other bugs can be found here:
-https://gitlab.freedesktop.org/mesa/mesa/issues?scope=all&utf8=%E2%9C%93&state=opened&label_name[]=i915g
+https://gitlab.freedesktop.org/mesa/mesa/-/issues?scope=all&utf8=%E2%9C%93&state=opened&label_name[]=i915g
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index c370c659d1d..1d14442b445 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -474,13 +474,13 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign
 
    if (sscreen->info.num_rings[RING_DMA] && !(sscreen->debug_flags & DBG(NO_SDMA)) &&
        /* SDMA causes corruption on RX 580:
-        *    https://gitlab.freedesktop.org/mesa/mesa/issues/1399
-        *    https://gitlab.freedesktop.org/mesa/mesa/issues/1889
+        *    https://gitlab.freedesktop.org/mesa/mesa/-/issues/1399
+        *    https://gitlab.freedesktop.org/mesa/mesa/-/issues/1889
         */
        (sctx->chip_class != GFX8 || sscreen->debug_flags & DBG(FORCE_SDMA)) &&
        /* SDMA timeouts sometimes on gfx10 so disable it for now. See:
         *    https://bugs.freedesktop.org/show_bug.cgi?id=111481
-        *    https://gitlab.freedesktop.org/mesa/mesa/issues/1907
+        *    https://gitlab.freedesktop.org/mesa/mesa/-/issues/1907
         */
        (sctx->chip_class != GFX10 || sscreen->debug_flags & DBG(FORCE_SDMA))) {
       sctx->sdma_cs = sctx->ws->cs_create(sctx->ctx, RING_DMA, (void *)si_flush_dma_cs, sctx,
diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index 62025406d1c..56de5950962 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -8728,7 +8728,7 @@ brw_compile_fs(const struct brw_compiler *compiler, void *log_data,
    }
 
    /* Limit dispatch width to simd8 with dual source blending on gen8.
-    * See: https://gitlab.freedesktop.org/mesa/mesa/issues/1917
+    * See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1917
     */
    if (devinfo->gen == 8 && prog_data->dual_src_blend &&
        !(INTEL_DEBUG & DEBUG_NO8)) {
diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c
index 7aba99fbebf..a3dc15708b0 100644
--- a/src/intel/isl/isl_surface_state.c
+++ b/src/intel/isl/isl_surface_state.c
@@ -928,7 +928,7 @@ isl_genX(null_fill_state)(void *state, struct isl_extent3d size)
       /* We previously had this format set to B8G8R8A8_UNORM but ran into
        * hangs on IVB. R32_UINT seems to work for everybody.
        *
-       * https://gitlab.freedesktop.org/mesa/mesa/issues/1872
+       * https://gitlab.freedesktop.org/mesa/mesa/-/issues/1872
        */
       .SurfaceFormat = ISL_FORMAT_R32_UINT,
 #if GEN_GEN >= 7
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 22c0cc295a7..1cc98479926 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -264,17 +264,17 @@ TODO: document the other workarounds.
         </application>
 
         <application name="Curse of the Dead Gods" executable="Curse of the Dead Gods.exe">
-            <!-- https://gitlab.freedesktop.org/mesa/mesa/issues/2598 -->
+            <!-- https://gitlab.freedesktop.org/mesa/mesa/-/issues/2598 -->
             <option name="glsl_zero_init" value="true" />
         </application>
 
         <application name="GRID Autosport" executable="GridAutosport">
-            <!-- https://gitlab.freedesktop.org/mesa/mesa/issues/1258 -->
+            <!-- https://gitlab.freedesktop.org/mesa/mesa/-/issues/1258 -->
             <option name="force_integer_tex_nearest" value="true" />
         </application>
 
         <application name="DIRT: Showdown" executable="dirt.i386">
-            <!-- https://gitlab.freedesktop.org/mesa/mesa/issues/1258 -->
+            <!-- https://gitlab.freedesktop.org/mesa/mesa/-/issues/1258 -->
             <option name="force_integer_tex_nearest" value="true" />
         </application>
 
@@ -635,7 +635,7 @@ TODO: document the other workarounds.
         <application name="Peace, Death!" executable="runner" sha1="5b909f3d21799773370adf084f649848f098234e">
             <option name="radeonsi_sync_compile" value="true" />
         </application>
-        <!-- https://gitlab.freedesktop.org/mesa/mesa/issues/2647 -->
+        <!-- https://gitlab.freedesktop.org/mesa/mesa/-/issues/2647 -->
         <application name="Kerbal Space Program" executable="KSP.x86_64">
             <option name="radeonsi_no_infinite_interp" value="true" />
         </application>