diff --git a/srcpkgs/omxplayer/patches/build.patch b/srcpkgs/omxplayer/patches/build.patch index 2283b44cae9..8b88eba9683 100644 --- a/srcpkgs/omxplayer/patches/build.patch +++ b/srcpkgs/omxplayer/patches/build.patch @@ -1,14 +1,14 @@ ---- Makefile -+++ Makefile +--- Makefile.orig 2016-07-23 19:51:59.295696266 +0200 ++++ Makefile 2016-07-23 19:56:48.272223230 +0200 @@ -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+= -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -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 ++INCLUDES+= -I./ -Ilinux DIST ?= omxplayer-dist @@ -17,7 +17,7 @@ OBJS+=$(filter %.o,$(SRC:.cpp=.o)) -all: dist -+all: omxplayer.bin ++all: omxplayer.bin omxplayer.1 %.o: %.cpp @rm -f $@ @@ -25,40 +25,29 @@ 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 -+ $(CXX) -o omxplayer.bin $(OBJS) $(LDFLAGS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre +- $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvchostif -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre ++ $(CXX) -o omxplayer.bin $(OBJS) $(LDFLAGS) -lvchiq_arm -lvchostif -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre $(STRIP) omxplayer.bin help.h: README.md Makefile -@@ -74,19 +74,9 @@ clean: - @rm -rf $(DIST) - @rm -f omxplayer-dist.tar.gz - --ffmpeg: -- @rm -rf ffmpeg -- make -f Makefile.ffmpeg -- make -f Makefile.ffmpeg install -- --dist: omxplayer.bin omxplayer.1 -- 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 * +@@ -90,3 +90,14 @@ dist: omxplayer.bin omxplayer.1 + cp omxplayer.1 $(DIST)/usr/share/man/man1 + cp -P ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/ + cd $(DIST); tar -czf ../$(DIST).tgz * ++ +install: + install -d $(DESTDIR)/usr/bin + install -d $(DESTDIR)/usr/share/doc/omxplayer -+ install omxplayer $(DESTDIR)/usr/bin/omxplayer-dbus -+ install omxplayer.bin $(DESTDIR)/usr/bin/omxplayer -+ install README.md $(DESTDIR)/usr/share/doc/omxplayer/ ---- Makefile.include -+++ Makefile.include -@@ -1,40 +1,4 @@ ++ install -d $(DESTDIR)/usr/share/man/man1 ++ install -m755 omxplayer $(DESTDIR)/usr/bin/omxplayer-dbus ++ install -m755 omxplayer.bin $(DESTDIR)/usr/bin/omxplayer ++ install -m644 omxplayer.1 $(DESTDIR)/usr/share/man/man1/ ++ install -m644 README.md $(DESTDIR)/usr/share/doc/omxplayer/ ++ ++ +--- Makefile.include.orig 2016-07-23 19:57:16.888573220 +0200 ++++ Makefile.include 2016-07-23 19:58:16.656304226 +0200 +@@ -1,40 +1,3 @@ -USE_BUILDROOT=0 -FLOAT=hard - @@ -99,7 +88,6 @@ -LDFLAGS += -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build -#INCLUDES += -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2 -INCLUDES += -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include -+#STRIP := strip -+CFLAGS += -fomit-frame-pointer -mtune=arm1176jzf-s -+LDFLAGS += -L$(XBPS_CROSS_BASE)/opt/vc/lib/ -Wl,-R/opt/vc/lib -+INCLUDES += -I$(XBPS_CROSS_BASE)/opt/vc/include -I$(XBPS_CROSS_BASE)/opt/vc/include/interface/vmcs_host/linux -I$(XBPS_CROSS_BASE)/opt/vc/include/interface/vcos/pthreads -I$(XBPS_CROSS_BASE)/usr/include/freetype2 -I$(XBPS_CROSS_BASE)/usr/include/dbus-1.0 -I$(XBPS_CROSS_BASE)/usr/lib/dbus-1.0/include ++CFLAGS += -fomit-frame-pointer -mtune=arm1176jzf-s ++LDFLAGS += -L$(XBPS_CROSS_BASE)/opt/vc/lib/ -Wl,-R/opt/vc/lib ++INCLUDES += -I$(XBPS_CROSS_BASE)/opt/vc/include -I$(XBPS_CROSS_BASE)/opt/vc/include/interface/vmcs_host/linux -I$(XBPS_CROSS_BASE)/opt/vc/include/interface/vcos/pthreads -I$(XBPS_CROSS_BASE)/usr/include/freetype2 -I$(XBPS_CROSS_BASE)/usr/include/dbus-1.0 -I$(XBPS_CROSS_BASE)/usr/lib/dbus-1.0/include diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template index 93aa535722c..aca0c2bea7a 100644 --- a/srcpkgs/omxplayer/template +++ b/srcpkgs/omxplayer/template @@ -1,21 +1,21 @@ # Template file for 'omxplayer' pkgname=omxplayer -version=20151218 +version=20160723 revision=1 short_desc="Commandline OMX player for the Raspberry Pi" maintainer="Juan RP " license="GPL-2" homepage="https://github.com/popcornmix/omxplayer" -_commit="f5440845cdd91e7816de1937c30057f58c10c268" +_commit="66f90768fd3770e042ca361d76aba751e6427abe" wrksrc="omxplayer-$_commit" distfiles="$homepage/archive/$_commit.tar.gz" -checksum=de129817e5fda01f49e0fd80727caa14f2a715f7af9f035d77b1d0e9d0dc57d2 +checksum=742cf4e6b51974b335bc8e546dd31679eb4f99373c9a8becd155cd339ae2a10d # XXX only rpi only_for_archs="armv6l armv6l-musl armv7l armv7l-musl" build_style=gnu-makefile -hostmakedepends="pkg-config" +hostmakedepends="curl pkg-config" makedepends="rpi-userland-devel pcre-devel boost-devel freetype-devel ffmpeg-devel dbus-devel" depends="freefont-ttf"