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 | |
| parent | b07e0c19106b4a381d644967055c43111481d278 (diff) | |
| download | aports-5543498968f290624cd75c89fac604edc67cc472.tar.bz2 aports-5543498968f290624cd75c89fac604edc67cc472.tar.xz | |
main/omxplayer: fix ldflags/libs
| -rw-r--r-- | main/omxplayer/APKBUILD | 8 | ||||
| -rw-r--r-- | main/omxplayer/fix-makefile.patch | 26 |
2 files changed, 23 insertions, 11 deletions
diff --git a/main/omxplayer/APKBUILD b/main/omxplayer/APKBUILD index e0b1ec974d..4ddd5403c0 100644 --- a/main/omxplayer/APKBUILD +++ b/main/omxplayer/APKBUILD @@ -30,7 +30,7 @@ build() { INCLUDES:=-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux INCLUDES+=$(pkg-config --cflags freetype2 dbus-1) LDFLAGS:=-L/opt/vc/lib -Wl,-rpath,/opt/vc/lib -LDFLAGS+=$(pkg-config --libs freetype2 dbus-1) +LIBS:=$(pkg-config --libs freetype2 dbus-1) STRIP:=echo EOF make omxplayer.bin omxplayer.1 @@ -50,21 +50,21 @@ package() { md5sums="e8351a6a21e51906511aad40f40d8abe omxplayer-0.20160803.tar.gz a900cdded87b7df503c6599ac43bd8de issue-260.patch c858882036b9fb03859edf7ce4a1d942 issue-297.patch -7e95d7c8c6bba3a6775473e34df2a2c9 fix-makefile.patch +2f282cb6ba4f1a135f924a387d25e4ec fix-makefile.patch 9ebd96155288809fe0a657cf491e433f default-font.patch b4054a311d76aef91aa10bacd68bc9c4 omxplayer.initd 80e37e7ac04402808015084e26e6072d omxplayer.confd" sha256sums="1edd3c4b02b69b59435d5c19ab82b90d0da73f8336d9eaba8012d1e9f3b54253 omxplayer-0.20160803.tar.gz 5eb797de354c63a23847a574b103a28d451a4329320f3335f82dc000adbc5c63 issue-260.patch 389c97df4919a3fe4d115f092cb256246e33374150102f0e2cb9ce11456cadb1 issue-297.patch -967533d6e13da74a2cf2f78822e55b3cbe7a7736eb8a9a0caed4653c5a98d197 fix-makefile.patch +77f453ef231cb64f4d6b237db5fda7c6d250bed4675ffcc73f8062c6f688ab1e fix-makefile.patch 2bab3d05b12d730737220b8c0052498a34bbebc12b7beb8afb3c054beb0fb3bb default-font.patch e2db0f7ffbe2488dd69ee0bfad006bd863f418554f078ca3432f643de7589d2f omxplayer.initd 530eb9aa50e72fb4828af410b965e0ec7653d1bed87aa86bf04fc340ff3232bd omxplayer.confd" sha512sums="24521bf5807b21e80698c0dabad8478bdaed31a6ebef9631914da7a6c725ffbf67c4be6c5b944c1933d90dfeed36d2592740a8b25f8bbf5fc172f4650696d440 omxplayer-0.20160803.tar.gz c349eea5f7c513a07d82a6cf6467c4d21bcb29c053bc5e39d8f675b1212db9beef0abf5248d50ac5a2f14fda73055786f94f421377ffcf5f6bcf8daa2f1b56e8 issue-260.patch 2a8a6def1e09f726cba58c0b9109fa6c4fbd4a3b4f1d27d200488f262a0e0978579d83db7fe24f1d3e03beef318c3674ed79cbd2f1994c4551a59c9fe0f63489 issue-297.patch -48fc451efb9b74da749fe414258b7c4f16e624a86d74a6044025e2134addd994940b7fdda5a4b15cef87a49ebf65dbd1e19d8b73d075a94b485980e4ebd0052a fix-makefile.patch +d51ab32ae8b8fea5e7f822bf5cf945ad1238cd273ab4afbaa67baf57cc8dcce2eae3c61ec2aa7c9d085ebb386c3d72e4d8006320c2aeaef1f9f97247999cb8a0 fix-makefile.patch 8aa58aaa07453186302dc68d92f28c1b50bf0f8fccd50359640a7fc8339b233b32a0c8c02284a9974599e56d69cc557acc25e76e6438c6d64d15afd9c1788a8e default-font.patch 3ddd32235d87a46478d0237ee9b253edeb75729e377b09a33069ecdca2ee230d2851f308897ee75ff69a9f3bdd2876f490bc1667a572dce1c186f80fddcf6df3 omxplayer.initd 4f906ada035869a0e515e7615056b18b0f6906ce4b3a2d34081c0efa79bb9455380f729e7c5270180f5ace89c53a7ac7c93f609e6761825f639f44aa22346bb2 omxplayer.confd" 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 |