From ffbf6d7586777b33ff3c9af03e3a88c7e437591e Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Mon, 9 Jul 2012 16:49:20 +0200
Subject: [PATCH] Fix build on ArchLinux/Pi.

---
 Makefile          | 12 ++++++++----
 qb/config.libs.sh |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index adb0f78010..2c03a1f6e6 100644
--- a/Makefile
+++ b/Makefile
@@ -125,19 +125,23 @@ ifeq ($(HAVE_SDL), 1)
    DEFINES += $(SDL_CFLAGS) $(BSD_LOCAL_INC)
    LIBS += $(SDL_LIBS)
 
+ifneq ($(OSX), 1)
+   LIBS += -lX11
+endif
+
 ifeq ($(HAVE_OPENGL), 1)
-	OBJ += gfx/gl.o gfx/fonts/freetype.o
+   OBJ += gfx/gl.o gfx/fonts/freetype.o
 ifeq ($(OSX),1)
-	LIBS += -framework OpenGL
+   LIBS += -framework OpenGL
 else
-	LIBS += -lGL
+   LIBS += -lGL
 endif
 endif
 endif
 
 ifeq ($(HAVE_RPI), 1)
    OBJ += gfx/rpi.o
-   LIBS += -lOpenVG -lGLESv2 -lEGL -lbcm_host
+   LIBS += -lOpenVG -lGLESv2 -lEGL -lbcm_host -lvcos -lvchiq_arm
 endif
 
 ifeq ($(HAVE_XVIDEO), 1)
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 696f8b9f77..945b9310bd 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -11,7 +11,7 @@ add_define_make NOUNUSED "$HAVE_NOUNUSED"
 if [ "$OS" = 'BSD' ]; then DYLIB=-lc; else DYLIB=-ldl; fi
 
 [ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib
-check_lib RPI -lbcm_host bcm_host_init
+check_lib RPI -lbcm_host bcm_host_init "-lvcos -lvchiq_arm" 
 
 if [ "$HAVE_RPI" = 'yes' ]; then
    [ -d /opt/vc/include ] && add_include_dirs /opt/vc/include