New package: omxplayer-20130324.

common/shlibs

@@ -1195,3 +1195,10 @@ libtaginfo.so.1 libtaginfo-0.1.3_1
 libtaginfo_c.so.0 libtaginfo-0.1.3_1
 libaa.so.1 aalib-1.4rc4_2
 libbsd.so.0 libbsd-0.4.2_1
+libWFC.so rpi-firmware-20130228_1
+libGLESv2.so rpi-firmware-20130228_1
+libEGL.so rpi-firmware-20130228_1
+libbcm_host.so rpi-firmware-20130228_1
+libopenmaxil.so rpi-firmware-20130228_1
+libvchiq_arm.so rpi-firmware-20130228_1
+libvcos.so rpi-firmware-20130228_1

srcpkgs/omxplayer/files/Makefile

@@ -0,0 +1,74 @@
+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_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 
+
+#### Ugly ffmpeg-compat hack. Feel free to fix properly
+CFLAGS +=-DAV_CODEC_ID_SSA=0x3a2d7c7c -DAV_CODEC_ID_SUBRIP=0x3a2d7c7c
+
+LDFLAGS+=-L./ -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 \
+		omxplayer.cpp \
+
+OBJS+=$(filter %.o,$(SRC:.cpp=.o))
+
+all: omxplayer.bin
+
+%.o: %.cpp
+	@rm -f $@ 
+	$(CXX) $(CFLAGS) $(INCLUDES) -c $< -o $@ -Wno-deprecated-declarations
+
+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
+
+clean:
+	for i in $(OBJS); do (if test -e "$$i"; then ( rm $$i ); fi ); done
+	@rm -f omxplayer.old.log omxplayer.log
+	@rm -f omxplayer.bin
+	@rm -rf omxplayer-dist
+	@rm -f omxplayer-dist.tar.gz
+
+install:
+	install -d $(DESTDIR)/usr/bin
+	install -Dm644 omxplayer.bin $(DESTDIR)/usr/bin/omxplayer
+
+	

srcpkgs/omxplayer/files/Makefile.include

@@ -0,0 +1,27 @@
+USE_BUILDROOT=0
+
+JOBS=1
+
+CFLAGS		:= 
+CXXFLAGS	:= $(CFLAGS)
+CPPFLAGS	:= $(CFLAGS)
+LDFLAGS		:= 
+LD		:= ld
+CC		:= gcc
+CXX         	:= g++
+OBJDUMP		:= objdump
+RANLIB		:= ranlib
+STRIP		:= strip
+AR 		:= ar
+CXXCP 		:= $(CXX) -E
+
+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@
+
+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@
+

srcpkgs/omxplayer/patches/omxfont.patch

@@ -0,0 +1,11 @@
+--- omxplayer.cpp.orig	2013-02-02 09:31:33.347600923 +0000
++++ omxplayer.cpp	2013-02-02 09:32:03.477096232 +0000
+@@ -71,7 +71,7 @@
+ int               m_use_hw_audio        = false;
+ std::string       m_external_subtitles_path;
+ bool              m_has_external_subtitles = false;
+-std::string       m_font_path           = "/usr/share/fonts/truetype/freefont/FreeSans.ttf";
++std::string       m_font_path           = "/usr/share/fonts/TTF/FreeSans.ttf";
+ bool              m_has_font            = false;
+ float             m_font_size           = 0.055f;
+ bool              m_centered            = false;

srcpkgs/omxplayer/template

@@ -0,0 +1,56 @@
+# Template file for 'omxplayer'
+pkgname=omxplayer
+version=20130324
+revision=1
+short_desc="Commandline OMX player for the Raspberry Pi"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+homepage="https://github.com/huceke/omxplayer"
+
+nofetch=yes
+noextract=yes
+
+# XXX only rpi
+only_for_archs="armv6l"
+hostmakedepends="pkg-config"
+depends="freefont-ttf"
+makedepends="rpi-firmware pcre-devel boost-devel freetype-devel ffmpeg-0.10x-compat-devel"
+
+do_fetch() {
+	local url="git://github.com/huceke/omxplayer.git"
+	git clone $url ${pkgname}-${version}
+}
+
+do_build() {
+	cp -f ${FILESDIR}/Makefile* .
+
+	_ffmpeg_inc="/usr/include/ffmpeg-0.10x-compat"
+	_ffmpeg_lib="/usr/lib/ffmpeg-0.10x-compat"
+	
+	if [ "$XBPS_CROSS_BUILD" ]; then
+		# Create this in masterdir to make gcc to keep rpath.
+		mkdir -p /opt/vc/lib ${_ffmpeg_lib}
+
+		INCLUDES="-I$XBPS_CROSS_BASE/include \
+			-I$XBPS_CROSS_BASE/include/freetype2 \
+			-I$XBPS_CROSS_BASE/${_ffmpeg_inc}"
+
+		LDFLAGS="-L$XBPS_CROSS_BASE/lib \
+			-L$XBPS_CROSS_BASE/${_ffmpeg_lib} \
+			-Wl,-rpath ${_ffmpeg_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|@INCLUDES@|-I${_ffmpeg_inc}|g" -i Makefile.include	
+		sed -e "s|@LDFLAGS@|-L${_ffmpeg_lib} -Wl,-rpath ${_ffmpeg_lib}|g" -i Makefile.include
+		sed -e "s|@OPTBASE@|/opt|g" -i Makefile.include
+	fi
+
+	make CC="$CC" CXX="$CXX" LD="$LD"
+}
+
+do_install() {
+	make DESTDIR=${DESTDIR} install
+}