diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /media/libaom | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'media/libaom')
| -rw-r--r-- | media/libaom/cmakeparser.py | 4 | ||||
| -rw-r--r-- | media/libaom/moz.yaml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media/libaom/cmakeparser.py b/media/libaom/cmakeparser.py index b93a313bce..261f05fb17 100644 --- a/media/libaom/cmakeparser.py +++ b/media/libaom/cmakeparser.py @@ -83,7 +83,7 @@ def substs(variables, values): # Safe substitute leaves unrecognized variables in place. # We replace them with the empty string. - new_values.append(re.sub('\$\{\w+\}', '', new_value)) + new_values.append(re.sub(r'\$\{\w+\}', '', new_value)) return new_values @@ -240,7 +240,7 @@ def evaluate_boolean(variables, arguments): # If statements can have old-style variables which are not demarcated # like ${VARIABLE}. Attempt to look up the variable both ways. try: - if re.search('\$\{\w+\}', argument): + if re.search(r'\$\{\w+\}', argument): try: t = Template(argument) value = t.substitute(variables) diff --git a/media/libaom/moz.yaml b/media/libaom/moz.yaml index cc01efbd27..b06ee5115a 100644 --- a/media/libaom/moz.yaml +++ b/media/libaom/moz.yaml @@ -20,11 +20,11 @@ origin: # Human-readable identifier for this version/release # Generally "version NNN", "tag SSS", "bookmark SSS" - release: 8cb8ebb5a1b4f8c361baf4cde9a55733ade3e723 (Thu Jan 11 17:13:41 2024 -0800). + release: 11631186b36e96afce18808ebebb17cc23a010ef (Fri Jan 19 23:29:34 2024 +0000). # Revision to pull in # Must be a long or short commit SHA (long preferred) - revision: 8cb8ebb5a1b4f8c361baf4cde9a55733ade3e723 + revision: 11631186b36e96afce18808ebebb17cc23a010ef # The package's license, where possible using the mnemonic from # https://spdx.org/licenses/ |