[gentoo-commits] dev/xmw:master commit in: media-video/omxplayer/files/, media-video/omxplayer/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] dev/xmw:master commit in: media-video/omxplayer/files/, media-video/omxplayer/
@ 2012-06-18  2:54 Michael Weber
  0 siblings, 0 replies; 3+ messages in thread
From: Michael Weber @ 2012-06-18  2:54 UTC (permalink / raw
  To: gentoo-commits

commit:     f5e6ef61651d9358988b8857fd348e9a8dec9b23
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 18 02:53:37 2012 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Jun 18 02:53:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=f5e6ef61

media-video/omxplayer: Initial import

(Portage version: 2.1.10.65/git/Linux x86_64, unsigned Manifest commit)

---
 media-video/omxplayer/ChangeLog                    |   11 +++++
 .../omxplayer/files/omxplayer-9999-Makefile.patch  |   24 +++++++++++
 .../omxplayer/files/omxplayer-9999-wrapper.patch   |   43 ++++++++++++++++++++
 media-video/omxplayer/metadata.xml                 |    9 ++++
 media-video/omxplayer/omxplayer-9999.ebuild        |   34 +++++++++++++++
 5 files changed, 121 insertions(+), 0 deletions(-)

diff --git a/media-video/omxplayer/ChangeLog b/media-video/omxplayer/ChangeLog
new file mode 100644
index 0000000..2f19265
--- /dev/null
+++ b/media-video/omxplayer/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for media-video/omxplayer
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*omxplayer-9999 (18 Jun 2012)
+
+  18 Jun 2012; Michael Weber <xmw@gentoo.org> +omxplayer-9999.ebuild,
+  +files/omxplayer-9999-Makefile.patch, +files/omxplayer-9999-wrapper.patch,
+  +metadata.xml:
+  Initial import
+

diff --git a/media-video/omxplayer/files/omxplayer-9999-Makefile.patch b/media-video/omxplayer/files/omxplayer-9999-Makefile.patch
new file mode 100644
index 0000000..eb03e0e
--- /dev/null
+++ b/media-video/omxplayer/files/omxplayer-9999-Makefile.patch
@@ -0,0 +1,24 @@
+--- omxplayer-9999/Makefile
++++ omxplayer-9999/Makefile
+@@ -1,9 +1,7 @@
+-include Makefile.include
++CFLAGS+=-DSTANDALONE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_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 -DOMX -DOMX_SKIP64BIT -ftree-vectorize -pipe -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST -Wno-psabi
+ 
+-CFLAGS+=-DSTANDALONE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_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 -DOMX -DOMX_SKIP64BIT -ftree-vectorize -pipe -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST -Wno-psabi -I$(SDKSTAGE)/opt/vc/include/ 
+-
+-LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -Lffmpeg_compiled/usr/local/lib/
+-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/
++INCLUDES=-I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include -Ilinux -I.
++LIBS=-L/opt/vc/lib -lrt -lbcm_host -lopenmaxil -lvcos -lvchiq_arm -lGLESv2 -lkhrn_static $(shell pkg-config --libs libavcodec libavfilter libavformat libpcre)
+ 
+ SRC=linux/XMemUtils.cpp \
+ 		utils/log.cpp \
+@@ -39,7 +37,7 @@
+ 	$(CXX) -O3 -o list_test list_test.cpp
+ 
+ omxplayer.bin: $(OBJS)
+-	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lpcre
++	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) $(LIBS)
+ 	#arm-unknown-linux-gnueabi-strip omxplayer.bin
+ 
+ clean:

diff --git a/media-video/omxplayer/files/omxplayer-9999-wrapper.patch b/media-video/omxplayer/files/omxplayer-9999-wrapper.patch
new file mode 100644
index 0000000..a1f01eb
--- /dev/null
+++ b/media-video/omxplayer/files/omxplayer-9999-wrapper.patch
@@ -0,0 +1,43 @@
+--- omxplayer-9999/omxplayer
++++ omxplayer-9999/omxplayer
+@@ -1,32 +1,22 @@
+ #!/bin/sh
+ 
+-#mount -t nfs -o rsize=32768,wsize=32768,intr 192.168.10.1:/data/video /media
+-
+-OMXPLAYER="./omxplayer.bin"
+-FBSET="/usr/sbin/fbset"
+-
+-if [ -e /usr/bin/omxplayer.bin ]; then
+-  OMXPLAYER="/usr/bin/omxplayer.bin"
+-fi
+-
+-if [ -e /usr/lib/omxplayer ]; then
+-  export LD_LIBRARY_PATH=/opt/vc/lib:/usr/lib/omxplayer:$LD_LIBRARY_PATH 
+-else
+-  export LD_LIBRARY_PATH=$PWD/ffmpeg_compiled/usr/local/lib:/opt/vc/lib:$LD_LIBRARY_PATH
+-fi
++OMXPLAYER="/usr/bin/omxplayer.bin"
++FBSET="/usr/bin/fbset"
+ 
+ XRES=1920
+ YRES=1080
+ 
+-XRES=1600
+-YRES=900
++if [ ! -e $OMXPLAYER ] ; then
++  echo "$OMXPLAYER does not exists, exiting"
++  exit 1
++fi
+ 
+ if [ -e $FBSET ]; then
+   echo 0 >  /sys/class/vtconsole/vtcon1/bind
+-  fbset -xres 1 -yres 1
++  $FBSET -xres 1 -yres 1
+ fi
+ 
+-./omxplayer.bin "$@"
++$OMXPLAYER "$@"
+ 
+ if [ -e $FBSET ]; then
+   fbset -xres ${XRES} -yres ${YRES}

diff --git a/media-video/omxplayer/metadata.xml b/media-video/omxplayer/metadata.xml
new file mode 100644
index 0000000..59acc2c
--- /dev/null
+++ b/media-video/omxplayer/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+

diff --git a/media-video/omxplayer/omxplayer-9999.ebuild b/media-video/omxplayer/omxplayer-9999.ebuild
new file mode 100644
index 0000000..363c3e5
--- /dev/null
+++ b/media-video/omxplayer/omxplayer-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils flag-o-matic git-2 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="dev-libs/libpcre
+	media-libs/rbpi-videocore-bin
+	media-video/ffmpeg"
+RDEPEND="${RDEPEND}
+	sys-apps/fbset"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-wrapper.patch
+	tc-export CXX
+	filter-ldflags -Wl,--as-needed
+}
+
+src_install() {
+	dobin ${PN}{,.bin}
+	dodoc README
+}



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] dev/xmw:master commit in: media-video/omxplayer/files/, media-video/omxplayer/
@ 2013-07-22 21:33 Michael Weber
  0 siblings, 0 replies; 3+ messages in thread
From: Michael Weber @ 2013-07-22 21:33 UTC (permalink / raw
  To: gentoo-commits

commit:     a3c91fd7c9097fabe14cbf6d2e5b63651e0b0699
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 21:32:34 2013 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 21:32:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=a3c91fd7

updates by Tina, bug 421683.

Package-Manager: portage-2.2.0_alpha188
Manifest-Sign-Key: 62EEF090

---
 media-video/omxplayer/ChangeLog                    |  7 ++++-
 .../omxplayer/files/omxplayer-9999-Makefile.patch  | 25 ++++++++--------
 .../omxplayer/files/omxplayer-9999-wrapper.patch   | 34 +++++++++++++++-------
 media-video/omxplayer/omxplayer-9999.ebuild        | 10 +++----
 4 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/media-video/omxplayer/ChangeLog b/media-video/omxplayer/ChangeLog
index 559d9d5..2a18615 100644
--- a/media-video/omxplayer/ChangeLog
+++ b/media-video/omxplayer/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for media-video/omxplayer
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Jul 2013; Michael Weber <xmw@gentoo.org>
+  files/omxplayer-9999-Makefile.patch, files/omxplayer-9999-wrapper.patch,
+  omxplayer-9999.ebuild:
+  updates by Tina, bug 421683.
+
   23 Jul 2012; Michael Weber <xmw@gentoo.org> omxplayer-9999.ebuild:
   rbpi -> raspberrypi
 

diff --git a/media-video/omxplayer/files/omxplayer-9999-Makefile.patch b/media-video/omxplayer/files/omxplayer-9999-Makefile.patch
index eb03e0e..c4d76d8 100644
--- a/media-video/omxplayer/files/omxplayer-9999-Makefile.patch
+++ b/media-video/omxplayer/files/omxplayer-9999-Makefile.patch
@@ -1,23 +1,24 @@
---- omxplayer-9999/Makefile
-+++ omxplayer-9999/Makefile
-@@ -1,9 +1,7 @@
+https://bugs.gentoo.org/show_bug.cgi?id=421683#c29
+--- Makefile
++++ Makefile
+@@ -1,9 +1,8 @@
 -include Makefile.include
-+CFLAGS+=-DSTANDALONE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_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 -DOMX -DOMX_SKIP64BIT -ftree-vectorize -pipe -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST -Wno-psabi
- 
--CFLAGS+=-DSTANDALONE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_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 -DOMX -DOMX_SKIP64BIT -ftree-vectorize -pipe -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST -Wno-psabi -I$(SDKSTAGE)/opt/vc/include/ 
 -
--LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -Lffmpeg_compiled/usr/local/lib/
+-CFLAGS+=-std=c++0x -DSTANDALONE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_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
+ 
++CFLAGS+=-std=c++0x -DSTANDALONE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_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 -DOMX -DOMX_SKIP64BIT -ftree-vectorize -pipe -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST -Wno-psabi
+ LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -Lffmpeg_compiled/usr/local/lib/
 -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/
-+INCLUDES=-I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include -Ilinux -I.
++INCLUDES=-I/usr/include/freetype2 -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include -Ilinux -I/usr/include/libavcodec -I/usr/include/libavfilter -I/usr/include/libavformat -I/usr/include/libavutil -I/usr/include/libswscale -I/usr/include/libswresample -I.
 +LIBS=-L/opt/vc/lib -lrt -lbcm_host -lopenmaxil -lvcos -lvchiq_arm -lGLESv2 -lkhrn_static $(shell pkg-config --libs libavcodec libavfilter libavformat libpcre)
  
- SRC=linux/XMemUtils.cpp \
- 		utils/log.cpp \
-@@ -39,7 +37,7 @@
+ DIST ?= omxplayer-dist
+ 
+@@ -45,7 +44,7 @@
  	$(CXX) -O3 -o list_test list_test.cpp
  
  omxplayer.bin: $(OBJS)
--	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lpcre
+-	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
 +	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) $(LIBS)
  	#arm-unknown-linux-gnueabi-strip omxplayer.bin
  

diff --git a/media-video/omxplayer/files/omxplayer-9999-wrapper.patch b/media-video/omxplayer/files/omxplayer-9999-wrapper.patch
index a1f01eb..44f3501 100644
--- a/media-video/omxplayer/files/omxplayer-9999-wrapper.patch
+++ b/media-video/omxplayer/files/omxplayer-9999-wrapper.patch
@@ -1,25 +1,34 @@
---- omxplayer-9999/omxplayer
-+++ omxplayer-9999/omxplayer
-@@ -1,32 +1,22 @@
+https://bugs.gentoo.org/show_bug.cgi?id=421683#c30
+--- omxplayer
++++ omxplayer
+@@ -1,43 +1,25 @@
  #!/bin/sh
  
 -#mount -t nfs -o rsize=32768,wsize=32768,intr 192.168.10.1:/data/video /media
 -
 -OMXPLAYER="./omxplayer.bin"
--FBSET="/usr/sbin/fbset"
++OMXPLAYER="/usr/omxplayer.bin"
+ FBSET="/usr/sbin/fbset"
+ FONT="fonts/FreeSans.ttf"
+ 
+-if [ -e /usr/share/fonts/truetype/freefont/FreeSans.ttf ]; then
+-  FONT="/usr/share/fonts/truetype/freefont/FreeSans.ttf"
+-else
+-  FONT="fonts/FreeSans.ttf"
+-fi
 -
 -if [ -e /usr/bin/omxplayer.bin ]; then
 -  OMXPLAYER="/usr/bin/omxplayer.bin"
+-else
+-  OMXPLAYER="./omxplayer.bin"
 -fi
 -
 -if [ -e /usr/lib/omxplayer ]; then
--  export LD_LIBRARY_PATH=/opt/vc/lib:/usr/lib/omxplayer:$LD_LIBRARY_PATH 
+-  export LD_LIBRARY_PATH=/opt/vc/lib:/usr/lib/omxplayer:$LD_LIBRARY_PATH
 -else
 -  export LD_LIBRARY_PATH=$PWD/ffmpeg_compiled/usr/local/lib:/opt/vc/lib:$LD_LIBRARY_PATH
 -fi
-+OMXPLAYER="/usr/bin/omxplayer.bin"
-+FBSET="/usr/bin/fbset"
- 
+-
  XRES=1920
  YRES=1080
  
@@ -31,13 +40,16 @@
 +fi
  
  if [ -e $FBSET ]; then
-   echo 0 >  /sys/class/vtconsole/vtcon1/bind
+   echo 0 > /sys/class/vtconsole/vtcon1/bind
 -  fbset -xres 1 -yres 1
 +  $FBSET -xres 1 -yres 1
  fi
  
--./omxplayer.bin "$@"
+-$OMXPLAYER --font $FONT "$@"
 +$OMXPLAYER "$@"
  
  if [ -e $FBSET ]; then
-   fbset -xres ${XRES} -yres ${YRES}
+-  fbset -xres ${XRES} -yres ${YRES}
++   $FBSET -xres ${XRES} -yres ${YRES}
+   echo 1 > /sys/class/vtconsole/vtcon1/bind
+ fi

diff --git a/media-video/omxplayer/omxplayer-9999.ebuild b/media-video/omxplayer/omxplayer-9999.ebuild
index 18080ac..dcd60df 100644
--- a/media-video/omxplayer/omxplayer-9999.ebuild
+++ b/media-video/omxplayer/omxplayer-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit eutils flag-o-matic git-2 toolchain-funcs
 
@@ -16,14 +16,14 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="dev-libs/libpcre
-	media-libs/raspberrypi-videocore-bin
+	media-libs/raspberrypi-userland-bin
 	media-video/ffmpeg"
 RDEPEND="${RDEPEND}
 	sys-apps/fbset"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	epatch "${FILESDIR}"/${P}-wrapper.patch
+	epatch "${FILESDIR}"/${P}-Makefile.patch \
+		"${FILESDIR}"/${P}-wrapper.patch
 	tc-export CXX
 	filter-ldflags -Wl,--as-needed
 }


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] dev/xmw:master commit in: media-video/omxplayer/files/, media-video/omxplayer/
@ 2015-04-24  0:54 Michael Weber
  0 siblings, 0 replies; 3+ messages in thread
From: Michael Weber @ 2015-04-24  0:54 UTC (permalink / raw
  To: gentoo-commits

commit:     e17dcf7bc563e742322e3fbb572306fdb07591be
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Fri Apr 24 00:54:42 2015 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 00:54:42 2015 +0000
URL:        https://gitweb.gentoo.org/dev/xmw.git/commit/?id=e17dcf7b

Use new upstream Popcornmix.

Package-Manager: portage-2.2.18
Manifest-Sign-Key: 62EEF090

 media-video/omxplayer/Manifest                     | 11 ++++++
 .../files/omxplayer-0_p20150421-Makefile.patch     | 26 +++++++++++++
 media-video/omxplayer/omxplayer-0_p20150421.ebuild | 44 ++++++++++++++++++++++
 media-video/omxplayer/omxplayer-9999-r1.ebuild     | 44 ++++++++++++++++++++++
 4 files changed, 125 insertions(+)

diff --git a/media-video/omxplayer/Manifest b/media-video/omxplayer/Manifest
new file mode 100644
index 0000000..6f14175
--- /dev/null
+++ b/media-video/omxplayer/Manifest
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST omxplayer-0_p20150421.tar.gz 1202582 SHA256 5534f7f74fc5a0cc18ec26c8befd50b7c973e03e0639fd83a3d48e318c013a0c SHA512 a74eee5419c6df62318f63c97af361ac4bada93f3b1ac37036f62df28d5bf206e45e6ca713c03c04d9fc95684cd76d29f8a69fb5f2c2289c3f97ace9de07c953 WHIRLPOOL a2ac02ea550b662adf90a5d3f46576462ef5ca213dd00d589f7d176062b741e75f9239c09da323b98589743ce1e44d0f47712075c35e108d4d0630a6f3575155
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlU5lFAACgkQknrdDGLu8JCzGAD/d5QIZV9SJiVZVc3hc4x6RUbF
+KNIBW5+7HPyclwrZLzIA/i7smENc8X0KrprzoSdx/8ixRJ+IyuUA4kq9WSsvnvov
+=fR3K
+-----END PGP SIGNATURE-----

diff --git a/media-video/omxplayer/files/omxplayer-0_p20150421-Makefile.patch b/media-video/omxplayer/files/omxplayer-0_p20150421-Makefile.patch
new file mode 100644
index 0000000..c8aac90
--- /dev/null
+++ b/media-video/omxplayer/files/omxplayer-0_p20150421-Makefile.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))
+ 
+-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. -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 -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/omxplayer/omxplayer-0_p20150421.ebuild b/media-video/omxplayer/omxplayer-0_p20150421.ebuild
new file mode 100644
index 0000000..64c6b6c
--- /dev/null
+++ b/media-video/omxplayer/omxplayer-0_p20150421.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils toolchain-funcs vcs-snapshot
+
+DESCRIPTION="command line media player for the Raspberry Pi"
+HOMEPAGE="https://github.com/popcornmix/omxplayer"
+SRC_URI="https://github.com/popcornmix/omxplayer/tarball/b1ad23ec68 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE=""
+
+RDEPEND="dev-libs/libpcre
+	media-libs/raspberrypi-userland-bin
+	virtual/ffmpeg
+	sys-apps/dbus
+	sys-apps/fbset"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-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-r1.ebuild b/media-video/omxplayer/omxplayer-9999-r1.ebuild
new file mode 100644
index 0000000..c3cecb0
--- /dev/null
+++ b/media-video/omxplayer/omxplayer-9999-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 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-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
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-04-24  0:54 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-18  2:54 [gentoo-commits] dev/xmw:master commit in: media-video/omxplayer/files/, media-video/omxplayer/ Michael Weber
  -- strict thread matches above, loose matches on Subject: below --
2013-07-22 21:33 Michael Weber
2015-04-24  0:54 Michael Weber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox