diff options
| author | Cem Keylan <cem@ckyln.com> | 2021-08-10 00:54:00 +0300 |
|---|---|---|
| committer | Cem Keylan <cem@ckyln.com> | 2021-08-10 00:54:00 +0300 |
| commit | 8e51564bd6aa2077a7a026130c11756341a691b4 (patch) | |
| tree | 819b2741595cace03aeb75d5f0ec213dfa6fb6d7 | |
| parent | a202f4bb9d8e442f37723898d4970e13f96c6868 (diff) | |
| download | repository-8e51564bd6aa2077a7a026130c11756341a691b4.tar.gz | |
mesa: remove patch
| -rwxr-xr-x | extra/mesa/build | 3 | ||||
| -rw-r--r-- | extra/mesa/checksums | 1 | ||||
| -rw-r--r-- | extra/mesa/patches/force-byacc.patch | 24 | ||||
| -rw-r--r-- | extra/mesa/sources | 1 |
4 files changed, 0 insertions, 29 deletions
diff --git a/extra/mesa/build b/extra/mesa/build index 38e0e437..742c980f 100755 --- a/extra/mesa/build +++ b/extra/mesa/build @@ -29,9 +29,6 @@ python3 bin/git_sha1_gen.py --output include/git_sha1.h platforms=x11 cpt l wayland-protocols >/dev/null 2>&1 && platforms=$platforms,wayland -# Force byacc even if bison is installed -patch -p1 < force-byacc.patch - meson \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/mesa/checksums b/extra/mesa/checksums index 11ccef67..1d46c9ae 100644 --- a/extra/mesa/checksums +++ b/extra/mesa/checksums @@ -1,3 +1,2 @@ 05a42a8f6324eec9bdf2a6ac8c957799d4437617018cff6879668bc1281b0128 mesa-21.2.0.tar.gz 2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4 Mako-1.1.1.tar.gz -b4047f7afb3bcccebb9c949049c7ffd4a020edbd1fc66ae996d8fecaad827b48 force-byacc.patch diff --git a/extra/mesa/patches/force-byacc.patch b/extra/mesa/patches/force-byacc.patch deleted file mode 100644 index 9e649c0e..00000000 --- a/extra/mesa/patches/force-byacc.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- meson.build.orig Mon Aug 9 21:05:49 2021 -+++ meson.build Mon Aug 9 21:07:48 2021 -@@ -1821,19 +1821,8 @@ - prog_bison = find_program('bison', 'yacc', required : with_any_opengl) - endif - else -- prog_bison = find_program('bison', required : false) -- -- if not prog_bison.found() -- prog_bison = find_program('byacc', required : with_any_opengl) -- yacc_is_bison = false -- endif -- -- # 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 -- if find_program('bison', required : false, version : '> 2.3').found() -- prog_bison = [prog_bison, '-Wno-deprecated'] -- endif -+ prog_bison = find_program('byacc', required : with_any_opengl) -+ yacc_is_bison = false - - prog_flex = find_program('flex', required : with_any_opengl) - prog_flex_cpp = prog_flex diff --git a/extra/mesa/sources b/extra/mesa/sources index 49c7c7d3..a6938b64 100644 --- a/extra/mesa/sources +++ b/extra/mesa/sources @@ -1,3 +1,2 @@ https://github.com/mesa3d/mesa/archive/mesa-21.2.0.tar.gz https://files.pythonhosted.org/packages/source/M/Mako/Mako-1.1.1.tar.gz mako -patches/force-byacc.patch |