omxplayer: update to a newer snapshot.

- Make omxplayer.bin the default binary
- Rename omxplayer (the script) to omxplayer-dbus

This way by default omxplayer does not need dbus, and somebody that need
it can still use it with the omxplayer-dbus script.
This commit is contained in:
Juan RP 2015-03-09 21:33:57 +01:00
parent 02dcb105a6
commit 5e57ac7b38
2 changed files with 6 additions and 11 deletions

View file

@ -53,8 +53,8 @@
+install:
+ install -d $(DESTDIR)/usr/bin
+ install -d $(DESTDIR)/usr/share/doc/omxplayer
+ install omxplayer $(DESTDIR)/usr/bin/
+ install omxplayer.bin $(DESTDIR)/usr/bin/
+ install omxplayer $(DESTDIR)/usr/bin/omxplayer-dbus
+ install omxplayer.bin $(DESTDIR)/usr/bin/omxplayer
+ install README.md $(DESTDIR)/usr/share/doc/omxplayer/
--- Makefile.include
+++ Makefile.include
@ -100,6 +100,6 @@
-#INCLUDES += -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2
-INCLUDES += -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include
+#STRIP := strip
+CFLAGS += -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog
+CFLAGS += -fomit-frame-pointer -mtune=arm1176jzf-s
+LDFLAGS += -L$(XBPS_CROSS_BASE)/opt/vc/lib/
+INCLUDES += -I$(XBPS_CROSS_BASE)/opt/vc/include -I$(XBPS_CROSS_BASE)/opt/vc/include/interface/vmcs_host/linux -I$(XBPS_CROSS_BASE)/opt/vc/include/interface/vcos/pthreads -I$(XBPS_CROSS_BASE)/usr/include/freetype2 -I$(XBPS_CROSS_BASE)/usr/include/dbus-1.0 -I$(XBPS_CROSS_BASE)/usr/lib/dbus-1.0/include

View file

@ -1,9 +1,6 @@
# Template file for 'omxplayer'
_githash=ced2387c5c0a435fd52229133c644632375b1d71
_gitshort="${_githash:0:7}"
pkgname=omxplayer
version=20150207
version=20150209
revision=1
short_desc="Commandline OMX player for the Raspberry Pi (git ${_gitshort})"
maintainer="Juan RP <xtraeme@gmail.com>"
@ -15,14 +12,12 @@ only_for_archs="armv6l armv7l"
build_style=gnu-makefile
make_build_args="XBPS_CROSS_BASE=$XBPS_CROSS_BASE"
hostmakedepends="pkg-config git"
makedepends="rpi-firmware pcre-devel boost-devel freetype-devel ffmpeg-devel>=2.4 dbus-devel"
makedepends="rpi-firmware pcre-devel boost-devel freetype-devel ffmpeg-devel dbus-devel"
depends="freefont-ttf"
do_fetch() {
local url="git://github.com/popcornmix/omxplayer.git"
git clone $url ${pkgname}-${version}
cd ${pkgname}-${version}
git checkout ${_githash}
git clone $url ${wrksrc}
}
pre_build() {
sed -e 's,/usr/share/fonts/truetype/freefont,/usr/share/fonts/TTF,g' -i omxplayer.cpp