diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-17 17:24:03 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-06-22 07:51:41 +0000 |
| commit | 774f54339e5db91f785733232d3950366db65d07 (patch) | |
| tree | 068e1b47bd1af94d77094ed12b604a6b83d9c22a /chromium/third_party/ffmpeg/ffbuild | |
| parent | f7eaed5286974984ba5f9e3189d8f49d03e99f81 (diff) | |
| download | qtwebengine-chromium-774f54339e5db91f785733232d3950366db65d07.tar.gz | |
BASELINE: Update Chromium to 102.0.5005.57
Change-Id: I885f714bb40ee724c28f94ca6bd8dbdb39915158
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/ffmpeg/ffbuild')
| -rw-r--r-- | chromium/third_party/ffmpeg/ffbuild/library.mak | 4 | ||||
| -rwxr-xr-x | chromium/third_party/ffmpeg/ffbuild/libversion.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/chromium/third_party/ffmpeg/ffbuild/library.mak b/chromium/third_party/ffmpeg/ffbuild/library.mak index ad09f20da9a..793e9d41fa9 100644 --- a/chromium/third_party/ffmpeg/ffbuild/library.mak +++ b/chromium/third_party/ffmpeg/ffbuild/library.mak @@ -52,8 +52,8 @@ $(LIBOBJS): CPPFLAGS += -DBUILDING_$(NAME) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(EXTRALIBS-$$(*F)) $$(ELIBS) -$(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h | $(SUBDIR) - $$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$< > $$@ +$(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h $(SUBDIR)version_major.h | $(SUBDIR) + $$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$^ > $$@ $(SUBDIR)lib$(FULLNAME).pc: $(SUBDIR)version.h ffbuild/config.sh | $(SUBDIR) $$(M) $$(SRC_PATH)/ffbuild/pkgconfig_generate.sh $(NAME) "$(DESC)" diff --git a/chromium/third_party/ffmpeg/ffbuild/libversion.sh b/chromium/third_party/ffmpeg/ffbuild/libversion.sh index 990ce9f640e..a94ab580579 100755 --- a/chromium/third_party/ffmpeg/ffbuild/libversion.sh +++ b/chromium/third_party/ffmpeg/ffbuild/libversion.sh @@ -5,8 +5,12 @@ toupper(){ name=lib$1 ucname=$(toupper ${name}) file=$2 +file2=$3 eval $(awk "/#define ${ucname}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file") +if [ -f "$file2" ]; then + eval $(awk "/#define ${ucname}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file2") +fi eval ${ucname}_VERSION=\$${ucname}_VERSION_MAJOR.\$${ucname}_VERSION_MINOR.\$${ucname}_VERSION_MICRO eval echo "${name}_VERSION=\$${ucname}_VERSION" eval echo "${name}_VERSION_MAJOR=\$${ucname}_VERSION_MAJOR" |