commit: fec8a7b5e1adf9746ba2d3358966dfee2dd3a040
Author: Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Sun Apr 26 19:00:31 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 19:00:31 2015 +0000
URL: https://gitweb.gentoo.org/dev/xmw.git/commit/?id=fec8a7b5
Update for userland at /usr and provide pined version
Package-Manager: portage-2.2.18
Manifest-Sign-Key: 62EEF090
media-video/omxplayer/ChangeLog | 4 ++
media-video/omxplayer/omxplayer-0_p20150421.ebuild | 5 +--
media-video/omxplayer/omxplayer-9999-r1.ebuild | 44 ----------------------
media-video/omxplayer/omxplayer-9999.ebuild | 35 ++++++++++-------
4 files changed, 28 insertions(+), 60 deletions(-)
diff --git a/media-video/omxplayer/ChangeLog b/media-video/omxplayer/ChangeLog
index 435d1fb..1741e7e 100644
--- a/media-video/omxplayer/ChangeLog
+++ b/media-video/omxplayer/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 26 Apr 2015; Michael Weber <x...@gentoo.org> -omxplayer-9999-r1.ebuild,
+ omxplayer-0_p20150421.ebuild, omxplayer-9999.ebuild:
+ Update for userland at /usr and provide pined version
+
24 Apr 2015; Michael Weber <x...@gentoo.org> omxplayer-0_p20150421.ebuild,
omxplayer-9999-r1.ebuild:
allow userland built from source
diff --git a/media-video/omxplayer/omxplayer-0_p20150421.ebuild
b/media-video/omxplayer/omxplayer-0_p20150421.ebuild
index 29dd366..d5137cb 100644
--- a/media-video/omxplayer/omxplayer-0_p20150421.ebuild
+++ b/media-video/omxplayer/omxplayer-0_p20150421.ebuild
@@ -24,11 +24,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
- epatch "${FILESDIR}"/${P}-Makefile.patch
+ epatch "${FILESDIR}"/${PN}-0_p20150421-Makefile.patch
cat > Makefile.include << EOF
-INCLUDES=-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
-I/opt/vc/include/interface/vmcs_host/linux
-LIBS=-L/opt/vc/lib -lvchiq_arm -lvcos -lbcm_host -lEGL -lopenmaxil -lrt
-lpthread
+LIBS=-lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
EOF
tc-export CXX
diff --git a/media-video/omxplayer/omxplayer-9999-r1.ebuild
b/media-video/omxplayer/omxplayer-9999-r1.ebuild
deleted file mode 100644
index 9421a62..0000000
--- a/media-video/omxplayer/omxplayer-9999-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils git-r3 toolchain-funcs
-
-DESCRIPTION="command line media player for the Raspberry Pi"
-HOMEPAGE="https://github.com/popcornmix/omxplayer";
-EGIT_REPO_URI="https://github.com/popcornmix/omxplayer.git";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="dev-libs/libpcre
- || ( media-libs/raspberrypi-userland
media-libs/raspberrypi-userland-bin )
- virtual/ffmpeg
- sys-apps/dbus
- sys-apps/fbset"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0_p20150421-Makefile.patch
-
- cat > Makefile.include << EOF
-INCLUDES=-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
-I/opt/vc/include/interface/vmcs_host/linux
-LIBS=-L/opt/vc/lib -lvchiq_arm -lvcos -lbcm_host -lEGL -lopenmaxil -lrt
-lpthread
-EOF
-
- tc-export CXX
-}
-
-src_compile() {
- emake ${PN}.bin
-}
-
-src_install() {
- dobin ${PN} ${PN}.bin
- dodoc README.md
-}
diff --git a/media-video/omxplayer/omxplayer-9999.ebuild
b/media-video/omxplayer/omxplayer-9999.ebuild
index dcd60df..4daa67f 100644
--- a/media-video/omxplayer/omxplayer-9999.ebuild
+++ b/media-video/omxplayer/omxplayer-9999.ebuild
@@ -1,34 +1,43 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=5
-inherit eutils flag-o-matic git-2 toolchain-funcs
+inherit eutils git-r3 toolchain-funcs
DESCRIPTION="command line media player for the Raspberry Pi"
-HOMEPAGE="https://github.com/huceke/omxplayer";
-EGIT_REPO_URI="https://github.com/huceke/omxplayer.git";
+HOMEPAGE="https://github.com/popcornmix/omxplayer";
+EGIT_REPO_URI="https://github.com/popcornmix/omxplayer.git";
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
IUSE=""
-DEPEND="dev-libs/libpcre
- media-libs/raspberrypi-userland-bin
- media-video/ffmpeg"
-RDEPEND="${RDEPEND}
+RDEPEND="dev-libs/libpcre
+ || ( media-libs/raspberrypi-userland
media-libs/raspberrypi-userland-bin )
+ virtual/ffmpeg
+ sys-apps/dbus
sys-apps/fbset"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
src_prepare() {
- epatch "${FILESDIR}"/${P}-Makefile.patch \
- "${FILESDIR}"/${P}-wrapper.patch
+ epatch "${FILESDIR}"/${PN}-0_p20150421-Makefile.patch
+
+ cat > Makefile.include << EOF
+LIBS=-lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
+EOF
+
tc-export CXX
- filter-ldflags -Wl,--as-needed
+}
+
+src_compile() {
+ emake ${PN}.bin
}
src_install() {
- dobin ${PN}{,.bin}
- dodoc README
+ dobin ${PN} ${PN}.bin
+ dodoc README.md
}
