From 59e9a897b645de022f3bab68362001d01d9aa18c Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 17 Oct 2014 17:26:07 +0200 Subject: [PATCH] Revert "Makefile.ffmpeg: prefer static linking for x264, vpx, vorbis libs to avoid conflicts with distro" This reverts commit 8e876995f352b28dc7ca0f5ad683d82e35b38370. It does not work.. --- Makefile.ffmpeg | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg index 8fd0c17c..7d6bc7fd 100644 --- a/Makefile.ffmpeg +++ b/Makefile.ffmpeg @@ -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 $@