aboutsummaryrefslogtreecommitdiffstats
path: root/main/omxplayer
diff options
context:
space:
mode:
Diffstat (limited to 'main/omxplayer')
-rw-r--r--main/omxplayer/APKBUILD2
-rw-r--r--main/omxplayer/fix-makefile.patch17
2 files changed, 9 insertions, 10 deletions
diff --git a/main/omxplayer/APKBUILD b/main/omxplayer/APKBUILD
index 5f6dc986b3..ec9c2f8fbc 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
-74e3e74b6f78747797623a65018ddacdad565229e13ddd8fd627488905427f0869356d573c8629152184608ae77c6090af4b6400ae9f9d3bfba7afa576706e8d fix-makefile.patch
+d8cfaaaa3bc39b6e3e563b023a58499b2858d3f1eb8df0795def15255daf87ea0b72bafb86235117720c65cf2402375c4df49858a09764f8ad42631e147c8c2d 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 76f11870ce..3d4c79357f 100644
--- a/main/omxplayer/fix-makefile.patch
+++ b/main/omxplayer/fix-makefile.patch
@@ -1,6 +1,6 @@
---- omxplayer-2ee17b22a6149a043a2e402580504f282c615373.orig/Makefile
-+++ omxplayer-2ee17b22a6149a043a2e402580504f282c615373/Makefile
-@@ -3,9 +3,12 @@
+--- omxplayer-2ee17b22a6149a043a2e402580504f282c615373.orig/Makefile 2017-10-17 19:51:35.000000000 +0300
++++ omxplayer-2ee17b22a6149a043a2e402580504f282c615373/Makefile 2017-11-21 15:43:30.122410419 +0200
+@@ -3,8 +3,11 @@
LDFLAGS=-L$(SDKSTAGE)/opt/vc/lib/
LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
@@ -8,12 +8,11 @@
+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 $(shell pkg-config --cflags dbus-1 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
@@ -27,12 +26,12 @@
$(STRIP) omxplayer.bin
help.h: README.md Makefile
-@@ -81,17 +84,15 @@
+@@ -81,17 +84,14 @@
make -f Makefile.ffmpeg
make -f Makefile.ffmpeg install
-dist: omxplayer.bin omxplayer.1
-+install dist: omxplayer.bin omxplayer.1
++install dist: omxplayer.bin
mkdir -p $(DIST)/usr/lib/omxplayer
mkdir -p $(DIST)/usr/bin
mkdir -p $(DIST)/usr/share/doc/omxplayer
@@ -41,7 +40,7 @@
+ cp omxplayer.bin $(DIST)/usr/bin/omxplayer
cp COPYING $(DIST)/usr/share/doc/omxplayer
cp README.md $(DIST)/usr/share/doc/omxplayer/README
- cp omxplayer.1 $(DIST)/usr/share/man/man1
+- cp omxplayer.1 $(DIST)/usr/share/man/man1
- cp -P ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/
- cd $(DIST); tar -czf ../$(DIST).tgz *