<h2>Feature releases</h2>
<ul>
-<li>Available approximatelly every three months.
+<li>Available approximately every three months.
<li>Initial timeplan available 2-4 weeks before the planned branchpoint (rc1)
on the mesa-announce@ mailing list.
<li>A <a href="#prerelease">pre-release</a> announcement should be available
-approximatelly 24 hours before the final (non-rc) release.
+approximately 24 hours before the final (non-rc) release.
</ul>
<h2>Stable releases</h2>
<li>Normally available once every two weeks.
<li>Only the latest branch has releases. See note below.
<li>A <a href="#prerelease">pre-release</a> announcement should be available
-approximatelly 48 hours before the actual release.
+approximately 48 hours before the actual release.
</ul>
<p>
Achieved by combination of local ad-hoc scripts and AppVeyor plus Travis-CI,
the latter as part of their Github integration.
</p>
+<p>
+<strong>Note:</strong> If a patch in the current queue needs any additional
+fix(es), then they should be squashed together.
+<br>
+The commit messages and the <code>cherry picked from</code> tags must be preserved.
+</p>
+<p>
+This should be noted in the <a href="#prerelease">pre-announce</a> email.
+<pre>
+ git show b10859ec41d09c57663a258f43fe57c12332698e
+
+ commit b10859ec41d09c57663a258f43fe57c12332698e
+ Author: Jonas Pfeil <pfeiljonas@gmx.de>
+ Date: Wed Mar 1 18:11:10 2017 +0100
+
+ ralloc: Make sure ralloc() allocations match malloc()'s alignment.
+
+ The header of ralloc needs to be aligned, because the compiler assumes
+ ...
+
+ (cherry picked from commit cd2b55e536dc806f9358f71db438dd9c246cdb14)
+
+ Squashed with commit:
+
+ ralloc: don't leave out the alignment factor
+
+ Experimentation shows that without alignment factor gcc and clang choose
+ ...
+
+ (cherry picked from commit ff494fe999510ea40e3ed5827e7818550b6de126)
+</pre>
+</p>
<h2>Regression/functionality testing</h2>
<a href="https://bugs.freedesktop.org/editversions.cgi?action=add&product=Mesa" target="_parent">Bugzilla</a> and add the new Mesa version X.Y.
</p>
<p>
-Check for rare that there are no distribution breaking changes and revert them
-if needed. Extremely rare - we had only one case so far (see
-commit 2ced8eb136528914e1bf4e000dea06a9d53c7e04).
+Check that there are no distribution breaking changes and revert them if needed.
+For example: files being overwritten on install, etc. Happens extremely rarely -
+we had only one case so far (see commit 2ced8eb136528914e1bf4e000dea06a9d53c7e04).
</p>
<p>
Proceed to <a href="#release">release</a> -rc1.
AUTHOR (NUMBER):
COMMIT SUMMARY
+For example:
+
+Jonas Pfeil (1):
+ ralloc: Make sure ralloc() allocations match malloc()'s alignment.
+Squashed with
+ ralloc: don't leave out the alignment factor
Rejected (NUMBER)
=================
$__mesa_root/autogen.sh --enable-llvm-shared-libs && make -j2 distcheck
- # Build check the tarballs (scons)
- tar -xaf mesa-$__version.tar.xz && cd mesa-$__version && scons && cd ..
+ # Build check the tarballs (scons, linux)
+ tar -xaf mesa-$__version.tar.xz && cd mesa-$__version
+ scons
+ cd .. && rm -rf mesa-$__version
+
+ # Build check the tarballs (scons, windows/mingw)
+ tar -xaf mesa-$__version.tar.xz && cd mesa-$__version
+ scons platform=windows toolchain=crossmingw
+ cd .. && rm -rf mesa-$__version
# Test the automake binaries
- rm -rf mesa-$__version
tar -xaf mesa-$__version.tar.xz && cd mesa-$__version
./configure \
--with-dri-drivers=i965,swrast \
--with-gallium-drivers=swrast \
--with-vulkan-drivers=intel \
--enable-llvm-shared-libs \
- --enable-gallium-llvm \
+ --enable-llvm \
--enable-glx-tls \
--enable-gbm \
--enable-egl \
--with-egl-platforms=x11,drm,wayland
make -j2 && DESTDIR=`pwd`/test make -j6 install
+ __glxinfo_cmd='glxinfo 2>&1 | egrep -o "Mesa.*|Gallium.*|.*dri\.so"'
+ __glxgears_cmd='glxgears 2>&1 | grep -v "configuration file"'
+ __es2info_cmd='es2_info 2>&1 | egrep "GL_VERSION|GL_RENDERER|.*dri\.so"'
+ __es2gears_cmd='es2gears_x11 2>&1 | grep -v "configuration file"'
export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/
export LIBGL_DRIVERS_PATH=`pwd`/test/usr/local/lib/dri/
export LIBGL_DEBUG=verbose
- glxinfo | egrep -o "Mesa.*"
- glxgears
- es2_info | egrep "GL_VERSION|GL_RENDERER"
- es2gears_x11
+ eval $__glxinfo_cmd
+ eval $__glxgears_cmd
+ eval $__es2info_cmd
+ eval $__es2gears_cmd
export LIBGL_ALWAYS_SOFTWARE=1
- glxinfo | egrep -o "Mesa.*|Gallium.*"
- glxgears
- es2_info | egrep "GL_VERSION|GL_RENDERER"
- es2gears_x11
+ eval $__glxinfo_cmd
+ eval $__glxgears_cmd
+ eval $__es2info_cmd
+ eval $__es2gears_cmd
export LIBGL_ALWAYS_SOFTWARE=1
export GALLIUM_DRIVER=softpipe
- glxinfo | egrep -o "Mesa.*|Gallium.*"
- glxgears
- es2_info | egrep "GL_VERSION|GL_RENDERER"
- es2gears_x11
+ eval $__glxinfo_cmd
+ eval $__glxgears_cmd
+ eval $__es2info_cmd
+ eval $__es2gears_cmd
# Smoke test DOTA2
unset LD_LIBRARY_PATH
unset LIBGL_DRIVERS_PATH
</pre>
-<h3>Use the release.sh script from xorg util-macros</h3>
+<h3>Use the release.sh script from xorg <a href="https://cgit.freedesktop.org/xorg/util/modular/">util-modular</a></h3>
<p>
-Ensure that the mesa git tree is clean via <code>git clean -fXd</code> and
-start the release process.
+Start the release process.
</p>
<pre>
../relative/path/to/release.sh . # append --dist if you've already done distcheck above
<h3>Add the sha256sums to the release notes</h3>
<p>
-Edit docs/relnotes/X.Y.Z.html to add the sha256sums as availabe in the mesa-X.Y.Z.announce template. Commit this change.
+Edit docs/relnotes/X.Y.Z.html to add the sha256sums as available in the mesa-X.Y.Z.announce template. Commit this change.
</p>
<h3>Back on mesa master, add the new release notes into the tree</h3>
<h1 id="website">Update the mesa3d.org website</h1>
<p>
-NOTE: The recent release managers have not been performing this step
-themselves, but leaving this to Brian Paul, (who has access to the
-sourceforge.net hosting for mesa3d.org). Brian is more than willing to grant
-the permission necessary to future release managers to do this step on their
-own.
-</p>
-
-<p>
-Update the web site by copying the docs/ directory's files to
-/home/users/b/br/brianp/mesa-www/htdocs/ with:
-<br>
-<code>
-sftp USERNAME,mesa3d@web.sourceforge.net
-</code>
+As the hosting was moved to freedesktop, git hooks are deployed to update the
+website. Manually check that it is updated 5-10 minutes after the final <code>git push</code>
</p>
-
<h1 id="bugzilla">Update Bugzilla</h1>
<p>