diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-11-21 13:30:08 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-11-21 13:30:55 +0000 |
| commit | d4fc3dd773fcd71d72fd8bc125f336ffc28bb766 (patch) | |
| tree | a65d9998e1d5cbdd857b6c6eb0a121aaa9551d0c /main | |
| parent | ae8891170c0dcb34ffe7830398173a04cfdc1203 (diff) | |
| download | aports-d4fc3dd773fcd71d72fd8bc125f336ffc28bb766.tar.bz2 aports-d4fc3dd773fcd71d72fd8bc125f336ffc28bb766.tar.xz | |
main/omxplayer: fix dbus include paths
Diffstat (limited to 'main')
| -rw-r--r-- | main/omxplayer/APKBUILD | 2 | ||||
| -rw-r--r-- | main/omxplayer/fix-makefile.patch | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/main/omxplayer/APKBUILD b/main/omxplayer/APKBUILD index 5d13ef8fe3..5f6dc986b3 100644 --- a/main/omxplayer/APKBUILD +++ b/main/omxplayer/APKBUILD @@ -50,7 +50,7 @@ package() { sha512sums="75a19d29e037d87b17edfe631590ba8e9035dc3ee8114e0398531f7f5fbfbc2947044ec56290dbeff90bba3e8231590b70270e39fcb2e1a91ca698c69e9aa02c omxplayer-0.20161017.tar.gz c349eea5f7c513a07d82a6cf6467c4d21bcb29c053bc5e39d8f675b1212db9beef0abf5248d50ac5a2f14fda73055786f94f421377ffcf5f6bcf8daa2f1b56e8 issue-260.patch 2a8a6def1e09f726cba58c0b9109fa6c4fbd4a3b4f1d27d200488f262a0e0978579d83db7fe24f1d3e03beef318c3674ed79cbd2f1994c4551a59c9fe0f63489 issue-297.patch -a34ab9ac2c17e99c67bb8c04bf0f73617263846c33f94203e5a13d059ee022357d2f407898127b4c50be25308d3b202acde7589a42a8637607ebd177e779403f fix-makefile.patch +74e3e74b6f78747797623a65018ddacdad565229e13ddd8fd627488905427f0869356d573c8629152184608ae77c6090af4b6400ae9f9d3bfba7afa576706e8d 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 23a206d71f..76f11870ce 100644 --- a/main/omxplayer/fix-makefile.patch +++ b/main/omxplayer/fix-makefile.patch @@ -1,16 +1,19 @@ --- omxplayer-2ee17b22a6149a043a2e402580504f282c615373.orig/Makefile +++ omxplayer-2ee17b22a6149a043a2e402580504f282c615373/Makefile -@@ -3,7 +3,10 @@ +@@ -3,9 +3,12 @@ LDFLAGS=-L$(SDKSTAGE)/opt/vc/lib/ LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -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 -I/usr/include/freetype2 -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads +-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 ++INCLUDES+=-I./ -Ilinux $(shell pkg-config --cflags dbus-1 freetype2) -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads ++ DIST ?= omxplayer-dist + STRIP ?= strip + @@ -50,10 +53,10 @@ omxplayer.o: help.h keys.h |