[SCM] libav/experimental: support BUILDSUF patch by <charles dot yates at pandora dot be>
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:43:53 UTC 2013
The following commit has been merged in the experimental branch:
commit eb94aca926131cfbe5d818a679c6872a8bb97049
Author: Charles Yates <charles.yates at pandora.be>
Date: Sun May 8 15:04:59 2005 +0000
support BUILDSUF patch by <charles dot yates at pandora dot be>
Originally committed as revision 4203 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/Makefile b/Makefile
index 19cf906..ee44701 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,7 @@ endif
OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
-FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
+FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF)
all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
diff --git a/configure b/configure
index f16f343..a39e6b4 100755
--- a/configure
+++ b/configure
@@ -47,6 +47,7 @@ echo " --make=MAKE use specified make [$make]"
echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS]"
echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]"
echo " --extra-libs=ELIBS add ELIBS [$ELIBS]"
+echo " --build-suffix=SUFFIX suffix for application specific build []"
echo " --cpu=CPU force cpu to CPU [$cpu]"
echo " --tune=PROCESSOR tune code for a particular CPU (may fails or misperforms on other CPUs)"
echo " --powerpc-perf-enable enable performance report on PPC (requires enabling PMC)"
@@ -198,6 +199,7 @@ LIBSUF=".a"
SLIBPREF="lib"
SLIBSUF=".so"
EXESUF=""
+BUILDSUF=""
amr_nb="no"
amr_wb="no"
amr_nb_fixed="no"
@@ -403,6 +405,8 @@ for opt do
;;
--extra-libs=*) extralibs=${opt#--extra-libs=}
;;
+ --build-suffix=*) BUILDSUF=${opt#--build-suffix=}
+ ;;
--cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
;;
--tune=*) tune=`echo $opt | cut -d '=' -f 2`
@@ -1092,6 +1096,9 @@ echo "Source path $source_path"
echo "C compiler $cc"
echo "make $make"
echo "CPU $cpu ($tune)"
+if test "$BUILDSUF" != ""; then
+echo "Build suffix $BUILDSUF"
+fi
echo "Big Endian $bigendian"
echo "inttypes.h $inttypes"
echo "broken inttypes.h $emu_fast_int"
@@ -1186,11 +1193,12 @@ echo "SHCFLAGS=$SHCFLAGS">>config.mak
echo "LDFLAGS=$LDFLAGS" >> config.mak
echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak
echo "SHFLAGS=$SHFLAGS" >> config.mak
+echo "BUILDSUF=$BUILDSUF" >> config.mak
echo "LIBPREF=$LIBPREF" >> config.mak
-echo "LIBSUF=$LIBSUF" >> config.mak
+echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak
echo "SLIBPREF=$SLIBPREF" >> config.mak
-echo "SLIBSUF=$SLIBSUF" >> config.mak
-echo "EXESUF=$EXESUF" >> config.mak
+echo "SLIBSUF=\${BUILDSUF}$SLIBSUF" >> config.mak
+echo "EXESUF=\${BUILDSUF}$EXESUF" >> config.mak
echo "TARGET_OS=$TARGET_OS" >> config.mak
if test "$cpu" = "x86" ; then
echo "TARGET_ARCH_X86=yes" >> config.mak
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index fe7daa4..d438332 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -261,7 +261,7 @@ endif
ifeq ($(CONFIG_PP),yes)
ifeq ($(SHARED_PP),yes)
-EXTRALIBS += -L$(VPATH)/libpostproc -lpostproc
+EXTRALIBS += -L$(VPATH)/libpostproc -lpostproc$(BUILDSUF)
else
# LIBS += libpostproc/libpostproc.a ... should be fixed
OBJS += libpostproc/postprocess.o
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 3b804d2..83259b2 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -77,7 +77,7 @@ LIB= $(LIBPREF)avformat$(LIBSUF)
ifeq ($(BUILD_SHARED),yes)
SLIB= $(SLIBPREF)avformat$(SLIBSUF)
-AVCLIBS+=-lavcodec -L../libavcodec
+AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec
ifeq ($(CONFIG_MP3LAME),yes)
AVCLIBS+=-lmp3lame
endif
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list