diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-03-06 01:04:33 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-03-06 01:05:20 -0600 |
| commit | 35703dcdf385f4c3545a143260ca4be50d17b0e1 (patch) | |
| tree | 1927c8fa55658acae965593cb0fdb0d03bde479b /package/omxplayer | |
| parent | 7254e6b8c61383d9fd523c01e7136091159cd136 (diff) | |
sync with upstream firmwarei, omxplayer and userland
Rename packages, as bcm2836 is also supported now.
Diffstat (limited to 'package/omxplayer')
| -rw-r--r-- | package/omxplayer/Makefile | 12 | ||||
| -rw-r--r-- | package/omxplayer/patches/patch-Makefile | 22 |
2 files changed, 24 insertions, 10 deletions
diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile index b04524ee7..fe47f3970 100644 --- a/package/omxplayer/Makefile +++ b/package/omxplayer/Makefile @@ -4,20 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= omxplayer -# actually git from 25.09.2014 -PKG_VERSION:= 0.6 +PKG_VERSION:= c5ab80828159c64a283ff69d40748923648f8a0a PKG_RELEASE:= 1 -PKG_HASH:= 6b22523bbb949ef6b7905f9fe12da7757cdcae0d4970ff752a3cdb3d7340e66d PKG_DESCR:= video player for raspberry pi PKG_SECTION:= mm/video -PKG_DEPENDS:= libffmpeg boost bcm2835-vc libfreetype libpcre +PKG_DEPENDS:= libffmpeg bcm28xx-vc-libs bcm28xx-vc-gl-libs PKG_DEPENDS+= librt zlib libpthread libstdcxx libdbus -PKG_BUILDDEP:= ffmpeg boost bcm2835-vc freetype pcre dbus +PKG_DEPENDS+= boost libfreetype libpcre +PKG_BUILDDEP:= ffmpeg boost bcm28xx-vc freetype pcre dbus PKG_URL:= https://github.com/popcornmix/omxplayer -PKG_SITES:= http://openadk.org/distfiles/ +PKG_SITES:= https://github.com/popcornmix/omxplayer.git PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 -PKG_LIBC_DEPENDS:= glibc musl include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/omxplayer/patches/patch-Makefile b/package/omxplayer/patches/patch-Makefile index d321eff17..5f6fa2e24 100644 --- a/package/omxplayer/patches/patch-Makefile +++ b/package/omxplayer/patches/patch-Makefile @@ -1,14 +1,30 @@ ---- omxplayer-0.6.orig/Makefile 2014-08-27 21:32:21.000000000 +0200 -+++ omxplayer-0.6/Makefile 2014-09-25 12:37:02.000000000 +0200 +--- omxplayer-c5ab80828159c64a283ff69d40748923648f8a0a.orig/Makefile 2015-03-06 00:24:01.000000000 -0600 ++++ omxplayer-c5ab80828159c64a283ff69d40748923648f8a0a/Makefile 2015-03-06 00:52:15.283681501 -0600 @@ -2,9 +2,9 @@ include Makefile.include 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 -+LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz ++LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lkhrn_static -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+=-I./ -Ilinux DIST ?= omxplayer-dist +@@ -79,14 +79,8 @@ ffmpeg: + make -f Makefile.ffmpeg + make -f Makefile.ffmpeg install + +-dist: omxplayer.bin omxplayer.1 ++dist: omxplayer.bin + mkdir -p $(DIST)/usr/lib/omxplayer + mkdir -p $(DIST)/usr/bin +- mkdir -p $(DIST)/usr/share/doc/omxplayer +- mkdir -p $(DIST)/usr/share/man/man1 + cp omxplayer omxplayer.bin $(DIST)/usr/bin +- cp COPYING $(DIST)/usr/share/doc/omxplayer +- cp README.md $(DIST)/usr/share/doc/omxplayer/README +- cp omxplayer.1 $(DIST)/usr/share/man/man1 +- cp -a ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/ + cd $(DIST); tar -czf ../$(DIST).tgz * |