| Patrick Williams | 8b8bc41 | 2016-08-17 15:02:23 -0500 | [diff] [blame] | 1 | From 1e92da659375eae1622984d4cc0ffd2a7b082fcf Mon Sep 17 00:00:00 2001 |
| 2 | From: Andrei Gherzan <andrei@gherzan.ro> |
| 3 | Date: Sun, 24 Aug 2014 00:13:13 +0200 |
| 4 | Subject: [PATCH] Libraries and headers from ffmpeg are installed in /usr. |
| 5 | |
| 6 | Don't search for libraries and headers in /usr/local. |
| 7 | |
| 8 | Upstream-Status: Inappropriate [embedded specific] |
| 9 | |
| 10 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> |
| 11 | Signed-off-by: Jonathan Liu <net147@gmail.com> |
| 12 | --- |
| 13 | Makefile | 6 +++--- |
| 14 | Makefile.ffmpeg | 2 +- |
| 15 | 2 files changed, 4 insertions(+), 4 deletions(-) |
| 16 | |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 17 | Index: git/Makefile |
| 18 | =================================================================== |
| 19 | --- git.orig/Makefile |
| 20 | +++ git/Makefile |
| Patrick Williams | 8b8bc41 | 2016-08-17 15:02:23 -0500 | [diff] [blame] | 21 | @@ -1,9 +1,9 @@ |
| 22 | |
| 23 | 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 |
| 24 | |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 25 | -LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound |
| 26 | +LDFLAGS+=-L./ -Lffmpeg_compiled/usr/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound |
| Patrick Williams | 8b8bc41 | 2016-08-17 15:02:23 -0500 | [diff] [blame] | 27 | |
| 28 | -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 29 | +INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/include/ -I=/usr/include/dbus-1.0 |
| Patrick Williams | 8b8bc41 | 2016-08-17 15:02:23 -0500 | [diff] [blame] | 30 | |
| 31 | DIST ?= omxplayer-dist |
| 32 | |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 33 | @@ -88,5 +88,5 @@ dist: omxplayer.bin omxplayer.1 |
| Patrick Williams | 8b8bc41 | 2016-08-17 15:02:23 -0500 | [diff] [blame] | 34 | cp COPYING $(DIST)/usr/share/doc/omxplayer |
| 35 | cp README.md $(DIST)/usr/share/doc/omxplayer/README |
| 36 | cp omxplayer.1 $(DIST)/usr/share/man/man1 |
| 37 | - cp -P ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/ |
| 38 | + cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/ |
| 39 | cd $(DIST); tar -czf ../$(DIST).tgz * |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 40 | Index: git/Makefile.ffmpeg |
| 41 | =================================================================== |
| 42 | --- git.orig/Makefile.ffmpeg |
| 43 | +++ git/Makefile.ffmpeg |
| Patrick Williams | 8b8bc41 | 2016-08-17 15:02:23 -0500 | [diff] [blame] | 44 | @@ -254,5 +254,5 @@ checkout: |
| 45 | .PHONY : install |
| 46 | install: |
| 47 | cd ffmpeg; make -j9 DESTDIR="$(WORK)/ffmpeg_compiled" install |
| 48 | - $(HOST)-strip ffmpeg_compiled/usr/local/lib/*.so |
| 49 | + $(HOST)-strip ffmpeg_compiled/usr/lib/*.so |
| 50 | |