summaryrefslogtreecommitdiff
path: root/bin
AgeCommit message (Collapse)AuthorFilesLines
2019-04-05meson: strip rpath from megadriversEric Engestrom1-1/+0
More specifically, use the library file that has been post-processed by Meson when creating the hardlinks. Bugs: https://bugs.freedesktop.org/show_bug.cgi?id=108766 Fixes: 3218056e0eb375eeda47 "meson: Build i965 and dri stack" Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com> (cherry picked from commit aa7afe324c2092fb31f9498cb3eda47dda96e6f2)
2019-03-25bin/install_megadrivers.py: Correctly handle DESTDIR=''Dylan Baker1-1/+5
Currently if destdir is set to '' then the resulting libdir will have it's first character replaced by / instead of / being prepended to the string. This was the result of ensuring that that DESTDIR wouldn't be ignored if libdir was absolute, since the only cases that meson allows the libdir to be absolute is if the prefix is /, this won't be a problem. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110211 Fixes: ae3f45c11e3f934939b90445471da8f18b057bc5 ("bin/install_megadrivers: fix DESTDIR and -D*-path") Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> (cherry picked from commit 4188dd7879a374b698d5f50c84cd26b2606f1ee3) Squashed with: bin/install_megadrivers.py: Fix regression for set DESTDIR The previous patch tried to address a bug when DESTDIR is '', however, it introduces a bug when DESTDIR is not '', and fakeroot is used. This patch does fix that, and has been tested with the arch pkg-build to ensure it isn't regressed. Fixes: 093a1ade4e24b7dd701a093d30a71efd669fe9c8 ("bin/install_megadrivers.py: Correctly handle DESTDIR=''") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110221 Reviewed-by: Eric Engestrom <eric@engestrom.ch> (cherry picked from commit ed96038e55b37501dae0be09287a6209a966eb85)
2019-03-14cherry-ignore: add explicit 19.0 performance optimisationsEmil Velikov1-0/+6
nir: lower IO to vector intel: make use of the optimisation They address a 10% regression in a synthetic benchmark. No real world use-cases seems to be affected. Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2019-03-14cherry-ignore: ignore glsl_types memory cleanup patchEmil Velikov1-0/+3
The commit was reverted shortly after it was applied on master Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2019-03-14cherry-ignore: add gitlab-ci fixup commitEmil Velikov1-0/+3
gitlab-ci: autotools needs to be told which llvm version to use Commit references invalid sha - the offender did not land in branch. Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2019-03-14cherry-ignore: add 19.0 only anv/push buffer nominationsEmil Velikov1-0/+4
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2019-02-15get-pick-list: Add --pretty=medium to the arguments for Cc patchesDylan Baker1-2/+2
Because none of them have been picked up for 19.0 due to this bug being reintroduced. v2: - Fix fixes tags Fixes: e6b3a3b2014413366110f6deeced8095e7262b1d ("bin/get-pick-list.sh: handle "typod" usecase.") Fixes: fac10169bbad2da918ef07a62c01e0b321508cfe ("bin/get-pick-list.sh: prefix output with "[stable] "") Reviewed-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit aff52dd2c61eb8d1b03cebbcca7e070ffa48afdf)
2019-02-15cherry-ignore: radv: fix using LOAD_CONTEXT_REG with old GFX ME firmwares on ↵Emil Velikov1-0/+3
GFX8 stable The commit addresses functionality not present in branch. Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2019-02-15cherry-ignore: add more 19.0 only nominations from IliaEmil Velikov1-0/+16
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2019-02-14cherry-ignore: nv50,nvc0: add explicit settings for recent capsEmil Velikov1-0/+3
stable Explicit 19.0 only nomination. Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2019-01-29cherry-ignore: WARNING: Commit XXX lists invalid shaEmil Velikov1-0/+4
warn The commits refer stale sha, yet don't fix anything in particular. 98984b7cdd79c15cc7331c791f8be61e873b8bbd 9f86f1da7c68b5b900cd6f60925610ff1225a72d Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2019-01-29bin/get-pick-list.sh: fix redirection in shAndres Gomez1-1/+1
"&>" is bash specific. Fixes: e0dbfc99537 ("bin/get-pick-list.sh: warn when commit lists invalid sha") Cc: Juan A. Suarez <jasuarez@igalia.com> Cc: Eric Engestrom <eric.engestrom@intel.com> Cc: Dylan Baker <dylan@pnwbakers.com> Cc: Emil Velikov <emil.velikov@collabora.com> Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Juan A. Suarez <jasuarez@igalia.com> (cherry picked from commit 3ec9ab80b870efffb5ba7c7a00b86b2df729ec6d)
2019-01-29bin/get-pick-list.sh: fix the oneline printingAndres Gomez1-1/+1
"--summary" will also print extended header information such as creations, renames and mode changes. Let's just use "--no-patch", which suppresses the diff output. v2: Use "--no-patch" instead of the "-s" abbreviation (Eric). Fixes: 559c32d2412 ("bin/get-pick-list.sh: simplify git oneline printing") Cc: Juan A. Suarez <jasuarez@igalia.com> Cc: Eric Engestrom <eric.engestrom@intel.com> Cc: Dylan Baker <dylan@pnwbakers.com> Cc: Emil Velikov <emil.velikov@collabora.com> Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Juan A. Suarez <jasuarez@igalia.com> (cherry picked from commit 716ed41a36037459ed5bfe0775484ac2cbd90707)
2019-01-29cherry-ignore: spirv: Handle arbitrary bit sizes for deref array indicesEmil Velikov1-0/+4
stable The commits aren't suitable in their present form. Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2019-01-29cherry-ignore: radv: Fix multiview depth clearsEmil Velikov1-0/+4
fixes: This commit requires commits aeaf8dbd097 and 7484bc894b9 which did not land in branch. Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2019-01-11cherry-ignore: meson: libfreedreno depends upon libdrm (for fence support)Emil Velikov1-0/+2
The commit addresses b4476138d5ad3f8d30c14ee61f2f375edfdbab2a Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2019-01-11bin/get-pick-list.sh: warn when commit lists invalid shaEmil Velikov1-0/+11
We had cases where people would list old/invalid sha in the commit. Add a trivial checker to catch those and throw a warning. CC: Juan A. Suarez <jasuarez@igalia.com> CC: Dylan Baker <dylan@pnwbakers.com> CC: mesa-stable@lists.freedesktop.org Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Andres Gomez <agomez@igalia.com> (cherry picked from commit e0dbfc995370756355f28ac31495eab96a410384)
2019-01-11bin/get-pick-list.sh: rework handing of sha nominationsEmil Velikov1-16/+30
Currently our is_sha_nomination does: - folds any whitespace, attempting to extract sha-like information - checks that at least one of the shas has landed Split it in two and do sha-like validation first. This way, commits with mesa-stable and sha nominations will feature the fixes/revert/etc instead of stable (a) or will be omitted if not applicable for the respective branch (b). Misc examples from 18.3 (a) -[ stable ] 5bc509363b6 glx: make xf86vidmode mandatory for direct rendering +[ fixes ] 5bc509363b6 glx: make xf86vidmode mandatory for direct rendering (b) -[ stable ] 9a7b3199037 anv/query: flush render target before copying results CC: Juan A. Suarez <jasuarez@igalia.com> CC: Dylan Baker <dylan@pnwbakers.com> CC: mesa-stable@lists.freedesktop.org Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Andres Gomez <agomez@igalia.com> (cherry picked from commit 6b296f64af5d69a1d0e4cdcda5f8c6d090dd4449)
2018-11-28cherry-ignore: egl/wayland: rather obvious build fixEmil Velikov1-0/+2
Commit was squashed into the respective offenders Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2018-11-16bin/get-pick-list.sh: handle reverts prior to the branchpointEmil Velikov1-1/+8
Currently we detect when a breaking commit: - has landed in stable, and - is referenced by a untagged fix in master Yet we did not consider the case of breaking commit: - prior to the branchpoint, and - is referenced by a untagged fix in master Addressing the latter is extremely slow, due to the size of the lookup. That said, we can trivially use the existing is_sha_nomination() helper to catch reverts. Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Juan A. Suarez <jasuarez@igalia.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit adbdfc6666052d604a97009d736b6dee957908a0)
2018-11-15bin/get-pick-list.sh: use test instead of [ ]Emil Velikov1-4/+4
Latter is rather picky wrt surrounding white space. The explicit `test` doesn't have that problem, plus the statements read a bit easier. Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Juan A. Suarez <jasuarez@igalia.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit c0012a07088e86f6d30405d0522a0d72801e2ec7)
2018-11-15bin/get-pick-list.sh: handle unofficial "broken by" tagEmil Velikov1-1/+8
We have a number of cases were devs will use a tag "broken by". While it's not something officially documented or recommended, checking for it is trivial enough. Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Juan A. Suarez <jasuarez@igalia.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 77ff0bfb5f915bb841623ec181ee359a099f2c52)
2018-11-15bin/get-pick-list.sh: handle fixes tag with missing colonEmil Velikov1-1/+5
Every so often, we forget to add the colon after "fixes". Trivially tweak the script to catch it. Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Juan A. Suarez <jasuarez@igalia.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 209525aafb8314f827838dedeb771b72c256a4d3)
2018-11-15bin/get-pick-list.sh: flesh out is_sha_nominationEmil Velikov1-2/+9
Refactor is_fixes_nomination into a is_sha_nomination helper. This way we can reuse it for more than the usual "Fixes:" tag. Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Juan A. Suarez <jasuarez@igalia.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit b7418d1f3f102aeed8d3d38195f9b7d672216df0)
2018-11-15bin/get-pick-list.sh: tweak the commit sha matching patternEmil Velikov1-1/+1
Currently we match on: - any arbitrary length of, - any a-z A-Z and 0-9 characters At the same time, a commit sha consists of lowercase hexadecimal numbers. Any sha shorter than 8 characters is ambiguous - in some cases even 11+ are required. So change the pattern to a-f0-9 and adjust the length to 8-40. As we're here we could use a single grep, instead of the grep/sed combo. Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Juan A. Suarez <jasuarez@igalia.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 533fead4236459c3f04700ff130ffaee1503cb69)
2018-11-15bin/get-pick-list.sh: handle the fixes tagEmil Velikov2-84/+43
Having a separate script to handle the fixes tag, brings a number of issues, so let's fold it in get-pick-list.sh. v2: - pass the sha as argument to the function - Keep original sed pattern Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Juan A. Suarez <jasuarez@igalia.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 181203f3c5e9c6b3e95e0b93ad3b22630c3c0437)
2018-11-15bin/get-pick-list.sh: handle "typod" usecase.Emil Velikov2-43/+8
As the comment in get-typod-pick-list.sh says, there's little point in having a duplicate file. Add the new pattern + tag to get-pick-list.sh and nuke this file. v2: - pass the sha as argument to the function - grep -q instead of using a variable (Eric) Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Juan A. Suarez <jasuarez@igalia.com> Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit e6b3a3b2014413366110f6deeced8095e7262b1d)
2018-11-15bin/get-pick-list.sh: prefix output with "[stable] "Emil Velikov1-0/+15
With later commits we'll fold all the different scripts into one. Add the explicit prefix, so that we know the origin of the nomination v2: - pass the sha as argument to the function - swap $tag = none for an else statment (Juan) - grep -q instead of using a variable (Eric) - print the tag and commit oneline separately (Eric) v3: - drop unused "tag=none" assignment (Juan) - typo nomination Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Juan A. Suarez <jasuarez@igalia.com> Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> (v2) Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit fac10169bbad2da918ef07a62c01e0b321508cfe)
2018-11-15bin/get-pick-list.sh: simplify git oneline printingEmil Velikov1-1/+1
Currently we force disable the pager via "|cat" where --no-pager exists. Additionally we could use git show instead of git log -n1. Use those for a slightly more understandable code. Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Juan A. Suarez <jasuarez@igalia.com> Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 559c32d2412b2ea602bb59aa61da75403d01a872)
2018-08-23bin/git_sha1_gen.py: remove execute bit/shebangEmil Velikov1-2/+0
The script is executed explicitly via the build system, that uses PYTHON/prog_python and equivalent. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
2018-08-23bin/install_megadrivers.py: Remove shebang and executable bitMathieu Bridon1-1/+0
Since the script is never executed directly, but launched by Meson as an argument to the Python interpreter, those are not needed any more. In addition, they are the reason this script was missed when I moved the Meson buildsystem to Python 3, so removing them helps avoiding future confusion. Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2018-08-16bin: always define MESA_GIT_SHA1 to make it directly usable in codeEric Engestrom1-2/+2
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2018-08-16git_sha1: simplify logicEric Engestrom1-5/+1
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2018-08-16bin: split `write_if_different()` outEric Engestrom1-7/+14
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
2018-08-16bin: whitespace cleanupEric Engestrom1-3/+3
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
2018-08-06meson, install_megadrivers: Also remove stale symlinksGert Wollny1-2/+4
os.path.exists doesn't return True for stale symlinks, but they are in the way later, when a link/file with the same name is to be created. For instance it is conceivable that the pointed to file is replaced by a file with a new name, and then the symlink is dead. To handle this check specifically for all existing symlinks to be removed. (This bugged me for some time with a link libXvMCr600.so always being in the way of installing this file) v2: use only os.lexist and replace all instances of os.exist (Dylan Baker) v3: handle directory check correctly (Eric Engestrom) Fixes: f7f1b30f81e842db6057591470ce3cb6d4fb2795 ("meson: extend install_megadrivers script to handle symmlinking") Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>(v2 minus dir check) Reviewed-by: Dylan Baker <dylan@pnwbakers.com> Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
2018-05-23bin/get-pick-listh.sh: force git --pretty=mediumDylan Baker1-1/+1
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Andres Gomez <agomez@igalia.com>
2018-05-23bin/bugzilla_mesa.sh: explicitly set the --pretty argumentDylan Baker1-1/+1
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Andres Gomez <agomez@igalia.com>
2018-04-27bin: force git show to use default pretty settingDylan Baker1-2/+2
I have pretty default to short, which breaks this script. v2: - Fix both places that don't define a --pretty (Emil) cc: Juan A. Suarez <jasuarez@igalia.com> Signed-off-by: Dylan Baker <dylan.c.baker@intel.com> Reviewed-by: Andres Gomez <agomez@igalia.com> (v1) Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2018-04-23bin/install_megadrivers: rename a few variables to make things clearerDylan Baker1-8/+8
Originally the "each" variable was just a part of the "drivers" variable. It's not anymore so it's a bit ambiguous. Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
2018-04-23bin/install_megadrivers: fix DESTDIR and -D*-pathDylan Baker1-2/+6
This fixes -Ddri-drivers-path, -Dvdpau-libs-path, etc. with DESTDIR when those paths are absolute. Currently due to the way python's os.path.join handles absolute paths these will ignore DESTDIR, which is bad. This fixes them to be relative to DESTDIR if that is set. Fixes: 3218056e0eb375eeda470058d06add1532acd6d4 ("meson: Build i965 and dri stack") Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
2018-04-05meson: fix megadriver symlinkingDylan Baker1-1/+1
Which should be relative instead of absolute. Fixes: f7f1b30f81e842db6057591470ce3cb6d4fb2795 ("meson: extend install_megadrivers script to handle symmlinking") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105567 Signed-off-by: Dylan Baker <dylan.c.baker@intel.com> Reviewed-and-Tested-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2017-12-04meson: extend install_megadrivers script to handle symmlinkingDylan Baker1-0/+14
Which is required for the gallium media state trackers. v2: - Make symlinks local instead of absolute Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-11-09meson: Add script to use VERSION file for getting versionDylan Baker1-0/+35
Meson has up until this point set it's version in the root meson.build script, while the other build systems read the VERSION file. This is just "one more thing" to duplicate between meson and every other build system. This script is a simple "read, strip, print" sort of deal to allow meson to read the VERSION file. I chose to implement this in python since python is portable, and to keep the meson.build script clean. This is also complicated by the fact that the project() call *must* be the first non-comment,non-blank in the toplevel meson.build script. v2: - Move from scripts/ to bin/ - use python explicitly to run the scripts to support windows Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-10-30git_sha1_gen: create empty file in fallback pathEric Engestrom1-0/+2
I missed this part in my conversion, the old stream redirection meant the file was always created. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103496 Fixes: 7088622e5fb506b64c90 "buildsys: move file regeneration logic to the script itself" Signed-off-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
2017-10-27meson: bring MESA_GIT_SHA1 in line with other build systemsEric Engestrom1-0/+21
Meson's vcs_tag() uses the output of `git describe`, eg. 17.3-branchpoint-5-gfbf29c3cd15ae831e249+ Whereas the other build systems used a script that outputs only the sha1 of the HEAD commit, eg. fbf29c3cd1 Given that this information is used by printing it next to the version number, there's some redundancy here, and inconsistency between build systems. Bring Meson in line by making it use the same script, with the added advantage of now supporting the MESA_GIT_SHA1_OVERRIDE env var. Signed-off-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
2017-10-27buildsys: move file regeneration logic to the script itselfEric Engestrom1-1/+12
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
2017-10-26install_megadrivers: print the full path with driver nameDylan Baker1-1/+1
Instead of just the path. Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2017-10-16git_sha1_gen: use git_sha1.h.in on all build systemsEric Engestrom1-1/+4
Meson already uses this, let's get the other build sys to use it too. Note: rstrip() was dropped, as truncating to the first 10 chars already gets rid of the terminating newline (not an issue with the env var either, unless maliciously crafted to break the build... not sure this is a real-world issue). Verified to work and give the same output as before on both python 2 and 3 :) Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Brian Paul <brianp@vmware.com>
2017-10-10git_sha1_gen: accept MESA_GIT_SHA1_OVERRIDE env varBrian Paul1-13/+26
If one uses a parent build script to download/build Mesa we may not have a full git repository (maybe a tar archive) so the 'git rev-parse' command will fail. This updates the script to look for a MESA_GIT_SHA1_OVERRIDE env var. If it's set, use that sha1 instead of using git rev-parse. With this change we can put a git hash in the GL_VERSION string even when we don't have a git repo. v2: incorporate Dylan's suggestions to simplify the code Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 12:13:56 +0000