diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/omxplayer/APKBUILD | 24 | ||||
| -rw-r--r-- | main/omxplayer/fix-makefile.patch | 24 |
2 files changed, 18 insertions, 30 deletions
diff --git a/main/omxplayer/APKBUILD b/main/omxplayer/APKBUILD index 0443c80163..5d13ef8fe3 100644 --- a/main/omxplayer/APKBUILD +++ b/main/omxplayer/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=omxplayer -pkgver=0.20161004 -_commitid=12b472eaa75bce25dc63ec61d9233aadb996f3a4 -pkgrel=1 +pkgver=0.20161017 +_commitid=2ee17b22a6149a043a2e402580504f282c615373 +pkgrel=0 pkgdesc="Commandline OMX player for Raspberry Pi" url="https://github.com/popcornmix/omxplayer" arch="armhf" @@ -47,24 +47,10 @@ package() { "$pkgdir"/etc/conf.d/$pkgname || return 1 } -md5sums="2df39113f9d3108632b467d2030dd2d8 omxplayer-0.20161004.tar.gz -a900cdded87b7df503c6599ac43bd8de issue-260.patch -c858882036b9fb03859edf7ce4a1d942 issue-297.patch -2f282cb6ba4f1a135f924a387d25e4ec fix-makefile.patch -9ebd96155288809fe0a657cf491e433f default-font.patch -b4054a311d76aef91aa10bacd68bc9c4 omxplayer.initd -80e37e7ac04402808015084e26e6072d omxplayer.confd" -sha256sums="e0d5676b815e42ff2e91b7a0e92374753e134403c21c6998b31b6a3e7cdcace3 omxplayer-0.20161004.tar.gz -5eb797de354c63a23847a574b103a28d451a4329320f3335f82dc000adbc5c63 issue-260.patch -389c97df4919a3fe4d115f092cb256246e33374150102f0e2cb9ce11456cadb1 issue-297.patch -77f453ef231cb64f4d6b237db5fda7c6d250bed4675ffcc73f8062c6f688ab1e fix-makefile.patch -2bab3d05b12d730737220b8c0052498a34bbebc12b7beb8afb3c054beb0fb3bb default-font.patch -e2db0f7ffbe2488dd69ee0bfad006bd863f418554f078ca3432f643de7589d2f omxplayer.initd -530eb9aa50e72fb4828af410b965e0ec7653d1bed87aa86bf04fc340ff3232bd omxplayer.confd" -sha512sums="c9e14c7ed83259e5e2ee23cdf7d11ba498851814e502fffd8e62676a91adaa5ec28a7f34d831a2c9feae46acea21520df79d308de8514198fbecab5eaa912a6f omxplayer-0.20161004.tar.gz +sha512sums="75a19d29e037d87b17edfe631590ba8e9035dc3ee8114e0398531f7f5fbfbc2947044ec56290dbeff90bba3e8231590b70270e39fcb2e1a91ca698c69e9aa02c omxplayer-0.20161017.tar.gz c349eea5f7c513a07d82a6cf6467c4d21bcb29c053bc5e39d8f675b1212db9beef0abf5248d50ac5a2f14fda73055786f94f421377ffcf5f6bcf8daa2f1b56e8 issue-260.patch 2a8a6def1e09f726cba58c0b9109fa6c4fbd4a3b4f1d27d200488f262a0e0978579d83db7fe24f1d3e03beef318c3674ed79cbd2f1994c4551a59c9fe0f63489 issue-297.patch -d51ab32ae8b8fea5e7f822bf5cf945ad1238cd273ab4afbaa67baf57cc8dcce2eae3c61ec2aa7c9d085ebb386c3d72e4d8006320c2aeaef1f9f97247999cb8a0 fix-makefile.patch +a34ab9ac2c17e99c67bb8c04bf0f73617263846c33f94203e5a13d059ee022357d2f407898127b4c50be25308d3b202acde7589a42a8637607ebd177e779403f 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 80aa0e6205..23a206d71f 100644 --- a/main/omxplayer/fix-makefile.patch +++ b/main/omxplayer/fix-makefile.patch @@ -1,18 +1,17 @@ -diff --git a/Makefile b/Makefile -index 2857e94..a889fca 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,7 +2,8 @@ include Makefile.include +--- omxplayer-2ee17b22a6149a043a2e402580504f282c615373.orig/Makefile ++++ omxplayer-2ee17b22a6149a043a2e402580504f282c615373/Makefile +@@ -3,7 +3,10 @@ - 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$(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 ++ + 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 -@@ -49,10 +50,10 @@ all: dist + DIST ?= omxplayer-dist +@@ -50,10 +53,10 @@ omxplayer.o: help.h keys.h version: @@ -25,7 +24,7 @@ index 2857e94..a889fca 100644 $(STRIP) omxplayer.bin help.h: README.md Makefile -@@ -80,14 +81,12 @@ ffmpeg: +@@ -81,17 +84,15 @@ make -f Makefile.ffmpeg make -f Makefile.ffmpeg install @@ -42,3 +41,6 @@ index 2857e94..a889fca 100644 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 * + + install: + cp -r $(DIST)/* / |