[FFmpeg-cvslog] configure: support raising major version in soname

Michael Niedermayer git at videolan.org
Tue Jan 7 03:47:23 CET 2014


ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 18 05:20:11 2013 +0100| [061e94815322a0702977491158c0b5cbaca3ccc4] | committer: Michael Niedermayer

configure: support raising major version in soname

this allows seperate installation of shared libs that should not conflict with
whatever is already installed.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 102b794e09482fec881e7ec903e57914895f9b74)

Conflicts:

	libavcodec/utils.c

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=061e94815322a0702977491158c0b5cbaca3ccc4
---

 configure |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure b/configure
index 82b2e7b..d4dc9cf 100755
--- a/configure
+++ b/configure
@@ -105,6 +105,7 @@ Configuration options:
   --disable-all            disable building components, libraries and programs
   --enable-incompatible-libav-abi enable incompatible Libav fork ABI [no]
   --enable-incompatible-fork-abi  enable incompatible Libav fork ABI (deprecated) [no]
+  --enable-raise-major     increase major version numbers in sonames [no]
 
 Program options:
   --disable-programs       do not build command line programs
@@ -1300,6 +1301,7 @@ CONFIG_LIST="
     network
     nonfree
     pic
+    raise_major
     rdft
     runtime_cpudetect
     safe_bitstream_reader
@@ -4871,6 +4873,7 @@ get_version(){
     name=$(toupper $lcname)
     file=$source_path/$lcname/version.h
     eval $(awk "/#define ${name}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file")
+    enabled raise_major && eval ${name}_VERSION_MAJOR=$((${name}_VERSION_MAJOR+100))
     eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
     eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
     eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak



More information about the ffmpeg-cvslog mailing list