diff options
| -rw-r--r-- | testing/omxplayer/APKBUILD | 23 | ||||
| -rw-r--r-- | testing/omxplayer/fix-makefile.patch (renamed from testing/omxplayer/use-system-libs.patch) | 16 |
2 files changed, 21 insertions, 18 deletions
diff --git a/testing/omxplayer/APKBUILD b/testing/omxplayer/APKBUILD index 3d650c0fe..1ec1427cd 100644 --- a/testing/omxplayer/APKBUILD +++ b/testing/omxplayer/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=omxplayer -pkgver=0.20131216 -_commitid=b34143cb3e678453ccae968d3a65c0cb5a34333e -pkgrel=1 +pkgver=0.20140220 +_commitid=7af21f596378e5efeceebedff9c4a298e2d06d98 +pkgrel=0 pkgdesc="Commandline OMX player for Raspberry Pi" url="https://github.com/popcornmix/omxplayer" arch="armhf" @@ -12,7 +12,7 @@ makedepends="raspberrypi-dev ffmpeg-dev pcre-dev boost-dev freetype-dev dbus-dev install="" subpackages="$pkgname-doc" source="omxplayer-$pkgver.tar.gz::https://github.com/popcornmix/omxplayer/archive/$_commitid.tar.gz - use-system-libs.patch + fix-makefile.patch " _srcdir="$srcdir"/$pkgname-$_commitid @@ -34,19 +34,20 @@ INCLUDES:=-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/ INCLUDES+=$(pkg-config --cflags freetype2 dbus-1) LDFLAGS:=-L/opt/vc/lib -Wl,-rpath,/opt/vc/lib LDFLAGS+=$(pkg-config --libs freetype2 dbus-1) +STRIP:=/usr/bin/strip EOF make } package() { cd "$_srcdir" - make dist DIST="$pkgdir" || return 1 + make install DIST="$pkgdir" || return 1 rm -rf "$pkgdir"/usr/lib/omxplayer } -md5sums="ae722a186555168545c61c5f1b10be53 omxplayer-0.20131216.tar.gz -f012acde48e989a13fbd9351cb8bcf11 use-system-libs.patch" -sha256sums="efac24685bfb142c2fae4ff5ebed824d6b6d03e01491044bbe558880b31ae1be omxplayer-0.20131216.tar.gz -242c0efdbea973c9623e0ff861d19a842a055aef17884fbbcb87388b31767ed5 use-system-libs.patch" -sha512sums="f61c9c4188c4001fa683ce574b5229c40d54bf0afed33d70ed7eae1ff1b8308880c208a67b65d071b419690b66601dcce6cab6799f7134994d43d27375df9f77 omxplayer-0.20131216.tar.gz -84d184d499f5bc8326aa41bec70eff99855afedd726aacfc962ac5b9b9afed92cfd61a9d9b2f21e2f2af887b1c38cd1fc025a0ec6fd73eafcaf3c7b9d90ef857 use-system-libs.patch" +md5sums="2e6617526222462a381ea2d2e51b71cb omxplayer-0.20140220.tar.gz +d2e426af74fc1ccad6f01159c29e46f4 fix-makefile.patch" +sha256sums="02c597538f9c0b7a2372e593e409684b50cceda72fa2f6cae93378acf28a6a78 omxplayer-0.20140220.tar.gz +f7b62b3ac32f0f37710d347ad2a73f3588161d5e2469487bee9fa3c88b444dd9 fix-makefile.patch" +sha512sums="3aae6a6184ce9418cfae82c831f9be8a2529b672ed8597fc12383cb84cffe68de4a5ec489bcc2321a2872e238e610d64a8321f69b795afb921e5dca711cc138e omxplayer-0.20140220.tar.gz +4efde13e52b129ca04833d50e1195ff9d2901a5de920ca7c2ebeb156db7383ea6fac66f49e450858528eedda63a853d5464fed055b57a3eea906cf6e7c840e55 fix-makefile.patch" diff --git a/testing/omxplayer/use-system-libs.patch b/testing/omxplayer/fix-makefile.patch index d51d0fdd7..1dd8f6dfb 100644 --- a/testing/omxplayer/use-system-libs.patch +++ b/testing/omxplayer/fix-makefile.patch @@ -1,6 +1,6 @@ ---- omxplayer-b34143cb3e678453ccae968d3a65c0cb5a34333e.orig/Makefile -+++ omxplayer-b34143cb3e678453ccae968d3a65c0cb5a34333e/Makefile -@@ -46,7 +46,7 @@ +--- omxplayer-7af21f596378e5efeceebedff9c4a298e2d06d98.orig/Makefile ++++ omxplayer-7af21f596378e5efeceebedff9c4a298e2d06d98/Makefile +@@ -46,7 +48,7 @@ $(CXX) $(CFLAGS) $(INCLUDES) -c $< -o $@ -Wno-deprecated-declarations version: @@ -8,16 +8,18 @@ + sh gen_version.sh > version.h omxplayer.bin: version $(OBJS) - $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre -@@ -65,11 +65,9 @@ + $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre +@@ -64,12 +66,9 @@ + make -f Makefile.ffmpeg make -f Makefile.ffmpeg install - dist: omxplayer.bin +-dist: omxplayer.bin - mkdir -p $(DIST)/usr/lib/omxplayer ++install: omxplayer.bin mkdir -p $(DIST)/usr/bin mkdir -p $(DIST)/usr/share/doc cp omxplayer omxplayer.bin $(DIST)/usr/bin cp COPYING $(DIST)/usr/share/doc/ cp README.md $(DIST)/usr/share/doc/README - cp -a ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/ - tar -czf omxplayer-dist.tar.gz $(DIST) +- cd $(DIST); tar -czf ../$(DIST).tgz * |