diff options
| author | Cem Keylan <cem@ckyln.com> | 2022-10-13 17:56:04 +0200 |
|---|---|---|
| committer | Cem Keylan <cem@ckyln.com> | 2022-10-13 17:56:04 +0200 |
| commit | e2f11aac4a5aa00c742bbe9760184a5512f4b34d (patch) | |
| tree | 58f16179f4add4b2f15390cdc1c5c785c1537020 | |
| parent | 3731c0e2cbb7d572bace373e27f1c86defefc551 (diff) | |
| download | repository-e2f11aac4a5aa00c742bbe9760184a5512f4b34d.tar.gz | |
gstreamer: bump to 1.20.4 and add patch to use byacc instead of bison
| -rwxr-xr-x | extra/gstreamer/build | 4 | ||||
| -rw-r--r-- | extra/gstreamer/checksums | 3 | ||||
| -rw-r--r-- | extra/gstreamer/patches/byacc.patch | 26 | ||||
| -rw-r--r-- | extra/gstreamer/sources | 3 | ||||
| -rw-r--r-- | extra/gstreamer/version | 2 |
5 files changed, 35 insertions, 3 deletions
diff --git a/extra/gstreamer/build b/extra/gstreamer/build index 11517bc3..592deeaa 100755 --- a/extra/gstreamer/build +++ b/extra/gstreamer/build @@ -2,6 +2,10 @@ export DESTDIR="$1" +# Let's not use bison as long as we don't need to +patch -p1 < byacc.patch +clsed '/^args/{s/yfile,//;s/cfile/cfile, yfile/;}' gst/parse/gen_grammar.py.in + cl-meson \ -Ddbghelp=disabled \ -Dintrospection=disabled \ diff --git a/extra/gstreamer/checksums b/extra/gstreamer/checksums index b97d469d..fa89bd3b 100644 --- a/extra/gstreamer/checksums +++ b/extra/gstreamer/checksums @@ -1,2 +1,3 @@ %BLAKE3 -ecbd7864234cbd831b366365e91d306c82b66f3a8959150e450ca433a48aa710 gstreamer-1.20.3.tar.xz +cf0c5c28ce50c5428afbeea89829dbeed3446e79e17edeedd8d812e186ca3a68 gstreamer-1.20.4.tar.xz +d69378fcb6e40f43f7341e08d1bcb135ce5425eedf88e0bee6021b39de2e7955 byacc.patch diff --git a/extra/gstreamer/patches/byacc.patch b/extra/gstreamer/patches/byacc.patch new file mode 100644 index 00000000..c4851c87 --- /dev/null +++ b/extra/gstreamer/patches/byacc.patch @@ -0,0 +1,26 @@ +--- a/gst/parse/meson.build Wed Oct 12 17:39:51 2022 ++++ b/gst/parse/meson.build Thu Oct 13 14:49:30 2022 +@@ -31,21 +31,9 @@ + bison_cdata = configuration_data() + + bison_min_version='2.4' +-bison = find_program('bison', 'win_bison') ++bison = find_program('bison', 'win_bison', 'yacc') + +-bversion_res = run_command([bison, '--version'], check: true) +-bversion = bversion_res.stdout().split('\n')[0].split(' ')[-1].strip() +-if bversion.version_compare('<' + bison_min_version) +- error('bison version @0@ >= @1@: NO'.format(bversion, bison_min_version)) +-else +- message('bison version @0@ >= @1@: YES'.format(bversion, bison_min_version)) +-endif +- +-if bversion.version_compare('>' + '2.5') +- bison_parser_cdata.set('BISON_PURE_PARSER', '%define api.pure full') +-else +- bison_parser_cdata.set('BISON_PURE_PARSER', '%pure-parser') +-endif ++bison_parser_cdata.set('BISON_PURE_PARSER', '%pure-parser') + + gen_grammar_file = configure_file(input : 'grammar.y.in', + output : 'grammar.y', diff --git a/extra/gstreamer/sources b/extra/gstreamer/sources index 7c07da13..9616149d 100644 --- a/extra/gstreamer/sources +++ b/extra/gstreamer/sources @@ -1 +1,2 @@ -https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.3.tar.xz +https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.4.tar.xz +patches/byacc.patch diff --git a/extra/gstreamer/version b/extra/gstreamer/version index ec478668..afbbd7e1 100644 --- a/extra/gstreamer/version +++ b/extra/gstreamer/version @@ -1 +1 @@ -1.20.3 1 +1.20.4 1 |