From: John Crispin <john@openwrt.org>
Date: Sun, 4 May 2008 09:20:51 +0000 (+0000)
Subject: fixes xine compilation
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=fbff440bd0aef97fe543ac247b7d5a67b1cd034d

fixes xine compilation

SVN-Revision: 11042
---

diff --git a/XOrg/app/xine-ui/Makefile b/XOrg/app/xine-ui/Makefile
index 0d6a4ea453..c61a5d151c 100644
--- a/XOrg/app/xine-ui/Makefile
+++ b/XOrg/app/xine-ui/Makefile
@@ -31,6 +31,8 @@ endef
 CONFIGURE_VARS+= \
 	PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
 
+EXTRA_LDFLAGS:=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
 CONFIGURE_ARGS+=--without-aalib \
 			--without-libcaca \
 			--disable-lirc \
diff --git a/XOrg/lib/xine-lib/Makefile b/XOrg/lib/xine-lib/Makefile
index dc082bcad4..a6d6d1c853 100644
--- a/XOrg/lib/xine-lib/Makefile
+++ b/XOrg/lib/xine-lib/Makefile
@@ -18,7 +18,7 @@ PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
-CONFIGURE_ARGS_XTRA+=--enable-static --disable-vcd
+CONFIGURE_ARGS_XTRA+=--enable-static --disable-vcd --disable-imagemagick
 
 define Package/xine-lib
   SECTION:=xorg-lib