From 45677455b143ad896f182d397fe88377b250e8c2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 10 Dec 2014 13:32:39 +0100 Subject: [PATCH] omxplayer: update to upstream git commit a4ee0743ecf4. --- srcpkgs/omxplayer/patches/ffmpeg-2.4.patch | 11 ----------- srcpkgs/omxplayer/template | 12 ++++++------ 2 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/omxplayer/patches/ffmpeg-2.4.patch diff --git a/srcpkgs/omxplayer/patches/ffmpeg-2.4.patch b/srcpkgs/omxplayer/patches/ffmpeg-2.4.patch deleted file mode 100644 index 5f554cea6d1..00000000000 --- a/srcpkgs/omxplayer/patches/ffmpeg-2.4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- DllAvFilter.h -+++ DllAvFilter.h -@@ -124,7 +124,7 @@ public: - } - virtual int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, AVFilterInOut **inputs, AVFilterInOut **outputs, void *log_ctx) - { -- return ::avfilter_graph_parse(graph, filters, inputs, outputs, log_ctx); -+ return ::avfilter_graph_parse(graph, filters, *inputs, *outputs, log_ctx); - } - virtual int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx) - { diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template index 57550ec2519..8392a077d7a 100644 --- a/srcpkgs/omxplayer/template +++ b/srcpkgs/omxplayer/template @@ -1,10 +1,11 @@ # Template file for 'omxplayer' -_githash=6ee9a0a548 +_githash=a4ee0743ecf49ffa1818510e8cc7872282ca66a8 +_gitshort="${_githash:0:7}" pkgname=omxplayer -version=20140929 +version=20141210 revision=1 -short_desc="Commandline OMX player for the Raspberry Pi (git ${_githash})" +short_desc="Commandline OMX player for the Raspberry Pi (git ${_gitshort})" maintainer="Juan RP " license="GPL-2" homepage="https://github.com/popcornmix/omxplayer" @@ -14,8 +15,8 @@ only_for_archs="armv6l" build_style=gnu-makefile make_build_args="XBPS_CROSS_BASE=$XBPS_CROSS_BASE" hostmakedepends="pkg-config git" -makedepends="rpi-firmware>=20130913 pcre-devel boost-devel freetype-devel ffmpeg-devel>=2.4 dbus-devel" -depends="rpi-firmware>=20130913 freefont-ttf" +makedepends="rpi-firmware pcre-devel boost-devel freetype-devel ffmpeg-devel>=2.4 dbus-devel" +depends="freefont-ttf" do_fetch() { local url="git://github.com/popcornmix/omxplayer.git" @@ -23,7 +24,6 @@ do_fetch() { cd ${pkgname}-${version} git checkout ${_githash} } - pre_build() { sed -e 's,/usr/share/fonts/truetype/freefont,/usr/share/fonts/TTF,g' -i omxplayer.cpp mkdir -p /opt/vc/lib