Fix ffmpeg basename collision workaround to ignore file extensions. |
|||
Issue descriptionMac libtool warns if two object files have the same name. The rename workaround in generate_gyp.py needs patching to identify collisions when file extensions differ (e.g. foo.c vs foo.S). Upon fixing, undo the temporary renaming of videodsp.S from this CL https://chromium-review.googlesource.com/#/c/360036/
,
Aug 16 2016
I'll put a CL out today, but this will not unblock you until the script is re-run as part of the next ffmpeg roll. For now I think we should go with the work around you proposed. I've just posted some new comments to move your CL along.
,
Aug 16 2016
FYI, script update is here. https://chromium-review.googlesource.com/#/c/371419/
,
Aug 19 2016
,
Aug 25 2016
Chris, did you ever land and roll https://chromium-review.googlesource.com/#/c/371419/1 ?
,
Sep 2 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromium/third_party/ffmpeg/+/9dfd96c51ae1dfa6cce15fd6b974f32af89beefb commit 9dfd96c51ae1dfa6cce15fd6b974f32af89beefb Author: Chris Cunningham <chcunningham@chromium.org> Date: Fri Sep 02 00:06:35 2016 Detect basename collisions irrespective of file extension. foo.S and foo.c both generate foo.o, so the script should consider these files as colliding. BUG= 627567 Change-Id: Ifcf6c50caa8b61e11dffd29522159f89ac22e9ca Reviewed-on: https://chromium-review.googlesource.com/371419 Reviewed-by: Matthew Wolenetz <wolenetz@chromium.org> [modify] https://crrev.com/9dfd96c51ae1dfa6cce15fd6b974f32af89beefb/chromium/scripts/generate_gn.py [modify] https://crrev.com/9dfd96c51ae1dfa6cce15fd6b974f32af89beefb/chromium/scripts/generate_gn_unittest.py
,
Sep 2 2016
,
Sep 10 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/6e5925dcef736146fa6eed5f2d88c9820963704e commit 6e5925dcef736146fa6eed5f2d88c9820963704e Author: wolenetz <wolenetz@chromium.org> Date: Sat Sep 10 02:08:54 2016 Roll src/third_party/ffmpeg/ 35740fc7b..12183cc16 (5 commits). https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/35740fc7b72a..12183cc1619b $ git log 35740fc7b..12183cc16 --date=short --no-merges --format='%ad %ae %s' 2016-09-09 wolenetz avformat/mov: Fix potential integer overflow in mov_read_keys 2016-09-01 chcunningham Detect basename collisions irrespective of file extension. 2016-08-30 chcunningham Adding generate_gn_unittests.py to PRESUBMIT 2016-08-30 chcunningham FFmpeg generate_gn.py: Fix tests and logic reduction algorithm. 2016-08-29 apatole Fix Chrome ARM64 linux compilation errors TBR=chcunningham@chromium.org,servolk@chromium.org, xhwang@chromium.org BUG= 643948 , 627567 , 535788 , 613452 Review-Url: https://codereview.chromium.org/2330633002 Cr-Commit-Position: refs/heads/master@{#417800} [modify] https://crrev.com/6e5925dcef736146fa6eed5f2d88c9820963704e/DEPS |
|||
►
Sign in to add a comment |
|||
Comment 1 by apat...@nvidia.com
, Aug 16 2016