From e46208c4a3e35da461e0e8f662970339eae47fca Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Sun, 24 Aug 2014 00:13:13 +0200 Subject: [PATCH] Libraries and headers from ffmpeg are installed in /usr. Don't search for libraries and headers in /usr/local. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andrei Gherzan Signed-off-by: Jonathan Liu --- Makefile | 6 +++--- Makefile.ffmpeg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) --- a/Makefile +++ b/Makefile @@ -2,9 +2,9 @@ CFLAGS=-pipe -mfloat-abi=hard -mcpu=arm1 CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST LDFLAGS=-L$(SDKSTAGE)/opt/vc/lib/ -LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound +LDFLAGS+=-L./ -Lffmpeg_compiled/usr/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include -I/usr/include/freetype2 -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads +INCLUDES+=-I./ -Ilinux -I./ffmpeg DIST ?= omxplayer-dist STRIP ?= strip @@ -91,7 +91,7 @@ dist: omxplayer.bin omxplayer.1 cp COPYING $(DIST)/usr/share/doc/omxplayer cp README.md $(DIST)/usr/share/doc/omxplayer/README cp omxplayer.1 $(DIST)/usr/share/man/man1 - cp -P ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/ + cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/ cd $(DIST); tar -czf ../$(DIST).tgz * install: --- a/Makefile.ffmpeg +++ b/Makefile.ffmpeg @@ -238,7 +238,8 @@ configure: --disable-decoder=xbin \ --disable-decoder=idf \ --disable-decoder=hevc \ - --enable-decoder=opus + --enable-decoder=opus \ + --disable-stripping .PHONY : clean clean: @@ -251,5 +252,5 @@ checkout: .PHONY : install install: cd ffmpeg; make -j9 DESTDIR="$(WORK)/ffmpeg_compiled" install - $(HOST)-strip ffmpeg_compiled/usr/local/lib/*.so + $(HOST)-strip ffmpeg_compiled/usr/lib/*.so