| From 1e92da659375eae1622984d4cc0ffd2a7b082fcf Mon Sep 17 00:00:00 2001 |
| From: Andrei Gherzan <andrei@gherzan.ro> |
| 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 <andrei@gherzan.ro> |
| Signed-off-by: Jonathan Liu <net147@gmail.com> |
| --- |
| Makefile | 6 +++--- |
| Makefile.ffmpeg | 2 +- |
| 2 files changed, 4 insertions(+), 4 deletions(-) |
| |
| Index: git/Makefile |
| =================================================================== |
| --- git.orig/Makefile |
| +++ git/Makefile |
| @@ -1,9 +1,9 @@ |
| |
| 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./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound |
| +LDFLAGS+=-L./ -Lffmpeg_compiled/usr/lib/ -lc -lWFC -lGLESv2 -lEGL -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 |
| +INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/include/ -I=/usr/include/dbus-1.0 |
| |
| DIST ?= omxplayer-dist |
| |
| @@ -88,5 +88,5 @@ 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 * |
| Index: git/Makefile.ffmpeg |
| =================================================================== |
| --- git.orig/Makefile.ffmpeg |
| +++ git/Makefile.ffmpeg |
| @@ -254,5 +254,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 |
| |