Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From e46208c4a3e35da461e0e8f662970339eae47fca Mon Sep 17 00:00:00 2001 |
Patrick Williams | 8b8bc41 | 2016-08-17 15:02:23 -0500 | [diff] [blame] | 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> |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 12 | |
Patrick Williams | 8b8bc41 | 2016-08-17 15:02:23 -0500 | [diff] [blame] | 13 | --- |
| 14 | Makefile | 6 +++--- |
| 15 | Makefile.ffmpeg | 2 +- |
| 16 | 2 files changed, 4 insertions(+), 4 deletions(-) |
| 17 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 18 | Index: git/Makefile |
| 19 | =================================================================== |
| 20 | --- git.orig/Makefile |
| 21 | +++ git/Makefile |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 22 | @@ -2,9 +2,9 @@ CFLAGS=-pipe -mfloat-abi=hard -mcpu=arm1 |
Patrick Williams | 8b8bc41 | 2016-08-17 15:02:23 -0500 | [diff] [blame] | 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 | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 25 | LDFLAGS=-L$(SDKSTAGE)/opt/vc/lib/ |
| 26 | -LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound |
| 27 | +LDFLAGS+=-L./ -Lffmpeg_compiled/usr/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound |
Patrick Williams | 8b8bc41 | 2016-08-17 15:02:23 -0500 | [diff] [blame] | 28 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 29 | -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 |
| 30 | +INCLUDES+=-I./ -Ilinux |
Patrick Williams | 8b8bc41 | 2016-08-17 15:02:23 -0500 | [diff] [blame] | 31 | |
| 32 | DIST ?= omxplayer-dist |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 33 | STRIP ?= strip |
| 34 | @@ -90,7 +90,7 @@ dist: omxplayer.bin omxplayer.1 |
Patrick Williams | 8b8bc41 | 2016-08-17 15:02:23 -0500 | [diff] [blame] | 35 | cp COPYING $(DIST)/usr/share/doc/omxplayer |
| 36 | cp README.md $(DIST)/usr/share/doc/omxplayer/README |
| 37 | cp omxplayer.1 $(DIST)/usr/share/man/man1 |
| 38 | - cp -P ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/ |
| 39 | + cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/ |
| 40 | cd $(DIST); tar -czf ../$(DIST).tgz * |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 41 | |
| 42 | install: |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 43 | Index: git/Makefile.ffmpeg |
| 44 | =================================================================== |
| 45 | --- git.orig/Makefile.ffmpeg |
| 46 | +++ git/Makefile.ffmpeg |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 47 | @@ -238,7 +238,8 @@ configure: |
| 48 | --disable-decoder=xbin \ |
| 49 | --disable-decoder=idf \ |
| 50 | --disable-decoder=hevc \ |
| 51 | - --enable-decoder=opus |
| 52 | + --enable-decoder=opus \ |
| 53 | + --disable-stripping |
| 54 | |
| 55 | .PHONY : clean |
| 56 | clean: |
| 57 | @@ -251,5 +252,5 @@ checkout: |
Patrick Williams | 8b8bc41 | 2016-08-17 15:02:23 -0500 | [diff] [blame] | 58 | .PHONY : install |
| 59 | install: |
| 60 | cd ffmpeg; make -j9 DESTDIR="$(WORK)/ffmpeg_compiled" install |
| 61 | - $(HOST)-strip ffmpeg_compiled/usr/local/lib/*.so |
| 62 | + $(HOST)-strip ffmpeg_compiled/usr/lib/*.so |
| 63 | |