From 6060a9e4a3802f7ca902d63490904da5e0486de6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michael=20B=C3=BCsch?= <mb@bu3sch.de>
Date: Sat, 16 Oct 2010 14:08:11 +0000
Subject: [PATCH] xine-lib: Fix compile. Configure/build may not include
 headers from the host.

SVN-Revision: 23475
---
 Xorg/lib/xine-lib/Makefile | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/Xorg/lib/xine-lib/Makefile b/Xorg/lib/xine-lib/Makefile
index c872774536..f726500c0c 100644
--- a/Xorg/lib/xine-lib/Makefile
+++ b/Xorg/lib/xine-lib/Makefile
@@ -17,10 +17,26 @@ PKG_SOURCE_URL:=@SF/xine
 PKG_MD5SUM:=b1f42602c776bb93e3cbf127e220cbfd
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-CONFIGURE_ARGS_XTRA+=--enable-static --disable-vcd --disable-imagemagick
+CONFIGURE_ARGS+=\
+	--enable-static \
+	--disable-vcd \
+	--disable-imagemagick \
+	--disable-flac
+
+XINE_LIB_FLAGS:=\
+	LIBFLAC_CFLAGS="" \
+	LIBFLAC_LIBS="" \
+	X_CFLAGS="" \
+	X_LIBS="" \
+	XINE_ACFLAGS="" \
+	CXXFLAGS="$(TARGET_CFLAGS)"
+
+CONFIGURE_VARS+=$(XINE_LIB_FLAGS)
 
 define Package/xine-lib
   SECTION:=xorg-libraries
@@ -31,21 +47,7 @@ define Package/xine-lib
   URL:=http://www.xine-project.org/
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-		if [ -x $(CONFIGURE_CMD) ]; then \
-			$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-			$(CONFIGURE_VARS) \
-			$(CONFIGURE_CMD) \
-			$(CONFIGURE_ARGS_XTRA) \
-			$(CONFIGURE_ARGS) ;\
-		fi \
-	)
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/ all install DESTDIR=$(PKG_INSTALL_DIR)
-endef
+MAKE_FLAGS+=$(XINE_LIB_FLAGS)
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)
-- 
2.30.2