Commit 102b794e authored by Michael Niedermayer's avatar 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 88956f73
...@@ -107,6 +107,7 @@ Configuration options: ...@@ -107,6 +107,7 @@ Configuration options:
--disable-all disable building components, libraries and programs --disable-all disable building components, libraries and programs
--enable-incompatible-libav-abi enable incompatible Libav fork ABI [no] --enable-incompatible-libav-abi enable incompatible Libav fork ABI [no]
--enable-incompatible-fork-abi enable incompatible Libav fork ABI (deprecated) [no] --enable-incompatible-fork-abi enable incompatible Libav fork ABI (deprecated) [no]
--enable-raise-major increase major version numbers in sonames [no]
Program options: Program options:
--disable-programs do not build command line programs --disable-programs do not build command line programs
...@@ -1365,6 +1366,7 @@ CONFIG_LIST=" ...@@ -1365,6 +1366,7 @@ CONFIG_LIST="
network network
nonfree nonfree
pic pic
raise_major
rdft rdft
runtime_cpudetect runtime_cpudetect
safe_bitstream_reader safe_bitstream_reader
...@@ -5030,6 +5032,7 @@ get_version(){ ...@@ -5030,6 +5032,7 @@ get_version(){
name=$(toupper $lcname) name=$(toupper $lcname)
file=$source_path/$lcname/version.h file=$source_path/$lcname/version.h
eval $(awk "/#define ${name}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file") 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 ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak
......
...@@ -117,13 +117,19 @@ static int volatile entangled_thread_counter = 0; ...@@ -117,13 +117,19 @@ static int volatile entangled_thread_counter = 0;
static void *codec_mutex; static void *codec_mutex;
static void *avformat_mutex; static void *avformat_mutex;
#if CONFIG_RAISE_MAJOR
# define LIBNAME "LIBAVCODEC_155"
#else
# define LIBNAME "LIBAVCODEC_55"
#endif
#if FF_API_FAST_MALLOC && CONFIG_SHARED && HAVE_SYMVER #if FF_API_FAST_MALLOC && CONFIG_SHARED && HAVE_SYMVER
FF_SYMVER(void*, av_fast_realloc, (void *ptr, unsigned int *size, size_t min_size), "LIBAVCODEC_55") FF_SYMVER(void*, av_fast_realloc, (void *ptr, unsigned int *size, size_t min_size), LIBNAME)
{ {
return av_fast_realloc(ptr, size, min_size); return av_fast_realloc(ptr, size, min_size);
} }
FF_SYMVER(void, av_fast_malloc, (void *ptr, unsigned int *size, size_t min_size), "LIBAVCODEC_55") FF_SYMVER(void, av_fast_malloc, (void *ptr, unsigned int *size, size_t min_size), LIBNAME)
{ {
av_fast_malloc(ptr, size, min_size); av_fast_malloc(ptr, size, min_size);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment