Skip to content

Commit

Permalink
Bug 1857843 - Prepare local patches for libogg v1.3.5. r=media-playba…
Browse files Browse the repository at this point in the history
…ck-reviewers,padenot

* Add new file crctable.h.

* Define new USIZE64 type.

* Remove ogg-fuzzing.patch. This local patch was added in bug 1561256 to disable CRC checking when fuzzing libogg. This patch is no longer necessary because libogg added a DISABLE_CRC flag in v1.3.4.

Differential Revision: https://phabricator.services.mozilla.com/D190526
  • Loading branch information
cpeterso committed Oct 14, 2023
1 parent 7a7f6bd commit 6521d68
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 51 deletions.
3 changes: 3 additions & 0 deletions media/libogg/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ NoVisibilityFlags()

# Add libFuzzer configuration directives
include('/tools/fuzzing/libfuzzer-config.mozbuild')

if CONFIG['FUZZING']:
DEFINES['DISABLE_CRC'] = 1
9 changes: 8 additions & 1 deletion media/libogg/moz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ vendoring:
- "include/ogg/ogg.h"
- "include/ogg/os_types.h"
- "src/bitwise.c"
- "src/crctable.h"
- "src/framing.c"
- AUTHORS
- CHANGES
Expand All @@ -46,6 +47,9 @@ vendoring:
- action: move-file
from: '{vendor_dir}/src/bitwise.c'
to: '{vendor_dir}/src/ogg_bitwise.c'
- action: move-file
from: '{vendor_dir}/src/crctable.h'
to: '{vendor_dir}/src/crctable.h'
- action: move-file
from: '{vendor_dir}/src/framing.c'
to: '{vendor_dir}/src/ogg_framing.c'
Expand Down Expand Up @@ -83,11 +87,14 @@ vendoring:
pattern: '@SIZE64@'
with: 'int64_t'
file: '{vendor_dir}/include/ogg/config_types.h.in'
- action: replace-in-file
pattern: '@USIZE64@'
with: 'uint64_t'
file: '{vendor_dir}/include/ogg/config_types.h.in'
- action: move-file
from: '{vendor_dir}/include/ogg/config_types.h.in'
to: '{vendor_dir}/include/ogg/config_types.h'

patches:
- solaris-types.patch
- memory-reporting.patch
- ogg-fuzzing.patch
50 changes: 0 additions & 50 deletions media/libogg/ogg-fuzzing.patch

This file was deleted.

0 comments on commit 6521d68

Please sign in to comment.