From f90bf0579eeaa6e7d27f6af9e11e5964ac426d81 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 23 Oct 2015 18:18:01 +0200 Subject: [PATCH] omxplayer: unbreak on musl and fix omxplayer-dbus. --- srcpkgs/omxplayer/patches/build.patch | 2 +- srcpkgs/omxplayer/template | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/omxplayer/patches/build.patch b/srcpkgs/omxplayer/patches/build.patch index f956a931cfa..2283b44cae9 100644 --- a/srcpkgs/omxplayer/patches/build.patch +++ b/srcpkgs/omxplayer/patches/build.patch @@ -101,5 +101,5 @@ -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 -mtune=arm1176jzf-s -+LDFLAGS += -L$(XBPS_CROSS_BASE)/opt/vc/lib/ ++LDFLAGS += -L$(XBPS_CROSS_BASE)/opt/vc/lib/ -Wl,-R/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 diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template index 62c3ded98bf..c9db9fffa78 100644 --- a/srcpkgs/omxplayer/template +++ b/srcpkgs/omxplayer/template @@ -1,7 +1,7 @@ # Template file for 'omxplayer' pkgname=omxplayer version=20150907 -revision=2 +revision=3 short_desc="Commandline OMX player for the Raspberry Pi" maintainer="Juan RP " license="GPL-2" @@ -24,3 +24,6 @@ do_build() { mkdir -p /opt/vc/lib make CC=$CC XBPS_CROSS_BASE=$XBPS_CROSS_BASE ${makejobs} } +post_install() { + sed -i 's,omxplayer.bin,omxplayer,g' ${DESTDIR}/usr/bin/omxplayer-dbus +}