diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-08-08 08:35:28 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-08-08 08:39:25 +0300 |
| commit | 5543498968f290624cd75c89fac604edc67cc472 (patch) | |
| tree | c1a31eba98ed63b004070a4bd33cc616cbee5700 /main/omxplayer/fix-makefile.patch | |
| parent | b07e0c19106b4a381d644967055c43111481d278 (diff) | |
| download | aports-5543498968f290624cd75c89fac604edc67cc472.tar.bz2 aports-5543498968f290624cd75c89fac604edc67cc472.tar.xz | |
main/omxplayer: fix ldflags/libs
Diffstat (limited to 'main/omxplayer/fix-makefile.patch')
| -rw-r--r-- | main/omxplayer/fix-makefile.patch | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/main/omxplayer/fix-makefile.patch b/main/omxplayer/fix-makefile.patch index d809c1d658..80aa0e6205 100644 --- a/main/omxplayer/fix-makefile.patch +++ b/main/omxplayer/fix-makefile.patch @@ -1,24 +1,36 @@ ---- omxplayer/Makefile.orig -+++ omxplayer/Makefile -@@ -48,10 +49,10 @@ +diff --git a/Makefile b/Makefile +index 2857e94..a889fca 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,8 @@ include Makefile.include + + 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/local/lib/ ++LIBS+=-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 + +@@ -49,10 +50,10 @@ all: dist omxplayer.o: help.h keys.h version: - bash gen_version.sh > version.h -+ sh gen_version.sh > version.h ++ sh gen_version.sh > version.h omxplayer.bin: version $(OBJS) - $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvchostif -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre -+ $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre ++ $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) $(LIBS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre $(STRIP) omxplayer.bin help.h: README.md Makefile -@@ -79,14 +80,12 @@ +@@ -80,14 +81,12 @@ ffmpeg: make -f Makefile.ffmpeg make -f Makefile.ffmpeg install -dist: omxplayer.bin omxplayer.1 -+install: omxplayer.bin omxplayer.1 ++install dist: omxplayer.bin omxplayer.1 mkdir -p $(DIST)/usr/lib/omxplayer mkdir -p $(DIST)/usr/bin mkdir -p $(DIST)/usr/share/doc/omxplayer |