* [gentoo-commits] repo/gentoo:master commit in: media-video/raspberrypi-omxplayer/, media-video/raspberrypi-omxplayer/files/
@ 2016-03-08 23:09 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2016-03-08 23:09 UTC (permalink / raw
To: gentoo-commits
commit: f3a640c0d1cfd203ab4f2dda8809325ee64cd45e
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 8 23:09:00 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Mar 8 23:09:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a640c0
media-video/raspberrypi-omxplayer: fixed after package rename
Package-Manager: portage-2.2.27
.../{omxplayer-9999-Makefile.patch => Makefile-0_p20160217.patch} | 0
.../raspberrypi-omxplayer-0_p20160217.ebuild | 8 ++++----
.../raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/media-video/raspberrypi-omxplayer/files/omxplayer-9999-Makefile.patch b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160217.patch
similarity index 100%
rename from media-video/raspberrypi-omxplayer/files/omxplayer-9999-Makefile.patch
rename to media-video/raspberrypi-omxplayer/files/Makefile-0_p20160217.patch
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217.ebuild
index 3f775d8..16273d4 100644
--- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217.ebuild
+++ b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217.ebuild
@@ -27,10 +27,10 @@ RDEPEND="dev-libs/libpcre
DEPEND="${RDEPEND}
virtual/pkgconfig"
-S="${WORKDIR}/popcornmix-${PN}-${GIT_COMMIT}"
+S="${WORKDIR}/popcornmix-omxplayer-${GIT_COMMIT}"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-9999-Makefile.patch \
+ epatch "${FILESDIR}"/Makefile-0_p20160217.patch \
"${FILESDIR}"/fonts-path.patch
cat > Makefile.include << EOF
@@ -41,10 +41,10 @@ EOF
}
src_compile() {
- emake ${PN}.bin
+ emake omxplayer.bin
}
src_install() {
- dobin ${PN} ${PN}.bin
+ dobin omxplayer omxplayer.bin
dodoc README.md
}
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild
index 88ac4d3..18fa556 100644
--- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild
+++ b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-9999-Makefile.patch \
+ epatch "${FILESDIR}"/Makefile-0_p20160217.patch \
"${FILESDIR}"/fonts-path.patch
cat > Makefile.include << EOF
@@ -38,10 +38,10 @@ EOF
}
src_compile() {
- emake ${PN}.bin
+ emake omxplayer.bin
}
src_install() {
- dobin ${PN} ${PN}.bin
+ dobin omxplayer omxplayer.bin
dodoc README.md
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/raspberrypi-omxplayer/, media-video/raspberrypi-omxplayer/files/
@ 2016-06-02 9:31 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2016-06-02 9:31 UTC (permalink / raw
To: gentoo-commits
commit: 53eace1f6281067889b6200682253e5c43941a79
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 2 09:30:17 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jun 2 09:31:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53eace1f
media-video/raspberrypi-omxplayer: applied makefile fix from Ahmet Inan <xdsopl <AT> googlemail.com> from bug #421683 comment #44 and #45
Package-Manager: portage-2.3.0_rc1
.../files/Makefile-0_p20160528.patch | 26 ++++++++++++++++++++++
media-video/raspberrypi-omxplayer/patch | 26 ----------------------
.../raspberrypi-omxplayer-0_p20160528.ebuild | 4 ++--
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch
new file mode 100644
index 0000000..eb65f5d
--- /dev/null
+++ b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch
@@ -0,0 +1,26 @@
+--- omxplayer-9999/Makefile
++++ omxplayer-9999/Makefile
+@@ -2,9 +2,11 @@
+
+ CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
+
+-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
++PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre
++
++LIBS+=-lrt -lpthread $(shell pkg-config --libs $(PKGS)) -L/opt/vc/lib
+
+-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
++INCLUDES+=$(shell pkg-config --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux
+
+ DIST ?= omxplayer-dist
+
+@@ -51,8 +47,7 @@
+ bash gen_version.sh > version.h
+
+ omxplayer.bin: version $(OBJS)
+- $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvchostif -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
+- $(STRIP) omxplayer.bin
++ $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) $(LIBS)
+
+ help.h: README.md Makefile
+ awk '/SYNOPSIS/{p=1;print;next} p&&/KEY BINDINGS/{p=0};p' $< \
diff --git a/media-video/raspberrypi-omxplayer/patch b/media-video/raspberrypi-omxplayer/patch
deleted file mode 100644
index d9b5b6b..0000000
--- a/media-video/raspberrypi-omxplayer/patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- raspberrypi-omxplayer-9999.ebuild 2016-03-09 00:09:34.000000000 +0100
-+++ raspberrypi-omxplayer-9999.ebuild 2016-05-31 10:01:58.335198495 +0200
-@@ -14,7 +14,7 @@
- LICENSE="GPL-2"
- SLOT="0"
- KEYWORDS="~arm"
--IUSE=""
-+IUSE="X"
-
- RDEPEND="dev-libs/libpcre
- media-fonts/freefont
-@@ -22,8 +22,12 @@
- sys-apps/dbus
- sys-apps/fbset
- virtual/ffmpeg
-- x11-apps/xrefresh
-- x11-apps/xset"
-+ dev-libs/boost
-+ media-libs/freetype:2
-+ X? (
-+ x11-apps/xrefresh
-+ x11-apps/xset
-+ )"
- DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild
index 4a29459..83e030a 100644
--- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild
+++ b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild
@@ -34,11 +34,11 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/popcornmix-omxplayer-${GIT_COMMIT}"
src_prepare() {
- epatch "${FILESDIR}"/Makefile-0_p20160217.patch \
+ epatch "${FILESDIR}"/Makefile-0_p20160528.patch \
"${FILESDIR}"/fonts-path.patch
cat > Makefile.include << EOF
-LIBS=-lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
+LIBS=-lvchostif -lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
EOF
tc-export CXX
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/raspberrypi-omxplayer/, media-video/raspberrypi-omxplayer/files/
@ 2016-09-08 9:04 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2016-09-08 9:04 UTC (permalink / raw
To: gentoo-commits
commit: 2b82508e7082a8ba0117a9ebe71903006b140ca8
Author: Gerhard Bräunlich <wippbox <AT> gmx <DOT> net>
AuthorDate: Sun Sep 4 10:15:42 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Sep 8 09:04:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b82508e
media-video/raspberrypi-omxplayer: improvements.
* Add cross-compilation support.
* EAPI 6 bump.
Gentoo-Bug: https://bugs.gentoo.org/590744
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2217
Acked-By: Miroslav Šulc <fordfrog <AT> gentoo.org>
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
.../files/cross-0_p20160528.patch | 15 ++++++
.../raspberrypi-omxplayer-0_p20160528-r1.ebuild | 60 ++++++++++++++++++++++
2 files changed, 75 insertions(+)
diff --git a/media-video/raspberrypi-omxplayer/files/cross-0_p20160528.patch b/media-video/raspberrypi-omxplayer/files/cross-0_p20160528.patch
new file mode 100644
index 00000000..bd35d62
--- /dev/null
+++ b/media-video/raspberrypi-omxplayer/files/cross-0_p20160528.patch
@@ -0,0 +1,15 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,9 +4,11 @@
+
+ PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre
+
+-LIBS+=-lrt -lpthread $(shell pkg-config --libs $(PKGS)) -L/opt/vc/lib
++PKG_CONFIG ?= pkg-config
+
+-INCLUDES+=$(shell pkg-config --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux
++LIBS+=-lrt -lpthread $(shell $(PKG_CONFIG) --libs $(PKGS)) -L${SYSROOT}/opt/vc/lib
++
++INCLUDES+=$(shell $(PKG_CONFIG) --cflags $(PKGS)) -I${SYSROOT}/opt/vc/include -I. -Ilinux
+
+ DIST ?= omxplayer-dist
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r1.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r1.ebuild
new file mode 100644
index 00000000..acd6329
--- /dev/null
+++ b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+GIT_COMMIT="791d7df"
+DESCRIPTION="Command line media player for the Raspberry Pi"
+HOMEPAGE="https://github.com/popcornmix/omxplayer"
+SRC_URI="https://github.com/popcornmix/omxplayer/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE="X"
+
+RDEPEND="dev-libs/libpcre
+ media-fonts/freefont
+ || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
+ sys-apps/dbus
+ sys-apps/fbset
+ virtual/ffmpeg
+ dev-libs/boost
+ media-libs/freetype:2
+ X? (
+ x11-apps/xrefresh
+ x11-apps/xset
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/Makefile-0_p20160528.patch
+ "${FILESDIR}"/fonts-path.patch
+ "${FILESDIR}"/cross-0_p20160528.patch
+)
+
+DOCS=( README.md )
+
+S="${WORKDIR}/popcornmix-omxplayer-${GIT_COMMIT}"
+
+src_prepare() {
+ default
+ cat > Makefile.include << EOF
+LIBS=-lvchostif -lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
+EOF
+
+ tc-export CXX PKG_CONFIG
+}
+
+src_compile() {
+ emake omxplayer.bin
+}
+
+src_install() {
+ dobin omxplayer omxplayer.bin
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-08 9:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-08 23:09 [gentoo-commits] repo/gentoo:master commit in: media-video/raspberrypi-omxplayer/, media-video/raspberrypi-omxplayer/files/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2016-06-02 9:31 Miroslav Šulc
2016-09-08 9:04 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox