--- /dev/null
+++ b/usr/portage/media-video/raspberrypi-omxplayer/files/cross.patch
@@ -0,0 +1,16 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,9 +4,11 @@
+ 
+ PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre
+ 
+-LIBS+=-lrt -lpthread $(shell pkg-config --libs $(PKGS)) -L/opt/vc/lib
++PKG_CONFIG ?= pkg-config
+ 
+-INCLUDES+=$(shell pkg-config --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux
++LIBS+=-lrt -lpthread $(shell $(PKG_CONFIG) --libs $(PKGS)) -L${SYSROOT}/opt/vc/lib
++
++INCLUDES+=$(shell $(PKG_CONFIG) --cflags $(PKGS)) -I${SYSROOT}/opt/vc/include -I. -Ilinux
+ 
+ DIST ?= omxplayer-dist
+ 
--- a/usr/portage/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild
+++ b/usr/portage/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild
@@ -35,16 +35,13 @@ S="${WORKDIR}/popcornmix-omxplayer-${GIT_COMMIT}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/Makefile-0_p20160528.patch \
-		"${FILESDIR}"/fonts-path.patch \
-		"${FILESDIR}"/cross.patch
-
-	epatch_user
+		"${FILESDIR}"/fonts-path.patch
 
 	cat > Makefile.include << EOF
 LIBS=-lvchostif -lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
 EOF
 
-	tc-export CXX PKG_CONFIG
+	tc-export CXX
 }
 
 src_compile() {