Browse Source

SONAME support for shared libs

patch by Luca Barbato < .. lu_zero .. @@ .. gentoo .. . .. org .. >

Originally committed as revision 4730 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Luca Barbato Diego Biurrun 20 years ago
parent
commit
5a872801d5
4 changed files with 19 additions and 7 deletions
  1. +16
    -7
      configure
  2. +1
    -0
      libavcodec/Makefile
  3. +1
    -0
      libavformat/Makefile
  4. +1
    -0
      libavutil/Makefile

+ 16
- 7
configure View File

@@ -215,7 +215,7 @@ vhook="default"
dlfcn="no" dlfcn="no"
dlopen="no" dlopen="no"
mpegaudio_hp="yes" mpegaudio_hp="yes"
SHFLAGS=-shared
SHFLAGS='-shared -Wl,-soname,$@.$(LIBVERSION)'
netserver="no" netserver="no"
need_inet_aton="no" need_inet_aton="no"
ffserver="yes" ffserver="yes"
@@ -1447,11 +1447,24 @@ if test "$vhook" = "yes" ; then
echo "BUILD_VHOOK=yes" >> config.mak echo "BUILD_VHOOK=yes" >> config.mak
echo "#define HAVE_VHOOK 1" >> $TMPH echo "#define HAVE_VHOOK 1" >> $TMPH
fi fi

lavc_version=`grep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/[^0-9\.]//g'`
lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/[^0-9\.]//g'`
lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]//g'`



if test "$lshared" = "yes" ; then if test "$lshared" = "yes" ; then
echo "BUILD_SHARED=yes" >> config.mak echo "BUILD_SHARED=yes" >> config.mak
echo "PIC=-fPIC -DPIC" >> config.mak echo "PIC=-fPIC -DPIC" >> config.mak
echo "SPPMAJOR=0" >> config.mak
echo "SPPVERSION=0.0.1" >> config.mak
echo "SPPMAJOR=${lavc_version/.*/}" >> config.mak
echo "SPPVERSION=$lavc_version" >> config.mak
echo "LAVCMAJOR=${lavc_version/.*/}" >> config.mak
echo "LAVCVERSION=$lavc_version" >> config.mak
echo "LAVFMAJOR=${lavf_version/.*/}" >> config.mak
echo "LAVFVERSION=$lavf_version" >> config.mak
echo "LAVUMAJOR=${lavu_version/.*/}" >> config.mak
echo "LAVUVERSION=$lavu_version" >> config.mak
fi fi
echo "EXTRALIBS=$extralibs" >> config.mak echo "EXTRALIBS=$extralibs" >> config.mak
version=`grep '#define FFMPEG_VERSION ' "$source_path/libavcodec/avcodec.h" | version=`grep '#define FFMPEG_VERSION ' "$source_path/libavcodec/avcodec.h" |
@@ -1789,10 +1802,6 @@ rm -f $TMPO $TMPC $TMPE $TMPS $TMPH




# build pkg-config files libav*.pc and libpostproc.pc # build pkg-config files libav*.pc and libpostproc.pc
lavc_version=`grep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/[^0-9\.]//g'`
lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/[^0-9\.]//g'`
lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]//g'`

# libavutil.pc # libavutil.pc
cat <<EOF >libavutil.pc cat <<EOF >libavutil.pc
prefix=$prefix prefix=$prefix


+ 1
- 0
libavcodec/Makefile View File

@@ -488,6 +488,7 @@ fft-test: fft-test.o $(LIB)
$(CC) -o $@ $^ $(LIBAVUTIL) -lm $(CC) -o $@ $^ $(LIBAVUTIL) -lm


ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVCMAJOR)
install: all install-headers install: all install-headers
ifeq ($(CONFIG_WIN32),yes) ifeq ($(CONFIG_WIN32),yes)
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"


+ 1
- 0
libavformat/Makefile View File

@@ -80,6 +80,7 @@ endif


LIB= $(LIBPREF)avformat$(LIBSUF) LIB= $(LIBPREF)avformat$(LIBSUF)
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVFMAJOR)
SLIBNAME= $(SLIBPREF)avformat$(SLIBSUF) SLIBNAME= $(SLIBPREF)avformat$(SLIBSUF)
AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil
ifeq ($(CONFIG_DARWIN),yes) ifeq ($(CONFIG_DARWIN),yes)


+ 1
- 0
libavutil/Makefile View File

@@ -22,6 +22,7 @@ SRCS := $(OBJS:.o=.c)


LIB= $(LIBPREF)avutil$(LIBSUF) LIB= $(LIBPREF)avutil$(LIBSUF)
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVUMAJOR)
SLIBNAME= $(SLIBPREF)avutil$(SLIBSUF) SLIBNAME= $(SLIBPREF)avutil$(SLIBSUF)
ifeq ($(CONFIG_DARWIN),yes) ifeq ($(CONFIG_DARWIN),yes)
SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)


Loading…
Cancel
Save