diff --git a/srcpkgs/omxplayer/files/Makefile b/srcpkgs/omxplayer/files/Makefile index 228846408c..9c26c27d32 100644 --- a/srcpkgs/omxplayer/files/Makefile +++ b/srcpkgs/omxplayer/files/Makefile @@ -1,47 +1,38 @@ include Makefile.include -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 \ - -mfpu=vfp -mno-apcs-stack-check -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG \ - -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_MEM_H \ - -DHAVE_LIBAVUTIL_OPT_H -DTARGET_LINUX \ - -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H \ - -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX \ - -DOMX_SKIP64BIT -ftree-vectorize -pipe -DUSE_EXTERNAL_OMX \ - -DTARGET_RASPBERRY_PI -DHAVE_PLATFORM_RASPBERRY_PI \ - -DUSE_EXTERNAL_LIBBCM_HOST -Wno-psabi +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./ -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz +LDFLAGS+=-L./ -ldbus-1 -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz INCLUDES+=-I./ -Ilinux SRC=linux/XMemUtils.cpp \ - utils/log.cpp \ - DynamicDll.cpp \ - utils/PCMRemap.cpp \ - utils/RegExp.cpp \ - OMXSubtitleTagSami.cpp \ - OMXOverlayCodecText.cpp \ - BitstreamConverter.cpp \ - linux/RBP.cpp \ - OMXThread.cpp \ - OMXReader.cpp \ - OMXStreamInfo.cpp \ - OMXAudioCodecOMX.cpp \ - OMXCore.cpp \ - OMXVideo.cpp \ - OMXAudio.cpp \ - OMXClock.cpp \ - File.cpp \ - OMXPlayerVideo.cpp \ - OMXPlayerAudio.cpp \ - OMXPlayerSubtitles.cpp \ - Srt.cpp \ - SubtitleRenderer.cpp \ - Unicode.cpp \ - KeyConfig.cpp \ - omxplayer.cpp + utils/log.cpp \ + DynamicDll.cpp \ + utils/PCMRemap.cpp \ + utils/RegExp.cpp \ + OMXSubtitleTagSami.cpp \ + OMXOverlayCodecText.cpp \ + BitstreamConverter.cpp \ + linux/RBP.cpp \ + OMXThread.cpp \ + OMXReader.cpp \ + OMXStreamInfo.cpp \ + OMXAudioCodecOMX.cpp \ + OMXCore.cpp \ + OMXVideo.cpp \ + OMXAudio.cpp \ + OMXClock.cpp \ + File.cpp \ + OMXPlayerVideo.cpp \ + OMXPlayerAudio.cpp \ + OMXPlayerSubtitles.cpp \ + SubtitleRenderer.cpp \ + Unicode.cpp \ + Srt.cpp \ + KeyConfig.cpp \ + OMXControl.cpp \ + Keyboard.cpp \ + omxplayer.cpp \ OBJS+=$(filter %.o,$(SRC:.cpp=.o)) @@ -54,10 +45,11 @@ all: omxplayer.bin list_test: $(CXX) -O3 -o list_test list_test.cpp -omxplayer.bin: $(OBJS) - $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos \ - -lrt -lpthread -rdynamic -lavutil -lavcodec -lavformat \ - -lswscale -lswresample -lpcre -lm -lc +version: + bash gen_version.sh > version.h + +omxplayer.bin: version $(OBJS) + $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre clean: for i in $(OBJS); do (if test -e "$$i"; then ( rm $$i ); fi ); done diff --git a/srcpkgs/omxplayer/files/Makefile.include b/srcpkgs/omxplayer/files/Makefile.include index 843e0a1cbd..72d1d4d550 100644 --- a/srcpkgs/omxplayer/files/Makefile.include +++ b/srcpkgs/omxplayer/files/Makefile.include @@ -19,9 +19,11 @@ CFLAGS += -pipe -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux \ -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check \ -O3 -mstructure-size-boundary=32 -mno-sched-prolog -LDFLAGS += -L@OPTBASE@/vc/lib/ -Wl,-rpath /opt/vc/lib @LDFLAGS@ +LDFLAGS += -L@CROSSBASE@/opt/vc/lib/ -Wl,-rpath /opt/vc/lib -L@CROSSBASE@/usr/lib -INCLUDES += -I@OPTBASE@/vc/include -I@OPTBASE@/vc/include/interface/vcos/ \ - -I@OPTBASE@/vc/include/interface/vcos/pthreads \ - -I@OPTBASE@/vc/include/interface/vmcs_host/linux @INCLUDES@ +INCLUDES += -I@CROSSBASE@/opt/vc/include -I@CROSSBASE@/opt/vc/include/interface/vcos/ \ + -I@CROSSBASE@/opt/vc/include/interface/vcos/pthreads \ + -I@CROSSBASE@/opt/vc/include/interface/vmcs_host/linux \ + -I@CROSSBASE@/usr/include -I@CROSSBASE@/usr/include/dbus-1.0 \ + -I@CROSSBASE@/usr/lib/dbus-1.0/include -I@CROSSBASE@/usr/include/freetype2 diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template index 046b69a72e..ce821a8b39 100644 --- a/srcpkgs/omxplayer/template +++ b/srcpkgs/omxplayer/template @@ -1,17 +1,16 @@ # Template file for 'omxplayer' pkgname=omxplayer -version=20130807 +version=20130913 revision=1 short_desc="Commandline OMX player for the Raspberry Pi" maintainer="Juan RP " license="GPL-2" homepage="https://github.com/huceke/omxplayer" - # XXX only rpi only_for_archs="armv6l" hostmakedepends="pkg-config" -makedepends="rpi-firmware pcre-devel boost-devel freetype-devel ffmpeg-devel" +makedepends="rpi-firmware>=20130913 pcre-devel boost-devel freetype-devel ffmpeg-devel dbus-devel" do_fetch() { local url="git://github.com/popcornmix/omxplayer.git" @@ -20,28 +19,12 @@ do_fetch() { pre_build() { cp -f ${FILESDIR}/Makefile* . - ./gen_version.sh > version.h - sed -e 's,\\n,,g' -i version.h sed -e 's,/usr/share/fonts/truetype/freefont,/usr/share/fonts/TTF,g' -i omxplayer.cpp } do_build() { mkdir -p /opt/vc/lib - - if [ "$CROSS_BUILD" ]; then - - INCLUDES="-I$XBPS_CROSS_BASE/include \ - -I$XBPS_CROSS_BASE/include/freetype2" - - LDFLAGS="-L$XBPS_CROSS_BASE/lib" - - sed -e "s|@INCLUDES@|${INCLUDES}|g" -i Makefile.include - sed -e "s|@LDFLAGS@|${LDFLAGS}|g" -i Makefile.include - sed -e "s|@OPTBASE@|${XBPS_CROSS_BASE}/opt|g" -i Makefile.include - else - sed -e "s|@OPTBASE@|/opt|g" -i Makefile.include - fi - + sed -e "s|@CROSSBASE@|${XBPS_CROSS_BASE}|g" -i Makefile.include make CC="$CC" CXX="$CXX" LD="$LD" } @@ -50,8 +33,8 @@ do_install() { } omxplayer_package() { - depends="freefont-ttf" + depends="rpi-firmware>=20130913 freefont-ttf" pkg_install() { - vmove usr + vmove all } }