diff mbox series

[FFmpeg-devel] Fix libversion.sh for split headers

Message ID 20220316174424.2167137-1-martin@martin.st
State New
Headers show
Series [FFmpeg-devel] Fix libversion.sh for split headers | expand

Checks

Context Check Description
yinshiyou/commit_msg_loongarch64 warning The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ".
andriy/commit_msg_x86 warning The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ".
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/commit_msg_aarch64_jetson warning The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ".
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished
andriy/commit_msg_armv7_RPi4 warning The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ".
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Martin Storsjö March 16, 2022, 5:44 p.m. UTC 
---
The extra dummy version_major.h isn't pretty though, but needed (I think?)
to fulfill the make dependency.
---
 ffbuild/library.mak       |  4 ++--
 ffbuild/libversion.sh     |  4 ++++
 libavutil/version_major.h | 25 +++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 libavutil/version_major.h

Comments

Martin Storsjö March 17, 2022, 9:12 a.m. UTC | #1 
On Wed, 16 Mar 2022, Martin Storsjö wrote:

> ---
> The extra dummy version_major.h isn't pretty though, but needed (I think?)
> to fulfill the make dependency.
> ---
> ffbuild/library.mak       |  4 ++--
> ffbuild/libversion.sh     |  4 ++++
> libavutil/version_major.h | 25 +++++++++++++++++++++++++
> 3 files changed, 31 insertions(+), 2 deletions(-)
> create mode 100644 libavutil/version_major.h

Pushed to unbreak the shared library build.

// Martin
diff mbox series

Patch

diff --git a/ffbuild/library.mak b/ffbuild/library.mak
index ad09f20da9..793e9d41fa 100644
--- a/ffbuild/library.mak
+++ b/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/ffbuild/libversion.sh b/ffbuild/libversion.sh
index 990ce9f640..a94ab58057 100755
--- a/ffbuild/libversion.sh
+++ b/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"
diff --git a/libavutil/version_major.h b/libavutil/version_major.h
new file mode 100644
index 0000000000..7b89e20031
--- /dev/null
+++ b/libavutil/version_major.h
@@ -0,0 +1,25 @@ 
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_VERSION_MAJOR_H
+#define AVUTIL_VERSION_MAJOR_H
+
+/* This file is intentionally empty; it's only kept to fulfill dependencies
+ * for ffbuild/libversion.sh. It is not installed. */
+
+#endif /* AVUTIL_VERSION_MAJOR_H */