[SCM] libav/experimental: Have EXTRALIBS appear after other link options, fixes shared build on Cygwin. based on patch by Marcus Engene, ffmpeg AATT engene DDOOTT se

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:47:27 UTC 2013


The following commit has been merged in the experimental branch:
commit 2cf30841b5871a720648cfe53fd89607c496702f
Author: Diego Biurrun <diego at biurrun.de>
Date:   Sat Apr 15 15:05:53 2006 +0000

    Have EXTRALIBS appear after other link options, fixes shared build on Cygwin.
    based on patch by Marcus Engene, ffmpeg AATT engene DDOOTT se
    
    Originally committed as revision 5295 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 42796e4..d8e2462 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -293,7 +293,7 @@ OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
 endif
 endif
 
-EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF)
+EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
 
 # currently using libdts for dts decoding
 ifeq ($(CONFIG_DTS),yes)
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 42bc01f..e5e7efa 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -66,7 +66,7 @@ ifeq ($(CONFIG_AUDIO_OSS),yes)
 OBJS+= audio.o
 endif
 
-EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF) -lavcodec$(BUILDSUF) -L../libavcodec
+EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) -lavcodec$(BUILDSUF) -L../libavcodec $(EXTRALIBS)
 
 ifeq ($(CONFIG_AUDIO_BEOS),yes)
 CPPOBJS+= beosaudio.o

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list