stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Makefile.ffmpeg: prefer static linking for x264, vpx, vorbis libs to avoid conflicts with distro"

Browse source 
This reverts commit 8e876995f3.

It does not work..
This commit is contained in:
Jaroslav Kysela 2014-10-17 17:26:07 +02:00
parent e393311e27
commit 59e9a897b6
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile.ffmpeg
View file

@ -47,7 +47,6 @@ export PATH := $(LIBAVDIR)/build/ffmpeg/bin:$(PATH)
ECFLAGS = -I$(LIBAVDIR)/build/ffmpeg/include
ELIBS = -L$(LIBAVDIR)/build/ffmpeg/lib -ldl
SLIBS = -lx264 -lvpx -lvorbisenc -lvorbis -logg
FFMPEG = ffmpeg-2.4.2
FFMPEG_TB = $(FFMPEG).tar.bz2
@ -240,17 +239,6 @@ $(LIBAVDIR)/$(FFMPEG)/.tvh_build: \
$(foreach encoder,$(ENCODERS),--enable-encoder=$(encoder)) \
$(foreach muxer,$(MUXERS),--enable-muxer=$(muxer)) \
$(foreach bsf,$(BSFS),--enable-bsf=$(bsf))
#
# Modify EXTRALIBS to link statically at first shot
#
@{ \
libs=$$(cat $(LIBAVDIR)/$(FFMPEG)/config.mak | grep -E "^EXTRALIBS=" | cut -d '=' -f 2-) ; \
cat $(LIBAVDIR)/$(FFMPEG)/config.mak | grep -Ev "^EXTRALIBS=" > \
$(LIBAVDIR)/$(FFMPEG)/config.mak.new ; \
echo "EXTRALIBS=-L$(LIBAVDIR)/build/ffmpeg/lib -Wl,-Bstatic $(SLIBS) -Wl,-Bdynamic $${libs}" > \
$(LIBAVDIR)/$(FFMPEG)/config.mak ; \
cat $(LIBAVDIR)/$(FFMPEG)/config.mak.new >> $(LIBAVDIR)/$(FFMPEG)/config.mak ; \
}
DESTDIR=$(LIBAVDIR)/build \
make -C $(LIBAVDIR)/$(FFMPEG) install
@touch $@